Changeset 23670 for issm/trunk-jpl/src/py3/classes/timestepping.py

Timestamp:

01/31/19 07:34:11 (6 years ago)

Author:

bdef

Message:

CHG: python scripts after 2to3 and indentation fix

File:

• issm/trunk-jpl/src/py3/classes/timestepping.py (modified) (5 diffs)

issm/trunk-jpl/src/py3/classes/timestepping.py

@@ -1 +1 @@
 from fielddisplay import fielddisplay
-from EnumDefinitions import *
 from checkfield import checkfield
 from WriteData import WriteData
@@ -16 +15 @@
                 self.final_time      = 0.
                 self.time_step       = 0.
-                self.time_adapt      = 0
-                self.cfl_coefficient = 0.
                 self.interp_forcings = 1
+                self.coupling_time   = 0.
                 
                 #set defaults
@@ -29 +27 @@
                 string="%s\n%s"%(string,fielddisplay(self,"final_time","final time to stop the simulation [yr]"))
                 string="%s\n%s"%(string,fielddisplay(self,"time_step","length of time steps [yr]"))
-                string="%s\n%s"%(string,fielddisplay(self,"time_adapt","use cfl condition to define time step ? (0 or 1) "))
-                string="%s\n%s"%(string,fielddisplay(self,"cfl_coefficient","coefficient applied to cfl condition"))
                 string="%s\n%s"%(string,fielddisplay(self,"interp_forcings","interpolate in time between requested forcing values ? (0 or 1)"))
+                string="%s\n%s"%(string,fielddisplay(self,"coupling_time","length of coupling time steps with ocean model [yr]"))
                 return string
                 #}}}
@@ -42 +39 @@
                 self.final_time=10.*self.time_step
 
-                #time adaptation? 
-                self.time_adapt=0
-                self.cfl_coefficient=0.5
-                
                 #should we interpolate forcings between timesteps?
                 self.interp_forcings=1
@@ -56 +49 @@
                 md = checkfield(md,'fieldname','timestepping.final_time','numel',[1],'NaN',1,'Inf',1)
                 md = checkfield(md,'fieldname','timestepping.time_step','numel',[1],'>=',0,'NaN',1,'Inf',1)
-                md = checkfield(md,'fieldname','timestepping.time_adapt','numel',[1],'values',[0,1])
-                md = checkfield(md,'fieldname','timestepping.cfl_coefficient','numel',[1],'>',0,'<=',1)
                 if self.final_time-self.start_time<0:
                         md.checkmessage("timestepping.final_time should be larger than timestepping.start_time")
+                        md = checkfield(md,'fieldname','timestepping.coupling_time','numel',[1],'>=',0,'NaN',1,'Inf',1)
                 md = checkfield(md,'fieldname','timestepping.interp_forcings','numel',[1],'values',[0,1])
 
                 return md
         # }}}
-        def marshall(self,md,fid):    # {{{
+        def marshall(self,prefix,md,fid):    # {{{
 
                 yts=md.constants.yts
-                
-                WriteData(fid,'object',self,'fieldname','start_time','format','Double','scale',yts)
-                WriteData(fid,'object',self,'fieldname','final_time','format','Double','scale',yts)
-                WriteData(fid,'object',self,'fieldname','time_step','format','Double','scale',yts)
-                WriteData(fid,'object',self,'fieldname','time_adapt','format','Boolean')
-                WriteData(fid,'object',self,'fieldname','cfl_coefficient','format','Double')
-                WriteData(fid,'object',self,'fieldname','interp_forcings','format','Boolean')
+                WriteData(fid,prefix,'name','md.timestepping.type','data',1,'format','Integer');
+                WriteData(fid,prefix,'object',self,'fieldname','start_time','format','Double','scale',yts)
+                WriteData(fid,prefix,'object',self,'fieldname','final_time','format','Double','scale',yts)
+                WriteData(fid,prefix,'object',self,'fieldname','time_step','format','Double','scale',yts)
+                WriteData(fid,prefix,'object',self,'fieldname','interp_forcings','format','Boolean')
+                WriteData(fid,prefix,'object',self,'fieldname','coupling_time','format','Double','scale',yts)
         # }}}