Changeset 16473

Timestamp:

10/21/13 08:01:56 (11 years ago)

Author:

Mathieu Morlighem

Message:

BUG: fixinf some errors (see NR report)

Location:

issm/trunk-jpl/src/c

Files:

• analyses/bedslope_core.cpp (modified) (1 diff)
• analyses/surfaceslope_core.cpp (modified) (1 diff)
• classes/FemModel.cpp (modified) (2 diffs)

issm/trunk-jpl/src/c/analyses/bedslope_core.cpp

@@ -33 +33 @@
                 if(VerboseSolution()) _printf0_("   saving results\n");
                 if(meshtype!=Mesh2DverticalEnum){
+                        const char* outputs [] = {"BedSlopeX","BedSlopeY"};
+                        femmodel->RequestedOutputsx(&femmodel->results,(char**)&outputs[0],2);
+                }
+                else{
                         const char* outputs [] = {"BedSlopeX"};
                         femmodel->RequestedOutputsx(&femmodel->results,(char**)&outputs[0],1);
-                }
-                else{
-                        const char* outputs [] = {"BedSlopeX","BedSlopeY"};
-                        femmodel->RequestedOutputsx(&femmodel->results,(char**)&outputs[0],2);
                 }
         }

issm/trunk-jpl/src/c/analyses/surfaceslope_core.cpp

@@ -31 +31 @@
                 if(VerboseSolution()) _printf0_("saving results:\n");
                 if(meshtype!=Mesh2DverticalEnum){
+                        const char* outputs [] = {"SurfaceSlopeX","SurfaceSlopeY"};
+                        femmodel->RequestedOutputsx(&femmodel->results,(char**)&outputs[0],2);
+
+                }
+                else{
                         const char* outputs [] = {"SurfaceSlopeX"};
                         femmodel->RequestedOutputsx(&femmodel->results,(char**)&outputs[0],1);
-                }
-                else{
-                        const char* outputs [] = {"SurfaceSlopeX","SurfaceSlopeY"};
-                        femmodel->RequestedOutputsx(&femmodel->results,(char**)&outputs[0],2);
                 }
         }

issm/trunk-jpl/src/c/classes/FemModel.cpp

@@ -619 +619 @@
                                         vector_result->Assemble();
 
-                                        results->AddObject(new GenericExternalResult<Vector<IssmPDouble>*>(results->Size()+1,output_enum,vector_result,step,time));
+                                        results->AddResult(new GenericExternalResult<Vector<IssmPDouble>*>(results->Size()+1,output_enum,vector_result,step,time));
                                         isvec = true;
                                         break;
@@ -631 +631 @@
                 /*Add result to Results*/
                 if(!isvec){
-                        results->AddObject(new GenericExternalResult<IssmPDouble>(results->Size()+1,output_string,reCast<IssmPDouble>(double_result),step,time));
+                        results->AddResult(new GenericExternalResult<IssmPDouble>(results->Size()+1,output_string,reCast<IssmPDouble>(double_result),step,time));
                 }
         }