Changeset 20958

Timestamp:

07/20/16 09:22:55 (9 years ago)

Author:

Mathieu Morlighem

Message:

CHG: do not start from starttime, start from provided time (either from ModelProcessor, which uses starttime, or from restart file)

File:

• issm/trunk-jpl/src/c/cores/transient_core.cpp (modified) (4 diffs)

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

@@ -20 +20 @@
 
         /*parameters: */
-        IssmDouble starttime,finaltime,dt,yts;
+        IssmDouble finaltime,dt,yts;
         bool       isstressbalance,ismasstransport,issmb,isFS,isthermal,isgroundingline,isgia,isslr,iscoupler,ismovingfront,isdamageevolution,ishydrology;
         bool       save_results,dakota_analysis;
@@ -35 +35 @@
         IssmDouble time;
 
-        //then recover parameters common to all solutions
+        /*first, figure out if there was a check point, if so, do a reset of the FemModel* femmodel structure. */
+        if(recording_frequency) femmodel->Restart();
+
+        /*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(&time,TimeEnum);
         femmodel->parameters->FindParam(&finaltime,TimesteppingFinalTimeEnum);
         femmodel->parameters->FindParam(&dt,TimesteppingTimeStepEnum);
@@ -61 +64 @@
         femmodel->parameters->FindParam(&numoutputs,TransientNumRequestedOutputsEnum);
         if(numoutputs) femmodel->parameters->FindParam(&requested_outputs,&numoutputs,TransientRequestedOutputsEnum);
-
-        /*first, figure out if there was a check point, if so, do a reset of the FemModel* femmodel structure. */
-        if(recording_frequency)femmodel->Restart();
-
-        /*initialize: */
-        time=starttime;
 
         while(time < finaltime - (yts*DBL_EPSILON)){ //make sure we run up to finaltime.
@@ -158 +155 @@
                 }
 
-                if(recording_frequency&& step%recording_frequency==0){
+                if(recording_frequency && (step%recording_frequency==0)){
                         if(VerboseSolution()) _printf0_("   checkpointing model \n");
                         femmodel->CheckPoint();