Changeset 26744 for issm/trunk/src/m/classes/timestepping.js

Timestamp:

12/22/21 10:39:44 (3 years ago)

Author:

Mathieu Morlighem

Message:

merged trunk-jpl and trunk for revision 26742

Location:

issm/trunk

Files:

• . (modified) (1 prop)
• src (modified) (1 prop)
• src/m/classes/timestepping.js (modified) (6 diffs)

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

@@ -6 +6 @@
 function timestepping (){
         //methods
-        this.setdefaultparameters = function(){// {{{
+        this.setdefaultparameters = function(){ //{{{
                 //time between 2 time steps
                 this.time_step=1./2.;
@@ -14 +14 @@
 
                 //should we interpolate forcings between timesteps?
-                this.interp_forcings=1;
-        }// }}}
-        this.disp= function(){// {{{
+                this.interp_forcing=1;
+                this.cycle_forcing=0;
+        } //}}}
+        this.disp= function(){ //{{{
 
                 var unit;
@@ -24 +25 @@
                 fielddisplay(this,'final_time','final time to stop the simulation ['+ unit + ']');
                 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,'interp_forcing','interpolate in time between requested forcing values ? (0 or 1)');
+                fielddisplay(this,'cycle_forcing','cycle through forcing ? (0 or 1)');
                 fielddisplay(this,'coupling_time','length of coupling time steps with ocean model [' +unit+ ']');
 
-        }// }}}
-        this.classname= function(){// {{{
+        } //}}}
+        this.classname= function(){ //{{{
                 return "timestepping";
 
-        }// }}}
+        } //}}}
         this.checkconsistency = function(md,solution,analyses) { //{{{
 
@@ -37 +39 @@
                 checkfield(md,'fieldname','timestepping.final_time','numel',[1],'NaN',1,'Inf',1);
                 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.interp_forcing','numel',[1],'values',[0,1]);
+                checkfield(md,'fieldname','timestepping.cycle_forcing','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');
+                }
+                if (solution=='TransientSolution'){
+                        checkfield(md,'fieldname','timestepping.time_step','numel',[1],'>',0,'NaN',1,'Inf',1);
                 }
         } // }}}
@@ -52 +58 @@
                 WriteData(fid,prefix,'object',this,'fieldname','final_time','format','Double','scale',scale);
                 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','interp_forcing','format','Boolean');
+                WriteData(fid,prefix,'object',this,'fieldname','cycle_forcing','format','Boolean');
                 WriteData(fid,prefix,'object',this,'fieldname','coupling_time','format','Double','scale',scale);
 
@@ -63 +70 @@
         this.final_time      = 0.;
         this.time_step       = 0.;
-        this.interp_forcings = 1;
+        this.interp_forcing  = 1;
+        this.cycle_forcing   = 1;
         this.coupling_time   = 0.;