Changeset 20959

Timestamp:

07/20/16 10:00:26 (9 years ago)

Author:

felicity

Message:

BUG: do not say you restart if file does not exist, and use recoring_frequency only after it is fetched in params

Location:

issm/trunk-jpl/src/c

Files:

• classes/FemModel.cpp (modified) (2 diffs)
• cores/transient_core.cpp (modified) (2 diffs)

issm/trunk-jpl/src/c/classes/FemModel.cpp

@@ -433 +433 @@
         parameters->FindParam(&restartfilename,RestartFileNameEnum);
 
+        /*Now, figure out whether this file actually exists!: */
+        restartfid=pfopen(restartfilename,"r",false);
+
+        if(restartfid==NULL){
+                xDelete<char>(restartfilename);
+                return; //could not find the file, so no restart possible.
+        }
+
         /*Print banner*/
         _printf0_("                                                                    \n");
@@ -441 +449 @@
         _printf0_("====================================================================\n");
         _printf0_("                                                                    \n");
-
-        /*Now, figure out whether this file actually exists!: */
-        restartfid=pfopen(restartfilename,"r",false);
-
-        if(restartfid==NULL){
-                xDelete<char>(restartfilename);
-                return; //could not find the file, so no restart possible.
-        }
 
         /*Figure out size of buffer to be read: */

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

@@ -36 +36 @@
 
         /*first, figure out if there was a check point, if so, do a reset of the FemModel* femmodel structure. */
+        femmodel->parameters->FindParam(&recording_frequency,SettingsRecordingFrequencyEnum);
         if(recording_frequency) femmodel->Restart();
 
@@ -47 +48 @@
         femmodel->parameters->FindParam(&dakota_analysis,QmuIsdakotaEnum);
         femmodel->parameters->FindParam(&output_frequency,SettingsOutputFrequencyEnum);
-        femmodel->parameters->FindParam(&recording_frequency,SettingsRecordingFrequencyEnum);
         femmodel->parameters->FindParam(&time_adapt,TimesteppingTimeAdaptEnum);
         femmodel->parameters->FindParam(&isstressbalance,TransientIsstressbalanceEnum);