Changeset 19317

Timestamp:

04/24/15 11:30:16 (10 years ago)

Author:

Eric.Larour

Message:

CHG: reintroducing checkpointing, but not driven by the esmfbinders. We rename it, following advice from
Max Suarez, recording, not checkpointing.

Location:

issm/trunk-jpl/src

Files:

• c/cores/transient_core.cpp (modified) (4 diffs)
• c/modules/ModelProcessorx/CreateParameters.cpp (modified) (1 diff)
• c/shared/Enum/EnumDefinitions.h (modified) (1 diff)
• c/shared/Enum/EnumToStringx.cpp (modified) (1 diff)
• c/shared/Enum/StringToEnumx.cpp (modified) (1 diff)
• m/classes/settings.m (modified) (5 diffs)
• m/classes/settings.py (modified) (5 diffs)
• m/enum/EnumDefinitions.py (modified) (1 diff)
• m/enum/SettingsRestartFrequencyEnum.m (deleted)

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

@@ -25 +25 @@
         bool       time_adapt;
         int        output_frequency;
+        int        recording_frequency;
         int        domaintype,groundingline_migration,smb_model;
         int        numoutputs;
@@ -42 +43 @@
         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);
@@ -57 +59 @@
         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: */
@@ -175 +180 @@
                         femmodel->RequestedOutputsx(&femmodel->results,&outputs[0],1,save_results);
                 }
+                
+                if(recording_frequency&& step%recording_frequency==0){
+                        if(VerboseSolution()) _printf0_("   checkpointing model \n");
+                        femmodel->CheckPoint();
+                }
 
                 if(save_results){

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

@@ -48 +48 @@
         parameters->AddObject(iomodel->CopyConstantObject(DomainDimensionEnum));
         parameters->AddObject(iomodel->CopyConstantObject(SettingsOutputFrequencyEnum));
-        parameters->AddObject(iomodel->CopyConstantObject(SettingsRestartFrequencyEnum));
+        parameters->AddObject(iomodel->CopyConstantObject(SettingsRecordingFrequencyEnum));
         parameters->AddObject(iomodel->CopyConstantObject(ConstantsYtsEnum));
         parameters->AddObject(iomodel->CopyConstantObject(TimesteppingStartTimeEnum));

issm/trunk-jpl/src/c/shared/Enum/EnumDefinitions.h

@@ -293 +293 @@
         SettingsLowmemEnum,
         SettingsOutputFrequencyEnum,
-        SettingsRestartFrequencyEnum,
+        SettingsRecordingFrequencyEnum,
         SettingsWaitonlockEnum,
         DebugProfilingEnum,

issm/trunk-jpl/src/c/shared/Enum/EnumToStringx.cpp

@@ -299 +299 @@
                 case SettingsLowmemEnum : return "SettingsLowmem";
                 case SettingsOutputFrequencyEnum : return "SettingsOutputFrequency";
-                case SettingsRestartFrequencyEnum : return "SettingsRestartFrequency";
+                case SettingsRecordingFrequencyEnum : return "SettingsRecordingFrequency";
                 case SettingsWaitonlockEnum : return "SettingsWaitonlock";
                 case DebugProfilingEnum : return "DebugProfiling";

issm/trunk-jpl/src/c/shared/Enum/StringToEnumx.cpp

@@ -305 +305 @@
               else if (strcmp(name,"SettingsLowmem")==0) return SettingsLowmemEnum;
               else if (strcmp(name,"SettingsOutputFrequency")==0) return SettingsOutputFrequencyEnum;
-              else if (strcmp(name,"SettingsRestartFrequency")==0) return SettingsRestartFrequencyEnum;
+              else if (strcmp(name,"SettingsRecordingFrequency")==0) return SettingsRecordingFrequencyEnum;
               else if (strcmp(name,"SettingsWaitonlock")==0) return SettingsWaitonlockEnum;
               else if (strcmp(name,"DebugProfiling")==0) return DebugProfilingEnum;

issm/trunk-jpl/src/m/classes/settings.m

@@ -10 +10 @@
                 lowmem              = 0;
                 output_frequency    = 0;
-                restart_frequency   = 0;
+                recording_frequency   = 0;
                 waitonlock          = 0;
                 upload_server       = '';
@@ -60 +60 @@
 
                         %checkpoints frequency, by default never: 
-                        self.restart_frequency=0;
+                        self.recording_frequency=0;
 
                         %this option can be activated to load automatically the results
@@ -78 +78 @@
                         md = checkfield(md,'fieldname','settings.lowmem','numel',[1],'values',[0 1]);
                         md = checkfield(md,'fieldname','settings.output_frequency','numel',[1],'>=',1);
-                        md = checkfield(md,'fieldname','settings.restart_frequency','numel',[1],'>=',0);
+                        md = checkfield(md,'fieldname','settings.recording_frequency','numel',[1],'>=',0);
                         md = checkfield(md,'fieldname','settings.waitonlock','numel',[1]);
 
@@ -89 +89 @@
                         fielddisplay(self,'lowmem','is the memory limited ? (0 or 1)');
                         fielddisplay(self,'output_frequency','frequency at which results are saved in all solutions with multiple time_steps');
-                        fielddisplay(self,'restart_frequency','frequency at which the runs are being checkpointed, allowing for a restart');
+                        fielddisplay(self,'recording_frequency','frequency at which the runs are being checkpointed, allowing for a restart');
                         fielddisplay(self,'waitonlock','maximum number of minutes to wait for batch results (NaN to deactivate)');
                         fielddisplay(self,'upload_server','server hostname where model should be uploaded');
@@ -103 +103 @@
                         WriteData(fid,'object',self,'fieldname','lowmem','format','Boolean');
                         WriteData(fid,'object',self,'fieldname','output_frequency','format','Integer');
-                        WriteData(fid,'object',self,'fieldname','restart_frequency','format','Integer');
+                        WriteData(fid,'object',self,'fieldname','recording_frequency','format','Integer');
                         if self.waitonlock>0,
                                 WriteData(fid,'enum',SettingsWaitonlockEnum(),'data',true,'format','Boolean');

issm/trunk-jpl/src/m/classes/settings.py

@@ -17 +17 @@
                 self.lowmem              = 0
                 self.output_frequency    = 0
-                self.restart_frequency    = 0
+                self.recording_frequency    = 0
                 self.waitonlock          = 0
 
@@ -31 +31 @@
                 string="%s\n%s"%(string,fielddisplay(self,"lowmem","is the memory limited ? (0 or 1)"))
                 string="%s\n%s"%(string,fielddisplay(self,"output_frequency","frequency at which results are saved in all solutions with multiple time_steps"))
-                string="%s\n%s"%(string,fielddisplay(self,"restart_frequency","frequency at which the runs are being checkpointed, allowing for a restart"))
+                string="%s\n%s"%(string,fielddisplay(self,"recording_frequency","frequency at which the runs are being checkpointed, allowing for a restart"))
                 string="%s\n%s"%(string,fielddisplay(self,"waitonlock","maximum number of minutes to wait for batch results, or return 0"))
                 return string
@@ -47 +47 @@
 
                 #checkpoints frequency, by default never: 
-                self.restart_frequency=0
+                self.recording_frequency=0
 
 
@@ -63 +63 @@
                 md = checkfield(md,'fieldname','settings.lowmem','numel',[1],'values',[0,1])
                 md = checkfield(md,'fieldname','settings.output_frequency','numel',[1],'>=',1)
-                md = checkfield(md,'fieldname','settings.restart_frequency','numel',[1],'>=',0)
+                md = checkfield(md,'fieldname','settings.recording_frequency','numel',[1],'>=',0)
                 md = checkfield(md,'fieldname','settings.waitonlock','numel',[1])
 
@@ -73 +73 @@
                 WriteData(fid,'object',self,'fieldname','lowmem','format','Boolean')
                 WriteData(fid,'object',self,'fieldname','output_frequency','format','Integer')
-                WriteData(fid,'object',self,'fieldname','restart_frequency','format','Integer')
+                WriteData(fid,'object',self,'fieldname','recording_frequency','format','Integer')
                 if self.waitonlock>0:
                         WriteData(fid,'enum',SettingsWaitonlockEnum(),'data',True,'format','Boolean');

issm/trunk-jpl/src/m/enum/EnumDefinitions.py

@@ -291 +291 @@
 def SettingsLowmemEnum(): return StringToEnum("SettingsLowmem")[0]
 def SettingsOutputFrequencyEnum(): return StringToEnum("SettingsOutputFrequency")[0]
-def SettingsRestartFrequencyEnum(): return StringToEnum("SettingsRestartFrequency")[0]
+def SettingsRecordingFrequencyEnum(): return StringToEnum("SettingsRecordingFrequency")[0]
 def SettingsWaitonlockEnum(): return StringToEnum("SettingsWaitonlock")[0]
 def DebugProfilingEnum(): return StringToEnum("DebugProfiling")[0]