Changeset 15898

Timestamp:

08/23/13 10:03:26 (12 years ago)

Author:

Mathieu Morlighem

Message:

NEW: when a new result is added, we first check wether it already exists in the results dataset, if yes, it is deleted first

Location:

issm/trunk-jpl/src/c

Files:

• analyses/transient_core.cpp (modified) (2 diffs)
• classes/Elements/Penta.cpp (modified) (1 diff)
• classes/Elements/Tria.cpp (modified) (1 diff)
• classes/ExternalResults/Results.cpp (modified) (1 diff)
• classes/ExternalResults/Results.h (modified) (2 diffs)

issm/trunk-jpl/src/c/analyses/transient_core.cpp ¶

@@ -140 +140 @@
                         _error_("ISSM was not compiled with grounding line migration capabilities. Exiting");
                         #endif
+                        if(save_results){
+                                InputToResultx(femmodel,SurfaceEnum);
+                                InputToResultx(femmodel,BedEnum);
+                                InputToResultx(femmodel,MaskElementonfloatingiceEnum);
+                        }
                 }
                 if(isgia){
@@ -155 +160 @@
                         if(VerboseSolution()) _printf0_("   saving transient results\n");
                         InputToResultx(femmodel,SurfaceforcingsMassBalanceEnum);
-                        InputToResultx(femmodel,MaskElementonfloatingiceEnum);
                         femmodel->RequestedOutputsx(requested_outputs,numoutputs);
                         if(isdelta18o){

issm/trunk-jpl/src/c/classes/Elements/Penta.cpp ¶

@@ -2107 +2107 @@
         /*If we don't find it, no big deal, just don't do the transfer. Otherwise, build a new Result 
          * object out of the input, with the additional step and time information: */
-        this->results->AddObject((Object*)input->SpawnResult(step,time));
+        this->results->AddResult(input->SpawnResult(step,time));
         #ifdef _HAVE_CONTROL_
         if(input->ObjectEnum()==ControlInputEnum){
-                if(((ControlInput*)input)->gradient!=NULL) this->results->AddObject((Object*)((ControlInput*)input)->SpawnGradient(step,time));
+                if(((ControlInput*)input)->gradient!=NULL) this->results->AddResult(((ControlInput*)input)->SpawnGradient(step,time));
         }
         #endif

issm/trunk-jpl/src/c/classes/Elements/Tria.cpp ¶

@@ -1429 +1429 @@
         /*If we don't find it, no big deal, just don't do the transfer. Otherwise, build a new Result 
          * object out of the input, with the additional step and time information: */
-        this->results->AddObject((Object*)input->SpawnResult(step,time));
+        this->results->AddResult(input->SpawnResult(step,time));
 
         #ifdef _HAVE_CONTROL_
         if(input->ObjectEnum()==ControlInputEnum){
-                if(((ControlInput*)input)->gradient!=NULL) this->results->AddObject((Object*)((ControlInput*)input)->SpawnGradient(step,time));
+                if(((ControlInput*)input)->gradient!=NULL) this->results->AddResult(((ControlInput*)input)->SpawnGradient(step,time));
         }
         #endif

issm/trunk-jpl/src/c/classes/ExternalResults/Results.cpp ¶

@@ -54 +54 @@
 }
 /*}}}*/
+/*FUNCTION Results::Write{{{*/
+int Results::AddResult(ElementResult* in_result){
+
+        /*First, go through dataset of inputs and check whether any input 
+         * with the same name is already in. If so, erase the corresponding 
+         * object before adding this new one: */
+        vector<Object*>::iterator object;
+        ElementResult* result=NULL;
+
+        /*In debugging mode, check that the input is not a NULL pointer*/
+        _assert_(in_result);
+
+        for(object=objects.begin() ; object<objects.end(); object++){
+
+                result=dynamic_cast<ElementResult*>(*object);
+
+                if(result->InstanceEnum()==in_result->InstanceEnum()){
+                        if(result->GetStep()==in_result->GetStep()){
+                                this->DeleteObject(result);
+                                break;
+                        }
+                }
+        }
+        this->AddObject(in_result);
+
+        return 1;
+}
+/*}}}*/

issm/trunk-jpl/src/c/classes/ExternalResults/Results.h ¶

@@ -6 +6 @@
 /*forward declarations */
 class Parameters;
+class ElementResult;
 
 /*!\brief Declaration of Results class.
@@ -19 +20 @@
                 ~Results();
 
-                /*numerics*/
+                /*Mehthos*/
+                int AddResult(ElementResult* result);
                 void Write(Parameters* parameters);
 };