Changeset 19307

Timestamp:

04/23/15 11:33:54 (10 years ago)

Author:

Eric.Larour

Message:

CHG: unhooking check pointing and restart from transientcore. Hardcoding it into the esmfbinders.

Location:

issm/trunk-jpl/src/c

Files:

• cores/transient_core.cpp (modified) (4 diffs)
• main/esmfbinders.cpp (modified) (2 diffs)

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

@@ -25 +25 @@
         bool       time_adapt;
         int        output_frequency;
-        int        restart_frequency;
         int        domaintype,groundingline_migration,smb_model;
         int        numoutputs;
@@ -35 +34 @@
         IssmDouble time;
 
-        //first, figure out if there was a check point, if so, do a reset of the FemModel* femmodel structure. 
-        femmodel->Restart();
-
         //then recover parameters common to all solutions
         femmodel->parameters->FindParam(&domaintype,DomainTypeEnum);
@@ -46 +42 @@
         femmodel->parameters->FindParam(&dakota_analysis,QmuIsdakotaEnum);
         femmodel->parameters->FindParam(&output_frequency,SettingsOutputFrequencyEnum);
-        femmodel->parameters->FindParam(&restart_frequency,SettingsRestartFrequencyEnum);
         femmodel->parameters->FindParam(&time_adapt,TimesteppingTimeAdaptEnum);
         femmodel->parameters->FindParam(&isstressbalance,TransientIsstressbalanceEnum);
@@ -185 +180 @@
                         OutputResultsx(femmodel);
                 }
-                if(restart_frequency && step%restart_frequency==0){
-                        if(VerboseSolution()) _printf0_("   checkpointing model \n");
-                        femmodel->CheckPoint();
-                }
         }
 

issm/trunk-jpl/src/c/main/esmfbinders.cpp

@@ -33 +33 @@
                 /*Some specific code here for the binding: */
                 femmodel->parameters->SetParam(SMBgcmEnum,SurfaceforcingsEnum); //bypass SMB model, will be provided by GCM!
+        
+                /*Restart file: */
+                femmodel->Restart();
 
                 /*Assign output pointers: */
@@ -106 +109 @@
         void FinalizeISSM(){ /*{{{*/
 
+                /*Output results: */
+                OutputResultsx(femmodel);
+                        
+                /*Check point: */
+                femmodel->CheckPoint();
+
                 /*Wrap up: */
                 delete femmodel; femmodel=NULL;