Changeset 19333

Timestamp:

04/30/15 12:55:17 (10 years ago)

Author:

Eric.Larour

Message:

CHG: retrieve step from the ModelProcessorx given value instead of hardcoding it to 0
at the beginning of the transient core. We also give it a value of 0 instead of 1 in the
ModelProcessorx. This is to allow the steps to increment correctly (instead of resetting)
when running restart and checkpointing in a couple GCM/ISSM run.

Location:

issm/trunk-jpl/src/c

Files:

• cores/transient_core.cpp (modified) (2 diffs)
• modules/ModelProcessorx/CreateParameters.cpp (modified) (1 diff)

issm/trunk-jpl/src/c/cores/transient_core.cpp

@@ -37 +37 @@
         //then recover parameters common to all solutions
         femmodel->parameters->FindParam(&domaintype,DomainTypeEnum);
+        femmodel->parameters->FindParam(&step,StepEnum);
         femmodel->parameters->FindParam(&starttime,TimesteppingStartTimeEnum);
         femmodel->parameters->FindParam(&finaltime,TimesteppingFinalTimeEnum);
@@ -64 +65 @@
 
         /*initialize: */
-        step=0;
         time=starttime;
 

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

@@ -191 +191 @@
         iomodel->Constant(&time,TimesteppingStartTimeEnum);
         parameters->AddObject(new DoubleParam(TimeEnum,time));  
-        parameters->AddObject(new IntParam(StepEnum,1));  
+        parameters->AddObject(new IntParam(StepEnum,0));  
 
         /*By default, save all results*/