Changeset 21787

Timestamp:

07/13/17 15:09:33 (8 years ago)

Author:

Mathieu Morlighem

Message:

NEW: created new class for time adaptation

Location:

issm/trunk-jpl

Files:

• src/c/classes/FemModel.cpp (modified) (3 diffs)
• src/c/cores/transient_core.cpp (modified) (4 diffs)
• src/c/modules/ModelProcessorx/CreateParameters.cpp (modified) (2 diffs)
• src/c/shared/Enum/EnumDefinitions.h (modified) (1 diff)
• src/c/shared/Enum/EnumToStringx.cpp (modified) (1 diff)
• src/c/shared/Enum/StringToEnumx.cpp (modified) (1 diff)
• src/c/shared/io/Marshalling/IoCodeConversions.cpp (modified) (1 diff)
• src/m/classes/model.py (modified) (1 diff)
• src/m/classes/timestepping.js (modified) (4 diffs)
• src/m/classes/timestepping.m (modified) (6 diffs)
• src/m/classes/timestepping.py (modified) (5 diffs)
• src/m/classes/timesteppingadaptive.js (added)
• src/m/classes/timesteppingadaptive.m (moved) (moved from issm/trunk-jpl/src/m/classes/timeadaptation.m ) (6 diffs)
• src/m/classes/timesteppingadaptive.py (added)
• test/NightlyRun/test226.js (modified) (1 diff)
• test/NightlyRun/test226.m (modified) (1 diff)
• test/NightlyRun/test226.py (modified) (1 diff)
• test/NightlyRun/test227.js (modified) (1 diff)
• test/NightlyRun/test227.m (modified) (1 diff)
• test/NightlyRun/test227.py (modified) (1 diff)
• test/NightlyRun/test323.m (modified) (1 diff)
• test/NightlyRun/test323.py (modified) (1 diff)
• test/NightlyRun/test324.m (modified) (1 diff)
• test/NightlyRun/test324.py (modified) (1 diff)
• test/NightlyRun/test4001.m (modified) (2 diffs)

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

@@ -2065 +2065 @@
 void FemModel::TimeAdaptx(IssmDouble* pdt){/*{{{*/
 
-        int      i;
-
         /*output: */
         IssmDouble   dt;
@@ -2077 +2075 @@
         Element* element=(Element*)elements->GetObjectByOffset(0); min_dt=element->TimeAdapt();
 
-        for (i=1;i<elements->Size();i++){
+        for(int i=1;i<elements->Size();i++){
                 element=xDynamicCast<Element*>(elements->GetObjectByOffset(i));
                 dt=element->TimeAdapt();
@@ -2088 +2086 @@
         min_dt=node_min_dt;
 
-        /*Constrain dt if necessary*/
-        int timestepping_type;
+        /*Constrain dt */
         IssmDouble dt_low,dt_high;
-        parameters->FindParam(&timestepping_type,TimesteppingTypeEnum);
-        if(timestepping_type==TimeAdaptationEnum){
-                parameters->FindParam(&dt_low,TimesteppingTimeStepMinEnum);
-                parameters->FindParam(&dt_high,TimesteppingTimeStepMaxEnum);
-                if(min_dt<dt_low)  min_dt = dt_low;
-                if(min_dt>dt_high) min_dt = dt_high;
-        }
+        parameters->FindParam(&dt_low,TimesteppingTimeStepMinEnum);
+        parameters->FindParam(&dt_high,TimesteppingTimeStepMaxEnum);
+        if(min_dt<dt_low)  min_dt = dt_low;
+        if(min_dt>dt_high) min_dt = dt_high;
 
         /*Assign output pointers:*/

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

@@ -23 +23 @@
         bool       isstressbalance,ismasstransport,issmb,isFS,isthermal,isgroundingline,isgia,isslr,iscoupler,ismovingfront,isdamageevolution,ishydrology;
         bool       save_results,dakota_analysis;
-        bool       time_adapt;
+        int        timestepping;
         int        output_frequency;
         int        recording_frequency;
@@ -47 +47 @@
         femmodel->parameters->FindParam(&dakota_analysis,QmuIsdakotaEnum);
         femmodel->parameters->FindParam(&output_frequency,SettingsOutputFrequencyEnum);
-        femmodel->parameters->FindParam(&time_adapt,TimesteppingTimeAdaptEnum);
+        femmodel->parameters->FindParam(&timestepping,TimesteppingTypeEnum);
         femmodel->parameters->FindParam(&isstressbalance,TransientIsstressbalanceEnum);
         femmodel->parameters->FindParam(&ismasstransport,TransientIsmasstransportEnum);
@@ -71 +71 @@
 
         while(time < finaltime - (yts*DBL_EPSILON)){ //make sure we run up to finaltime.
-                /*Increment*/
-                if(time_adapt){
-                        femmodel->TimeAdaptx(&dt);
-                        if(time+dt>finaltime) dt=finaltime-time;
-                        femmodel->parameters->SetParam(dt,TimesteppingTimeStepEnum);
-                }
-                else{
-                        femmodel->parameters->FindParam(&dt,TimesteppingTimeStepEnum);
+
+                /*Time Increment*/
+                switch(timestepping){
+                        case AdaptiveTimesteppingEnum:
+                                femmodel->TimeAdaptx(&dt);
+                                if(time+dt>finaltime) dt=finaltime-time;
+                                femmodel->parameters->SetParam(dt,TimesteppingTimeStepEnum);
+                                break;
+                        case FixedTimesteppingEnum:
+                                femmodel->parameters->FindParam(&dt,TimesteppingTimeStepEnum);
+                                break;
+                        default:
+                                _error_("Time stepping \""<<EnumToStringx(timestepping)<<"\" not supported yet");
                 }
                 step+=1;
@@ -183 +188 @@
                 }
                 #endif
-        
         }
         

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

@@ -143 +143 @@
                         parameters->AddObject(iomodel->CopyConstantObject("md.timestepping.start_time",TimesteppingStartTimeEnum));
                         parameters->AddObject(iomodel->CopyConstantObject("md.timestepping.final_time",TimesteppingFinalTimeEnum));
-                        parameters->AddObject(iomodel->CopyConstantObject("md.timestepping.time_adapt",TimesteppingTimeAdaptEnum));
                         parameters->AddObject(iomodel->CopyConstantObject("md.timestepping.time_step",TimesteppingTimeStepEnum));
-                        parameters->AddObject(iomodel->CopyConstantObject("md.timestepping.cfl_coefficient",TimesteppingCflCoefficientEnum));
                         parameters->AddObject(iomodel->CopyConstantObject("md.timestepping.interp_forcings",TimesteppingInterpForcingsEnum));
                         break;
-                case TimeAdaptationEnum:
-                        parameters->AddObject(new BoolParam(TimesteppingTimeAdaptEnum,true));
+                case AdaptiveTimesteppingEnum:
                         parameters->AddObject(iomodel->CopyConstantObject("md.timestepping.start_time",TimesteppingStartTimeEnum));
                         parameters->AddObject(iomodel->CopyConstantObject("md.timestepping.final_time",TimesteppingFinalTimeEnum));
@@ -158 +155 @@
                         break;
                 default:
-                        _error_(EnumToStringx(timestepping_type) <<" not supported yet");
+                        _error_("Time stepping \""<<EnumToStringx(timestepping_type)<<"\" not supported yet");
         }
         iomodel->FindConstant(&time,"md.timestepping.start_time");

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

@@ -32 +32 @@
         TimesteppingTypeEnum,
         FixedTimesteppingEnum,
-        TimeAdaptationEnum,
+        AdaptiveTimesteppingEnum,
         TimesteppingTimeStepMinEnum,
         TimesteppingTimeStepMaxEnum,

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

@@ -40 +40 @@
                 case TimesteppingTypeEnum : return "TimesteppingType";
                 case FixedTimesteppingEnum : return "FixedTimestepping";
-                case TimeAdaptationEnum : return "TimeAdaptation";
+                case AdaptiveTimesteppingEnum : return "AdaptiveTimestepping";
                 case TimesteppingTimeStepMinEnum : return "TimesteppingTimeStepMin";
                 case TimesteppingTimeStepMaxEnum : return "TimesteppingTimeStepMax";

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

@@ -40 +40 @@
               else if (strcmp(name,"TimesteppingType")==0) return TimesteppingTypeEnum;
               else if (strcmp(name,"FixedTimestepping")==0) return FixedTimesteppingEnum;
-              else if (strcmp(name,"TimeAdaptation")==0) return TimeAdaptationEnum;
+              else if (strcmp(name,"AdaptiveTimestepping")==0) return AdaptiveTimesteppingEnum;
               else if (strcmp(name,"TimesteppingTimeStepMin")==0) return TimesteppingTimeStepMinEnum;
               else if (strcmp(name,"TimesteppingTimeStepMax")==0) return TimesteppingTimeStepMaxEnum;

issm/trunk-jpl/src/c/shared/io/Marshalling/IoCodeConversions.cpp ¶

@@ -124 +124 @@
         switch(enum_in){
                 case 1: return FixedTimesteppingEnum;
-                case 2: return TimeAdaptationEnum; 
+                case 2: return AdaptiveTimesteppingEnum; 
                 default: _error_("Marshalled materials code \""<<enum_in<<"\" not supported yet"); 
         }

issm/trunk-jpl/src/m/classes/model.py ¶

@@ -24 +24 @@
 from flowequation import flowequation
 from timestepping import timestepping
+from timesteppingadaptive import timesteppingadaptive
 from initialization import initialization
 from rifts import rifts

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

@@ -13 +13 @@
                 this.final_time=10.*this.time_step;
 
-                //time adaptation? 
-                this.time_adapt=0;
-                this.cfl_coefficient=0.5;
-
                 //should we interpolate forcings between timesteps?
                 this.interp_forcings=1;
@@ -28 +24 @@
                 fielddisplay(this,'final_time','final time to stop the simulation ['+ unit + ']');
                 fielddisplay(this,'time_step','length of time steps [' +unit+ ']');
-                fielddisplay(this,'time_adapt','use cfl condition to define time step ? (0 or 1) ');
-                fielddisplay(this,'cfl_coefficient','coefficient applied to cfl condition');
                 fielddisplay(this,'interp_forcings','interpolate in time between requested forcing values ? (0 or 1)');
 
@@ -37 +31 @@
 
         }// }}}
-                this.checkconsistency = function(md,solution,analyses) { //{{{
-                        
-                        checkfield(md,'fieldname','timestepping.start_time','numel',[1],'NaN',1,'Inf',1);
-                        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.time_adapt','numel',[1],'values',[0,1]);
-                        checkfield(md,'fieldname','timestepping.cfl_coefficient','numel',[1],'>',0,'<=',1);
-                        checkfield(md,'fieldname','timestepping.interp_forcings','numel',[1],'values',[0,1]);
-                        if (this.final_time-this.start_time<0){
-                                md.checkmessage('timestepping.final_time should be larger than timestepping.start_time');
-                        }
-                } // }}}
-                this.marshall=function(md,prefix,fid) { //{{{
+        this.checkconsistency = function(md,solution,analyses) { //{{{
 
-                        var scale;
-                        scale = md.constants.yts;
-                        
-                        WriteData(fid,prefix,'name','md.timestepping.type','data',1,'format','Integer');
-                        WriteData(fid,prefix,'object',this,'fieldname','start_time','format','Double','scale',scale);
-                        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','time_adapt','format','Boolean');
-                        WriteData(fid,prefix,'object',this,'fieldname','cfl_coefficient','format','Double');
-                        WriteData(fid,prefix,'object',this,'fieldname','interp_forcings','format','Boolean');
+                checkfield(md,'fieldname','timestepping.start_time','numel',[1],'NaN',1,'Inf',1);
+                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]);
+                if (this.final_time-this.start_time<0){
+                        md.checkmessage('timestepping.final_time should be larger than timestepping.start_time');
+                }
+        } // }}}
+        this.marshall=function(md,prefix,fid) { //{{{
 
-                }//}}}
-                this.fix=function() { //{{{
-                }//}}}
+                var scale;
+                scale = md.constants.yts;
+
+                WriteData(fid,prefix,'name','md.timestepping.type','data',1,'format','Integer');
+                WriteData(fid,prefix,'object',this,'fieldname','start_time','format','Double','scale',scale);
+                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');
+
+        }//}}}
+        this.fix=function() { //{{{
+        }//}}}
         //properties 
         // {{{
@@ -70 +60 @@
         this.final_time      = 0.;
         this.time_step       = 0.;
-        this.time_adapt      = 0;
-        this.cfl_coefficient = 0.;
         this.interp_forcings = 1;
 

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

@@ -9 +9 @@
                 final_time      = 0.;
                 time_step       = 0.;
-                time_adapt      = 0;
-                cfl_coefficient = 0.;
                 interp_forcings = 1;
         end
@@ -30 +28 @@
                         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;
@@ -42 +36 @@
                         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);
                         md = checkfield(md,'fieldname','timestepping.interp_forcings','numel',[1],'values',[0 1]);
                         if self.final_time-self.start_time<0,
@@ -56 +48 @@
                         fielddisplay(self,'final_time',['final time to stop the simulation [' unit ']']);
                         fielddisplay(self,'time_step',['length of time steps [' unit ']']);
-                        fielddisplay(self,'time_adapt','use cfl condition to define time step ? (0 or 1) ');
-                        fielddisplay(self,'cfl_coefficient','coefficient applied to cfl condition');
                         fielddisplay(self,'interp_forcings','interpolate in time between requested forcing values ? (0 or 1)');
 
@@ -68 +58 @@
                         WriteData(fid,prefix,'object',self,'fieldname','final_time','format','Double','scale',scale);
                         WriteData(fid,prefix,'object',self,'fieldname','time_step','format','Double','scale',scale);
-                        WriteData(fid,prefix,'object',self,'fieldname','time_adapt','format','Boolean');
-                        WriteData(fid,prefix,'object',self,'fieldname','cfl_coefficient','format','Double');
                         WriteData(fid,prefix,'object',self,'fieldname','interp_forcings','format','Boolean');
                 end % }}}
@@ -77 +65 @@
                         writejsdouble(fid,[modelname '.timestepping.final_time'],self.final_time);
                         writejsdouble(fid,[modelname '.timestepping.time_step'],self.time_step);
-                        writejsdouble(fid,[modelname '.timestepping.time_adapt'],self.time_adapt);
-                        writejsdouble(fid,[modelname '.timestepping.cfl_coefficient'],self.cfl_coefficient);
                         writejsdouble(fid,[modelname '.timestepping.interp_forcings'],self.interp_forcings);
 

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

@@ -15 +15 @@
                 self.final_time      = 0.
                 self.time_step       = 0.
-                self.time_adapt      = 0
-                self.cfl_coefficient = 0.
                 self.interp_forcings = 1
                 
@@ -28 +26 @@
                 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)"))
                 return string
@@ -41 +37 @@
                 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
@@ -55 +47 @@
                 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")
@@ -70 +60 @@
                 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','time_adapt','format','Boolean')
-                WriteData(fid,prefix,'object',self,'fieldname','cfl_coefficient','format','Double')
                 WriteData(fid,prefix,'object',self,'fieldname','interp_forcings','format','Boolean')
         # }}}

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

@@ -1 @@
-%TIMESTEPPING Class definition
+%TIMESTEPPINGADAPTIVE Class definition
 %
 %   Usage:
-%      timeadaptation=timeadaptation();
+%      timesteppingadaptive=timesteppingadaptive();
 
-classdef timeadaptation
+classdef timesteppingadaptive
         properties (SetAccess=public) 
                 start_time      = 0.;
@@ -14 +14 @@
         end
         methods
-                function self = timeadaptation(varargin) % {{{
+                function self = timesteppingadaptive(varargin) % {{{
                         switch nargin
                                 case 0
                                         self=setdefaultparameters(self);
                                 case 1
-                                        self=structtoobj(timeadaptation(),varargin{1});
+                                        self=structtoobj(timesteppingadaptive(),varargin{1});
                                 otherwise
                                         error('constructor not supported');
@@ -28 +28 @@
                         %time between 2 time steps
                         self.time_step_min = 0.01;
-                        self.time_step_max = 1.;
+                        self.time_step_max = 10.;
 
                         %final time
@@ -44 +44 @@
                         md = checkfield(md,'fieldname','timestepping.final_time','numel',[1],'NaN',1,'Inf',1);
                         md = checkfield(md,'fieldname','timestepping.time_step_min','numel',[1],'>=',0,'NaN',1,'Inf',1);
-                        md = checkfield(md,'fieldname','timestepping.time_step_max','numel',[1],'>=',0,'NaN',1,'Inf',1);
-                        if (self.time_step_min>self.time_step_max)
-                                md = checkmessage(md,['base not equal to bed on grounded ice!']);
-                        end
+                        md = checkfield(md,'fieldname','timestepping.time_step_max','numel',[1],'>=',md.timestepping.time_step_min,'NaN',1,'Inf',1);
                         md = checkfield(md,'fieldname','timestepping.cfl_coefficient','numel',[1],'>',0,'<=',1);
                         md = checkfield(md,'fieldname','timestepping.interp_forcings','numel',[1],'values',[0 1]);
@@ -55 +52 @@
                 end % }}}
                 function disp(self) % {{{
-                        disp(sprintf('   timeadaptation parameters:'));
+                        disp(sprintf('   timesteppingadaptive parameters:'));
 
                         unit = 'yr';
@@ -79 +76 @@
                 function savemodeljs(self,fid,modelname) % {{{
                 
-                        writejsdouble(fid,[modelname '.timeadaptation.start_time'],self.start_time);
-                        writejsdouble(fid,[modelname '.timeadaptation.final_time'],self.final_time);
-                        writejsdouble(fid,[modelname '.timeadaptation.time_step_min'],self.time_step_min);
-                        writejsdouble(fid,[modelname '.timeadaptation.time_step_max'],self.time_step_max);
-                        writejsdouble(fid,[modelname '.timeadaptation.cfl_coefficient'],self.cfl_coefficient);
-                        writejsdouble(fid,[modelname '.timeadaptation.interp_forcings'],self.interp_forcings);
+                        writejsdouble(fid,[modelname '.timesteppingadaptive.start_time'],self.start_time);
+                        writejsdouble(fid,[modelname '.timesteppingadaptive.final_time'],self.final_time);
+                        writejsdouble(fid,[modelname '.timesteppingadaptive.time_step_min'],self.time_step_min);
+                        writejsdouble(fid,[modelname '.timesteppingadaptive.time_step_max'],self.time_step_max);
+                        writejsdouble(fid,[modelname '.timesteppingadaptive.cfl_coefficient'],self.cfl_coefficient);
+                        writejsdouble(fid,[modelname '.timesteppingadaptive.interp_forcings'],self.interp_forcings);
 
                 end % }}}

issm/trunk-jpl/test/NightlyRun/test226.js ¶

@@ -6 +6 @@
 setflowequation(md,'SSA','all');
 //md.cluster=generic('name',oshostname(),'np',3);
-md.timestepping.time_adapt=1.;
+md.timestepping = timesteppingadaptive(md.timestepping);
 md.timestepping.final_time=15.;
 md=solve(md,'Transient');

issm/trunk-jpl/test/NightlyRun/test226.m ¶

@@ -5 +5 @@
 md=setflowequation(md,'SSA','all');
 md.cluster=generic('name',oshostname(),'np',3);
-md.timestepping.time_adapt=1.;
+md.timestepping = timesteppingadaptive(md.timestepping);
 md.timestepping.final_time=15.;
 md=solve(md,'Transient');

issm/trunk-jpl/test/NightlyRun/test226.py ¶

@@ -14 +14 @@
 md=setflowequation(md,'SSA','all')
 md.cluster=generic('name',gethostname(),'np',3)
-md.timestepping.time_adapt=1.
+md.timestepping = timesteppingadaptive(md.timestepping);
 md.timestepping.final_time=15.
 md=solve(md,'Transient')

issm/trunk-jpl/test/NightlyRun/test227.js ¶

@@ -7 +7 @@
 setflowequation(md,'HO','all');
 //md.cluster=generic('name',oshostname(),'np',3);
-md.timestepping.time_adapt=1.;
+md.timestepping = timesteppingadaptive(md.timestepping);
 md.timestepping.final_time=20.;
 md=solve(md,'Transient');

issm/trunk-jpl/test/NightlyRun/test227.m ¶

@@ -6 +6 @@
 md=setflowequation(md,'HO','all');
 md.cluster=generic('name',oshostname(),'np',3);
-md.timestepping.time_adapt=1.;
+md.timestepping = timesteppingadaptive(md.timestepping);
 md.timestepping.final_time=20.;
 md=solve(md,'Transient');

issm/trunk-jpl/test/NightlyRun/test227.py ¶

@@ -15 +15 @@
 md=setflowequation(md,'HO','all')
 md.cluster=generic('name',gethostname(),'np',3)
-md.timestepping.time_adapt=1.
+md.timestepping = timesteppingadaptive(md.timestepping)
 md.timestepping.final_time=20.
 md=solve(md,'Transient')

issm/trunk-jpl/test/NightlyRun/test323.m ¶

@@ -5 +5 @@
 md=setflowequation(md,'SSA','all');
 md.cluster=generic('name',oshostname(),'np',3);
-md.timestepping.time_adapt=1;
+md.timestepping = timesteppingadaptive(md.timestepping);
+md.timestepping.time_step_max = 10000.;
 md.timestepping.final_time=1120.;
 md=solve(md,'Transient');

issm/trunk-jpl/test/NightlyRun/test323.py ¶

@@ -15 +15 @@
 md=setflowequation(md,'SSA','all')
 md.cluster=generic('name',gethostname(),'np',3)
-md.timestepping.time_adapt=1
+md.timestepping = timesteppingadaptive(md.timestepping);
+md.timestepping.time_step_max = 10000.;
 md.timestepping.final_time=1120.
 md=solve(md,'Transient')

issm/trunk-jpl/test/NightlyRun/test324.m ¶

@@ -6 +6 @@
 md=setflowequation(md,'SIA','all');
 md.cluster=generic('name',oshostname(),'np',3);
-md.timestepping.time_adapt=1;
+md.timestepping = timesteppingadaptive(md.timestepping);
+md.timestepping.time_step_max = 10000.;
 md.timestepping.final_time=16000.;
 md=solve(md,'Transient');

issm/trunk-jpl/test/NightlyRun/test324.py ¶

@@ -16 +16 @@
 md=setflowequation(md,'SIA','all')
 md.cluster=generic('name',gethostname(),'np',3)
-md.timestepping.time_adapt=1
+md.timestepping = timesteppingadaptive(md.timestepping);
+md.timestepping.time_step_max = 10000.;
 md.timestepping.final_time=16000.
 md=solve(md,'Transient')

issm/trunk-jpl/test/NightlyRun/test4001.m ¶

@@ -539 +539 @@
         md.timestepping.final_time=final_time;
         md.timestepping.time_step=time_step;
-        md.timestepping.time_adapt=0;
         md.transient.isgroundingline=1;
         md.transient.isthermal=0;
@@ -653 +652 @@
         md.timestepping.final_time=final_time;
         md.timestepping.time_step=time_step;
-        md.timestepping.time_adapt=0;
         md.cluster=generic('name',oshostname(),'np',2);
         md.results.TransientSolution.Base=md.geometry.base;