Changeset 17055

Timestamp:

12/23/13 16:00:26 (11 years ago)

Author:

Eric.Larour

Message:

CHG: make sure that start time is the one set in timestepping, not 0.

Location:

issm/trunk-jpl/src

Files:

• c/classes/ExternalResults/GenericExternalResult.h (modified) (2 diffs)
• c/modules/ModelProcessorx/CreateParameters.cpp (modified) (1 diff)
• c/modules/OutputResultsx/OutputResultsx.cpp (modified) (1 diff)
• c/solutionsequences/solutionsequence_newton.cpp (modified) (1 diff)
• c/solutionsequences/solutionsequence_nonlinear.cpp (modified) (2 diffs)
• m/solve/parseresultsfromdisk.m (modified) (3 diffs)

issm/trunk-jpl/src/c/classes/ExternalResults/GenericExternalResult.h

@@ -83 +83 @@
                 }
                 /*}}}*/
+                GenericExternalResult(int in_id, int in_enum_type,ResultType in_value,int in_step){ /*{{{*/
+                        id        = in_id;
+                        value     = in_value;
+                        step      = in_step;
+                        time      = UNDEF;
+
+                        /*Convert enum to name*/
+                        EnumToStringx(&this->result_name,in_enum_type);
+                }
+                /*}}}*/
                 GenericExternalResult(int in_id,const char* in_result_name,ResultType in_value,int in_step, IssmDouble in_time){ /*{{{*/
                         id        = in_id;
@@ -207 +217 @@
         step  = in_step;
         time  = in_time;
+
+        /*Convert enum to name*/
+        EnumToStringx(&this->result_name,in_enum_type);
+
+} /*}}}*/
+template <> inline GenericExternalResult<char*>::GenericExternalResult(int in_id, int in_enum_type,char* in_value,int in_step){ /*{{{*/
+
+        id = in_id;
+        value = xNew<char>(strlen(in_value)+1);
+        xMemCpy<char>(value,in_value,(strlen(in_value)+1));
+        step  = in_step;
+        time  = UNDEF;
 
         /*Convert enum to name*/

issm/trunk-jpl/src/c/modules/ModelProcessorx/CreateParameters.cpp

@@ -117 +117 @@
 
         iomodel->Constant(&time,TimesteppingStartTimeEnum);
-        parameters->AddObject(new DoubleParam(TimeEnum,time));  //start at time 0 by default for all solutions FIXME: to be deleted
-        parameters->AddObject(new IntParam(StepEnum,1));  //start at time 0 by default for all solutions FIXME: to be deleted
+        parameters->AddObject(new DoubleParam(TimeEnum,time));  
+        parameters->AddObject(new IntParam(StepEnum,1));  
 
         /*By default, save all results*/

issm/trunk-jpl/src/c/modules/OutputResultsx/OutputResultsx.cpp

@@ -42 +42 @@
                 femmodel->parameters->FindParam(&solutiontype,SolutionTypeEnum);
                 EnumToStringx(&solutiontypestring,solutiontype);
-                femmodel->results->AddResult(new GenericExternalResult<char*>(femmodel->results->Size()+1,SolutionTypeEnum,solutiontypestring,1,0));
+                femmodel->results->AddResult(new GenericExternalResult<char*>(femmodel->results->Size()+1,SolutionTypeEnum,solutiontypestring,1));
                 xDelete<char>(solutiontypestring);
         }

issm/trunk-jpl/src/c/solutionsequences/solutionsequence_newton.cpp

@@ -86 +86 @@
                 delete Kff; delete pf;
                 if(converged==true){    
+                        int step; IssmDouble time;
                         bool max_iteration_state=false;
-                        int tempStep=1;
-                        IssmDouble tempTime=1.0;
-                        femmodel->results->AddObject(new GenericExternalResult<bool>(femmodel->results->Size()+1, MaxIterationConvergenceFlagEnum, max_iteration_state, tempStep, tempTime));
+                        femmodel->parameters->FindParam(&time,TimeEnum);
+                        femmodel->parameters->FindParam(&step,StepEnum);
+                        femmodel->results->AddObject(new GenericExternalResult<bool>(femmodel->results->Size()+1, MaxIterationConvergenceFlagEnum, max_iteration_state, step,time));
                         break;
                 }
                 if(count>=max_nonlinear_iterations){
                         _printf0_("   maximum number of Newton iterations (" << max_nonlinear_iterations << ") exceeded\n"); 
+                        int step; IssmDouble time;
                         bool max_iteration_state=true;
-                        int tempStep=1;
-                        IssmDouble tempTime=1.0;
-                        femmodel->results->AddObject(new GenericExternalResult<bool>(femmodel->results->Size()+1, MaxIterationConvergenceFlagEnum, max_iteration_state, tempStep, tempTime));
+                        femmodel->parameters->FindParam(&time,TimeEnum);
+                        femmodel->parameters->FindParam(&step,StepEnum);
+                        femmodel->results->AddObject(new GenericExternalResult<bool>(femmodel->results->Size()+1, MaxIterationConvergenceFlagEnum, max_iteration_state, step, time));
                         break;
                 }

issm/trunk-jpl/src/c/solutionsequences/solutionsequence_nonlinear.cpp

@@ -85 +85 @@
                 if(converged==true){
                         bool max_iteration_state=false;
-                        int tempStep=1;
-                        IssmDouble tempTime=1.0;
-                        femmodel->results->AddObject(new GenericExternalResult<bool>(femmodel->results->Size()+1, MaxIterationConvergenceFlagEnum, max_iteration_state, tempStep, tempTime));
+                        int step; IssmDouble time;
+                        femmodel->parameters->FindParam(&time,TimeEnum);
+                        femmodel->parameters->FindParam(&step,StepEnum);
+                        femmodel->results->AddObject(new GenericExternalResult<bool>(femmodel->results->Size()+1, MaxIterationConvergenceFlagEnum, max_iteration_state, step, time));
                         break;
                 }
@@ -96 +97 @@
                         InputUpdateFromSolutionx(femmodel,ug);          
                         bool max_iteration_state=true;
-                        int tempStep=1;
-                        IssmDouble tempTime=1.0;
-                        femmodel->results->AddObject(new GenericExternalResult<bool>(femmodel->results->Size()+1, MaxIterationConvergenceFlagEnum, max_iteration_state, tempStep, tempTime));
+                        int step; IssmDouble time;
+                        femmodel->parameters->FindParam(&time,TimeEnum);
+                        femmodel->parameters->FindParam(&step,StepEnum);
+                        femmodel->results->AddObject(new GenericExternalResult<bool>(femmodel->results->Size()+1, MaxIterationConvergenceFlagEnum, max_iteration_state, step, time));
                         break;
                 }

issm/trunk-jpl/src/m/solve/parseresultsfromdisk.m

@@ -45 +45 @@
         end
         results(index).step=result.step;
-        results(index).time=result.time; 
+        if result.time~=-9999,
+                results(index).time=result.time; 
+        end
         results(index).(result.fieldname)=result.field;
 
@@ -80 +82 @@
         %Get time and step
         results(result.step).step=result.step;
-        results(result.step).time=result.time; 
+        if result.time~=-9999,
+                results(result.step).time=result.time; 
+        end
 
         %Add result
@@ -104 +108 @@
         %Get time and step
         results(result.step).step=result.step;
-        results(result.step).time=result.time; 
+        if result.time~=-9999,
+                results(result.step).time=result.time; 
+        end
 
         %Add result