Changeset 22459

Timestamp:

02/23/18 14:10:41 (7 years ago)

Author:

seroussi

Message:

ADD: adding coupling_time for ice/ocean coupling

Location:

issm/trunk-jpl/src/m/classes

Files:

• timestepping.js (modified) (4 diffs)
• timestepping.m (modified) (4 diffs)
• timestepping.py (modified) (4 diffs)
• timesteppingadaptive.js (modified) (4 diffs)
• timesteppingadaptive.m (modified) (5 diffs)
• timesteppingadaptive.py (modified) (4 diffs)

issm/trunk-jpl/src/m/classes/timestepping.js

@@ -25 +25 @@
                 fielddisplay(this,'time_step','length of time steps [' +unit+ ']');
                 fielddisplay(this,'interp_forcings','interpolate in time between requested forcing values ? (0 or 1)');
+                fielddisplay(this,'coupling_time','length of coupling time steps with ocean model [' +unit+ ']');
 
         }// }}}
@@ -37 +38 @@
                 checkfield(md,'fieldname','timestepping.time_step','numel',[1],'>=',0,'NaN',1,'Inf',1);
                 checkfield(md,'fieldname','timestepping.interp_forcings','numel',[1],'values',[0,1]);
+                checkfield(md,'fieldname','timestepping.coupling_time','numel',[1],'>=',0,'NaN',1,'Inf',1);
                 if (this.final_time-this.start_time<0){
                         md.checkmessage('timestepping.final_time should be larger than timestepping.start_time');
@@ -51 +53 @@
                 WriteData(fid,prefix,'object',this,'fieldname','time_step','format','Double','scale',scale);
                 WriteData(fid,prefix,'object',this,'fieldname','interp_forcings','format','Boolean');
+                WriteData(fid,prefix,'object',this,'fieldname','coupling_time','format','Double','scale',scale);
 
         }//}}}
@@ -61 +64 @@
         this.time_step       = 0.;
         this.interp_forcings = 1;
+        this.coupling_time   = 0.;
 
         this.setdefaultparameters();

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

@@ -10 +10 @@
                 time_step       = 0.;
                 interp_forcings = 1;
+                coupling_time   = 0.;
         end
         methods
@@ -44 +45 @@
                         if strcmp(solution,'TransientSolution'),
                                 md = checkfield(md,'fieldname','timestepping.time_step','numel',[1],'>',0,'NaN',1,'Inf',1);
+                                md = checkfield(md,'fieldname','timestepping.time_step','numel',[1],'>=',0,'NaN',1,'Inf',1);
                         end
                 end % }}}
@@ -54 +56 @@
                         fielddisplay(self,'time_step',['length of time steps [' unit ']']);
                         fielddisplay(self,'interp_forcings','interpolate in time between requested forcing values ? (0 or 1)');
+                        fielddisplay(self,'coupling_time',['length of coupling time step with ocean model  [' unit ']']);
 
                 end % }}}
@@ -64 +67 @@
                         WriteData(fid,prefix,'object',self,'fieldname','time_step','format','Double','scale',scale);
                         WriteData(fid,prefix,'object',self,'fieldname','interp_forcings','format','Boolean');
+                        WriteData(fid,prefix,'object',self,'fieldname','coupling_time','format','Double','scale',scale);
                 end % }}}
                 function savemodeljs(self,fid,modelname) % {{{

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

@@ -16 +16 @@
                 self.time_step       = 0.
                 self.interp_forcings = 1
+                self.coupling_time   = 0.
                 
                 #set defaults
@@ -27 +28 @@
                 string="%s\n%s"%(string,fielddisplay(self,"time_step","length of time steps [yr]"))
                 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
                 #}}}
@@ -49 +51 @@
                 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])
 
@@ -61 +64 @@
                 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)
         # }}}

issm/trunk-jpl/src/m/classes/timesteppingadaptive.js

@@ -31 +31 @@
                 fielddisplay(this,'cfl_coefficient','coefficient applied to cfl condition');
                 fielddisplay(this,'interp_forcings','interpolate in time between requested forcing values ? (0 or 1)');
+                fielddisplay(this,'coupling_time','coupling time steps with ocean model [' +unit+ ']');
 
         }// }}}
@@ -48 +49 @@
                         md.checkmessage('timestepping.final_time should be larger than timestepping.start_time');
                 }
+                checkfield(md,'fieldname','timestepping.coupling_time','numel',[1],'>=',0,'NaN',1,'Inf',1);
         } // }}}
         this.marshall=function(md,prefix,fid) { //{{{
@@ -61 +63 @@
                 WriteData(fid,prefix,'object',this,'class','timestepping','fieldname','cfl_coefficient','format','Double');
                 WriteData(fid,prefix,'object',this,'class','timestepping','fieldname','interp_forcings','format','Boolean');
+                WriteData(fid,prefix,'object',this,'class','timestepping','fieldname','coupling_time','format','Double','scale',scale);
 
         }//}}}
@@ -73 +76 @@
         this.cfl_coefficient = 0.;
         this.interp_forcings = 1;
+        this.coupling_time   = 0.;
 
         this.setdefaultparameters();

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

@@ -12 +12 @@
                 cfl_coefficient = 0.;
                 interp_forcings = 1;
+                coupling_time   = 0.;
         end
         methods
@@ -47 +48 @@
                         md = checkfield(md,'fieldname','timestepping.cfl_coefficient','numel',[1],'>',0,'<=',1);
                         md = checkfield(md,'fieldname','timestepping.interp_forcings','numel',[1],'values',[0 1]);
+                        md = checkfield(md,'fieldname','timestepping.coupling_time','numel',[1],'>=',md.timestepping.coupling_time,'NaN',1,'Inf',1);
                         if self.final_time-self.start_time<0,
                                 md = checkmessage(md,'timestepping.final_time should be larger than timestepping.start_time');
@@ -61 +63 @@
                         fielddisplay(self,'cfl_coefficient','coefficient applied to cfl condition');
                         fielddisplay(self,'interp_forcings','interpolate in time between requested forcing values ? (0 or 1)');
+                        fielddisplay(self,'coupling_time',['coupling time step with ocean model [' unit ']']);
 
                 end % }}}
@@ -73 +76 @@
                         WriteData(fid,prefix,'object',self,'class','timestepping','fieldname','cfl_coefficient','format','Double');
                         WriteData(fid,prefix,'object',self,'class','timestepping','fieldname','interp_forcings','format','Boolean');
+                        WriteData(fid,prefix,'object',self,'class','timestepping','fieldname','coupling_time','format','Double','scale',scale);
                 end % }}}
                 function savemodeljs(self,fid,modelname) % {{{
@@ -82 +86 @@
                         writejsdouble(fid,[modelname '.timesteppingadaptive.cfl_coefficient'],self.cfl_coefficient);
                         writejsdouble(fid,[modelname '.timesteppingadaptive.interp_forcings'],self.interp_forcings);
+                        writejsdouble(fid,[modelname '.timesteppingadaptive.coupling_time'],self.time_step_max);
 
                 end % }}}

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

@@ -19 +19 @@
                         self.cfl_coefficient = 0.
                         self.interp_forcings = 1
+                        self.coupling_time   = 0.
                         
                         #set defaults
@@ -42 +43 @@
                 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","coupling time steps with ocean model [yr]"))
                 return string
                 #}}}
@@ -71 +73 @@
                         md.checkmessage("timestepping.final_time should be larger than timestepping.start_time")
                 md = checkfield(md,'fieldname','timestepping.interp_forcings','numel',[1],'values',[0,1])
+                md = checkfield(md,'fieldname','timestepping.coupling_time','numel',[1],'>=',0,'NaN',1,'Inf',1)
 
                 return md
@@ -84 +87 @@
                 WriteData(fid,prefix,'object',self,'class','timestepping','fieldname','cfl_coefficient','format','Double')
                 WriteData(fid,prefix,'object',self,'class','timestepping','fieldname','interp_forcings','format','Boolean')
+                WriteData(fid,prefix,'object',self,'class','timestepping','fieldname','coupling_time','format','Double','scale',yts)
         # }}}