Index: /issm/trunk/src/c/EnumDefinitions/EnumDefinitions.h =================================================================== --- /issm/trunk/src/c/EnumDefinitions/EnumDefinitions.h (revision 9627) +++ /issm/trunk/src/c/EnumDefinitions/EnumDefinitions.h (revision 9628) @@ -35,4 +35,8 @@ SettingsIoGatherEnum, MiscellaneousNameEnum, //FIXME: only used by qmu, should not be marshalled (already in queueing script) + TimesteppingTimeStepEnum, + TimesteppingFinalTimeEnum, + TimesteppingTimeAdaptEnum, + TimesteppingCflCoefficientEnum, /*}}}*/ /*Datasets {{{1*/ @@ -191,7 +195,4 @@ ControlTypeEnum, ConvergedEnum, - DtEnum, - TimeAdaptEnum, - CflCoefficientEnum, ElementOnBedEnum, ElementOnIceSheetEnum, @@ -350,5 +351,4 @@ MinMechanicalConstraintsEnum, MinThermalConstraintsEnum, - NdtEnum, NumberOfElementsEnum, NumberOfVerticesEnum, Index: /issm/trunk/src/c/modules/EnumToStringx/EnumToStringx.cpp =================================================================== --- /issm/trunk/src/c/modules/EnumToStringx/EnumToStringx.cpp (revision 9627) +++ /issm/trunk/src/c/modules/EnumToStringx/EnumToStringx.cpp (revision 9628) @@ -39,4 +39,8 @@ case SettingsIoGatherEnum : return "SettingsIoGather"; case MiscellaneousNameEnum : return "MiscellaneousName"; + case TimesteppingTimeStepEnum : return "TimesteppingTimeStep"; + case TimesteppingFinalTimeEnum : return "TimesteppingFinalTime"; + case TimesteppingTimeAdaptEnum : return "TimesteppingTimeAdapt"; + case TimesteppingCflCoefficientEnum : return "TimesteppingCflCoefficient"; case ConstraintsEnum : return "Constraints"; case ElementsEnum : return "Elements"; @@ -158,7 +162,4 @@ case ControlTypeEnum : return "ControlType"; case ConvergedEnum : return "Converged"; - case DtEnum : return "Dt"; - case TimeAdaptEnum : return "TimeAdapt"; - case CflCoefficientEnum : return "CflCoefficient"; case ElementOnBedEnum : return "ElementOnBed"; case ElementOnIceSheetEnum : return "ElementOnIceSheet"; @@ -301,5 +302,4 @@ case MinMechanicalConstraintsEnum : return "MinMechanicalConstraints"; case MinThermalConstraintsEnum : return "MinThermalConstraints"; - case NdtEnum : return "Ndt"; case NumberOfElementsEnum : return "NumberOfElements"; case NumberOfVerticesEnum : return "NumberOfVertices"; Index: /issm/trunk/src/c/modules/ModelProcessorx/CreateParameters.cpp =================================================================== --- /issm/trunk/src/c/modules/ModelProcessorx/CreateParameters.cpp (revision 9627) +++ /issm/trunk/src/c/modules/ModelProcessorx/CreateParameters.cpp (revision 9628) @@ -36,8 +36,8 @@ parameters->AddObject(iomodel->CopyConstantObject(MaxSteadystateIterationsEnum)); parameters->AddObject(iomodel->CopyConstantObject(ConstantsYtsEnum)); - parameters->AddObject(iomodel->CopyConstantObject(DtEnum)); - parameters->AddObject(iomodel->CopyConstantObject(NdtEnum)); - parameters->AddObject(iomodel->CopyConstantObject(TimeAdaptEnum)); - parameters->AddObject(iomodel->CopyConstantObject(CflCoefficientEnum)); + parameters->AddObject(iomodel->CopyConstantObject(TimesteppingTimeStepEnum)); + parameters->AddObject(iomodel->CopyConstantObject(TimesteppingFinalTimeEnum)); + parameters->AddObject(iomodel->CopyConstantObject(TimesteppingTimeAdaptEnum)); + parameters->AddObject(iomodel->CopyConstantObject(TimesteppingCflCoefficientEnum)); parameters->AddObject(iomodel->CopyConstantObject(HydrostaticAdjustmentEnum)); parameters->AddObject(iomodel->CopyConstantObject(PenaltyOffsetEnum)); Index: /issm/trunk/src/c/modules/StringToEnumx/StringToEnumx.cpp =================================================================== --- /issm/trunk/src/c/modules/StringToEnumx/StringToEnumx.cpp (revision 9627) +++ /issm/trunk/src/c/modules/StringToEnumx/StringToEnumx.cpp (revision 9628) @@ -37,4 +37,8 @@ else if (strcmp(name,"SettingsIoGather")==0) return SettingsIoGatherEnum; else if (strcmp(name,"MiscellaneousName")==0) return MiscellaneousNameEnum; + else if (strcmp(name,"TimesteppingTimeStep")==0) return TimesteppingTimeStepEnum; + else if (strcmp(name,"TimesteppingFinalTime")==0) return TimesteppingFinalTimeEnum; + else if (strcmp(name,"TimesteppingTimeAdapt")==0) return TimesteppingTimeAdaptEnum; + else if (strcmp(name,"TimesteppingCflCoefficient")==0) return TimesteppingCflCoefficientEnum; else if (strcmp(name,"Constraints")==0) return ConstraintsEnum; else if (strcmp(name,"Elements")==0) return ElementsEnum; @@ -156,7 +160,4 @@ else if (strcmp(name,"ControlType")==0) return ControlTypeEnum; else if (strcmp(name,"Converged")==0) return ConvergedEnum; - else if (strcmp(name,"Dt")==0) return DtEnum; - else if (strcmp(name,"TimeAdapt")==0) return TimeAdaptEnum; - else if (strcmp(name,"CflCoefficient")==0) return CflCoefficientEnum; else if (strcmp(name,"ElementOnBed")==0) return ElementOnBedEnum; else if (strcmp(name,"ElementOnIceSheet")==0) return ElementOnIceSheetEnum; @@ -299,5 +300,4 @@ else if (strcmp(name,"MinMechanicalConstraints")==0) return MinMechanicalConstraintsEnum; else if (strcmp(name,"MinThermalConstraints")==0) return MinThermalConstraintsEnum; - else if (strcmp(name,"Ndt")==0) return NdtEnum; else if (strcmp(name,"NumberOfElements")==0) return NumberOfElementsEnum; else if (strcmp(name,"NumberOfVertices")==0) return NumberOfVerticesEnum; Index: /issm/trunk/src/c/objects/Elements/Penta.cpp =================================================================== --- /issm/trunk/src/c/objects/Elements/Penta.cpp (revision 9627) +++ /issm/trunk/src/c/objects/Elements/Penta.cpp (revision 9628) @@ -1874,5 +1874,5 @@ latentheat=matpar->GetLatentHeat(); thermalconductivity=matpar->GetThermalConductivity(); - this->parameters->FindParam(&dt,DtEnum); + this->parameters->FindParam(&dt,TimesteppingTimeStepEnum); this->parameters->FindParam(&artdiff,ArtificialDiffusivityEnum); Input* pressure_input=inputs->GetInput(PressureEnum); _assert_(pressure_input); @@ -2016,5 +2016,5 @@ /*Retrieve all inputs and parameters*/ - this->parameters->FindParam(&dt,DtEnum); + this->parameters->FindParam(&dt,TimesteppingTimeStepEnum); mixed_layer_capacity=matpar->GetMixedLayerCapacity(); thermal_exchange_velocity=matpar->GetThermalExchangeVelocity(); @@ -2148,5 +2148,5 @@ heatcapacity=matpar->GetHeatCapacity(); thermalconductivity=matpar->GetThermalConductivity(); - this->parameters->FindParam(&dt,DtEnum); + this->parameters->FindParam(&dt,TimesteppingTimeStepEnum); this->parameters->FindParam(&artdiff,ArtificialDiffusivityEnum); Input* vx_input=inputs->GetInput(VxEnum); _assert_(vx_input); @@ -2285,5 +2285,5 @@ /*Retrieve all inputs and parameters*/ - this->parameters->FindParam(&dt,DtEnum); + this->parameters->FindParam(&dt,TimesteppingTimeStepEnum); mixed_layer_capacity=matpar->GetMixedLayerCapacity(); thermal_exchange_velocity=matpar->GetThermalExchangeVelocity(); @@ -3310,5 +3310,5 @@ heatcapacity=matpar->GetHeatCapacity(); thermalconductivity=matpar->GetThermalConductivity(); - this->parameters->FindParam(&dt,DtEnum); + this->parameters->FindParam(&dt,TimesteppingTimeStepEnum); this->parameters->FindParam(&artdiff,ArtificialDiffusivityEnum); Input* vx_input=inputs->GetInput(VxEnum); _assert_(vx_input); @@ -3396,5 +3396,5 @@ rho_ice=matpar->GetRhoIce(); heatcapacity=matpar->GetHeatCapacity(); - this->parameters->FindParam(&dt,DtEnum); + this->parameters->FindParam(&dt,TimesteppingTimeStepEnum); Input* pressure_input=inputs->GetInput(PressureEnum); _assert_(pressure_input); @@ -3453,5 +3453,5 @@ rho_ice=matpar->GetRhoIce(); heatcapacity=matpar->GetHeatCapacity(); - this->parameters->FindParam(&dt,DtEnum); + this->parameters->FindParam(&dt,TimesteppingTimeStepEnum); Input* vx_input=inputs->GetInput(VxEnum); _assert_(vx_input); Input* vy_input=inputs->GetInput(VyEnum); _assert_(vy_input); @@ -3577,5 +3577,5 @@ heatcapacity=matpar->GetHeatCapacity(); thermalconductivity=matpar->GetThermalConductivity(); - this->parameters->FindParam(&dt,DtEnum); + this->parameters->FindParam(&dt,TimesteppingTimeStepEnum); this->parameters->FindParam(&artdiff,ArtificialDiffusivityEnum); Input* vx_input=inputs->GetInput(VxEnum); _assert_(vx_input); @@ -3663,5 +3663,5 @@ rho_ice=matpar->GetRhoIce(); heatcapacity=matpar->GetHeatCapacity(); - this->parameters->FindParam(&dt,DtEnum); + this->parameters->FindParam(&dt,TimesteppingTimeStepEnum); Input* pressure_input=inputs->GetInput(PressureEnum); _assert_(pressure_input); @@ -3720,5 +3720,5 @@ rho_ice=matpar->GetRhoIce(); heatcapacity=matpar->GetHeatCapacity(); - this->parameters->FindParam(&dt,DtEnum); + this->parameters->FindParam(&dt,TimesteppingTimeStepEnum); Input* vx_input=inputs->GetInput(VxEnum); _assert_(vx_input); Input* vy_input=inputs->GetInput(VyEnum); _assert_(vy_input); @@ -7433,5 +7433,5 @@ /*get CFL coefficient:*/ - this->parameters->FindParam(&C,CflCoefficientEnum); + this->parameters->FindParam(&C,TimesteppingCflCoefficientEnum); /*Get for Vx and Vy, the max of abs value: */ Index: /issm/trunk/src/c/objects/Elements/Tria.cpp =================================================================== --- /issm/trunk/src/c/objects/Elements/Tria.cpp (revision 9627) +++ /issm/trunk/src/c/objects/Elements/Tria.cpp (revision 9628) @@ -869,5 +869,5 @@ /*Retrieve all inputs and parameters*/ GetVerticesCoordinates(&xyz_list[0][0], nodes, NUMVERTICES); - this->parameters->FindParam(&dt,DtEnum); + this->parameters->FindParam(&dt,TimesteppingTimeStepEnum); this->parameters->FindParam(&artdiff,ArtificialDiffusivityEnum); Input* vx_input=inputs->GetInput(HydrologyWaterVxEnum); _assert_(vx_input); @@ -1027,5 +1027,5 @@ /*Retrieve all inputs and parameters*/ GetVerticesCoordinates(&xyz_list[0][0], nodes, NUMVERTICES); - this->parameters->FindParam(&dt,DtEnum); + this->parameters->FindParam(&dt,TimesteppingTimeStepEnum); this->parameters->FindParam(&dim,DimEnum); this->parameters->FindParam(&artdiff,ArtificialDiffusivityEnum); @@ -1137,5 +1137,5 @@ /*Retrieve all inputs and parameters*/ GetVerticesCoordinates(&xyz_list[0][0], nodes, NUMVERTICES); - this->parameters->FindParam(&dt,DtEnum); + this->parameters->FindParam(&dt,TimesteppingTimeStepEnum); this->parameters->FindParam(&dim,DimEnum); Input* vxaverage_input=NULL; @@ -1941,5 +1941,5 @@ /*Retrieve all inputs and parameters*/ GetVerticesCoordinates(&xyz_list[0][0], nodes, NUMVERTICES); - this->parameters->FindParam(&dt,DtEnum); + this->parameters->FindParam(&dt,TimesteppingTimeStepEnum); Input* basal_melting_input=inputs->GetInput(BasalforcingsMeltingRateEnum); _assert_(basal_melting_input); Input* old_watercolumn_input=inputs->GetInput(WaterColumnOldEnum); _assert_(old_watercolumn_input); @@ -1986,5 +1986,5 @@ /*Retrieve all inputs and parameters*/ GetVerticesCoordinates(&xyz_list[0][0], nodes, NUMVERTICES); - this->parameters->FindParam(&dt,DtEnum); + this->parameters->FindParam(&dt,TimesteppingTimeStepEnum); Input* surface_mass_balance_input=inputs->GetInput(SurfaceforcingsMassBalanceEnum); _assert_(surface_mass_balance_input); Input* basal_melting_input=inputs->GetInput(BasalforcingsMeltingRateEnum); _assert_(basal_melting_input); @@ -2033,5 +2033,5 @@ /*Retrieve all inputs and parameters*/ - this->parameters->FindParam(&dt,DtEnum); + this->parameters->FindParam(&dt,TimesteppingTimeStepEnum); GetVerticesCoordinates(&xyz_list[0][0], nodes, NUMVERTICES); Input* surface_mass_balance_input=inputs->GetInput(SurfaceforcingsMassBalanceEnum); _assert_(surface_mass_balance_input); @@ -5174,5 +5174,5 @@ /*get CFL coefficient:*/ - this->parameters->FindParam(&C,CflCoefficientEnum); + this->parameters->FindParam(&C,TimesteppingCflCoefficientEnum); /*Get for Vx and Vy, the max of abs value: */ Index: /issm/trunk/src/c/objects/Loads/Numericalflux.cpp =================================================================== --- /issm/trunk/src/c/objects/Loads/Numericalflux.cpp (revision 9627) +++ /issm/trunk/src/c/objects/Loads/Numericalflux.cpp (revision 9628) @@ -456,5 +456,5 @@ /*Retrieve all inputs and parameters*/ GetVerticesCoordinates(&xyz_list[0][0], nodes,NUMVERTICES_INTERNAL); - parameters->FindParam(&dt,DtEnum); + parameters->FindParam(&dt,TimesteppingTimeStepEnum); Input* vxaverage_input=tria->inputs->GetInput(VxEnum); Input* vyaverage_input=tria->inputs->GetInput(VyEnum); @@ -519,5 +519,5 @@ /*Retrieve all inputs and parameters*/ GetVerticesCoordinates(&xyz_list[0][0],nodes,NUMVERTICES_BOUNDARY); - parameters->FindParam(&dt,DtEnum); + parameters->FindParam(&dt,TimesteppingTimeStepEnum); Input* vxaverage_input=tria->inputs->GetInput(VxEnum); _assert_(vxaverage_input); Input* vyaverage_input=tria->inputs->GetInput(VyEnum); _assert_(vyaverage_input); @@ -797,5 +797,5 @@ /*Retrieve all inputs and parameters*/ GetVerticesCoordinates(&xyz_list[0][0],nodes,NUMVERTICES_BOUNDARY); - parameters->FindParam(&dt,DtEnum); + parameters->FindParam(&dt,TimesteppingTimeStepEnum); Input* vxaverage_input =tria->inputs->GetInput(VxEnum); _assert_(vxaverage_input); Input* vyaverage_input =tria->inputs->GetInput(VyEnum); _assert_(vyaverage_input); Index: /issm/trunk/src/c/objects/Loads/Pengrid.cpp =================================================================== --- /issm/trunk/src/c/objects/Loads/Pengrid.cpp (revision 9627) +++ /issm/trunk/src/c/objects/Loads/Pengrid.cpp (revision 9628) @@ -631,5 +631,5 @@ penta->GetParameterValue(&temperature,node,TemperatureEnum); inputs->GetParameterValue(&melting_offset,MeltingOffsetEnum); - parameters->FindParam(&dt,DtEnum); + parameters->FindParam(&dt,TimesteppingTimeStepEnum); parameters->FindParam(&penalty_offset,PenaltyOffsetEnum); Index: /issm/trunk/src/c/shared/Numerics/UnitConversion.cpp =================================================================== --- /issm/trunk/src/c/shared/Numerics/UnitConversion.cpp (revision 9627) +++ /issm/trunk/src/c/shared/Numerics/UnitConversion.cpp (revision 9628) @@ -47,6 +47,6 @@ double scale; switch(type_enum){ - case DtEnum: scale=1.0/yts;break; //yr - case NdtEnum: scale=1.0/yts;break; //yr + case TimesteppingTimeStepEnum: scale=1.0/yts;break; //yr + case TimesteppingFinalTimeEnum: scale=1.0/yts;break; //yr case TimeEnum: scale=1.0/yts;break; //yr case VxEnum: scale=yts;break; //m/yr Index: /issm/trunk/src/c/solutions/enthalpy_core.cpp =================================================================== --- /issm/trunk/src/c/solutions/enthalpy_core.cpp (revision 9627) +++ /issm/trunk/src/c/solutions/enthalpy_core.cpp (revision 9628) @@ -19,5 +19,5 @@ double time; int nsteps; - double ndt; + double final_time; double dt; double melting_offset; @@ -26,15 +26,15 @@ //first recover parameters common to all solutions - femmodel->parameters->FindParam(&ndt,NdtEnum); - femmodel->parameters->FindParam(&dt,DtEnum); + femmodel->parameters->FindParam(&final_time,TimesteppingFinalTimeEnum); + femmodel->parameters->FindParam(&dt,TimesteppingTimeStepEnum); femmodel->parameters->FindParam(&control_analysis,ControlAnalysisEnum); femmodel->parameters->FindParam(&solution_type,SolutionTypeEnum); /*Compute number of time steps: */ - if((dt==0)|| (ndt==0)){ + if((dt==0)|| (final_time==0)){ dt=0; nsteps=1; } - else nsteps=(int)(ndt/dt); + else nsteps=(int)(final_time/dt); /*Loop through time: */ Index: /issm/trunk/src/c/solutions/hydrology_core.cpp =================================================================== --- /issm/trunk/src/c/solutions/hydrology_core.cpp (revision 9627) +++ /issm/trunk/src/c/solutions/hydrology_core.cpp (revision 9628) @@ -18,5 +18,5 @@ double time; int nsteps; - double ndt; + double final_time; double dt; bool control_analysis; @@ -24,6 +24,6 @@ //first recover parameters common to all solutions - femmodel->parameters->FindParam(&ndt,NdtEnum); - femmodel->parameters->FindParam(&dt,DtEnum); + femmodel->parameters->FindParam(&final_time,TimesteppingFinalTimeEnum); + femmodel->parameters->FindParam(&dt,TimesteppingTimeStepEnum); femmodel->parameters->FindParam(&control_analysis,ControlAnalysisEnum); femmodel->parameters->FindParam(&solution_type,SolutionTypeEnum); @@ -34,9 +34,9 @@ /*Compute number of time steps: */ - if((dt==0)|| (ndt==0)){ + if((dt==0)|| (final_time==0)){ dt=0; nsteps=1; } - else nsteps=(int)(ndt/dt); + else nsteps=(int)(final_time/dt); /*Loop through time: */ Index: /issm/trunk/src/c/solutions/thermal_core.cpp =================================================================== --- /issm/trunk/src/c/solutions/thermal_core.cpp (revision 9627) +++ /issm/trunk/src/c/solutions/thermal_core.cpp (revision 9628) @@ -19,5 +19,5 @@ double time; int nsteps; - double ndt; + double final_time; double dt; double melting_offset; @@ -27,6 +27,6 @@ //first recover parameters common to all solutions - femmodel->parameters->FindParam(&ndt,NdtEnum); - femmodel->parameters->FindParam(&dt,DtEnum); + femmodel->parameters->FindParam(&final_time,TimesteppingFinalTimeEnum); + femmodel->parameters->FindParam(&dt,TimesteppingTimeStepEnum); femmodel->parameters->FindParam(&control_analysis,ControlAnalysisEnum); femmodel->parameters->FindParam(&solution_type,SolutionTypeEnum); @@ -34,9 +34,9 @@ /*Compute number of time steps: */ - if((dt==0)|| (ndt==0)){ + if((dt==0)|| (final_time==0)){ dt=0; nsteps=1; } - else nsteps=(int)(ndt/dt); + else nsteps=(int)(final_time/dt); if(dakota_analysis){ Index: /issm/trunk/src/c/solutions/transient_core.cpp =================================================================== --- /issm/trunk/src/c/solutions/transient_core.cpp (revision 9627) +++ /issm/trunk/src/c/solutions/transient_core.cpp (revision 9628) @@ -29,11 +29,11 @@ //first recover parameters common to all solutions femmodel->parameters->FindParam(&dim,DimEnum); - femmodel->parameters->FindParam(&finaltime,NdtEnum); - femmodel->parameters->FindParam(&dt,DtEnum); + femmodel->parameters->FindParam(&finaltime,TimesteppingFinalTimeEnum); + femmodel->parameters->FindParam(&dt,TimesteppingTimeStepEnum); femmodel->parameters->FindParam(&yts,ConstantsYtsEnum); femmodel->parameters->FindParam(&control_analysis,ControlAnalysisEnum); femmodel->parameters->FindParam(&solution_type,SolutionTypeEnum); femmodel->parameters->FindParam(&output_frequency,OutputFrequencyEnum); - femmodel->parameters->FindParam(&time_adapt,TimeAdaptEnum); + femmodel->parameters->FindParam(&time_adapt,TimesteppingTimeAdaptEnum); femmodel->parameters->FindParam(&groundingline_migration,GroundinglineMigrationEnum); femmodel->parameters->FindParam(&isdiagnostic,IsdiagnosticEnum); @@ -51,5 +51,5 @@ TimeAdaptx(&dt,femmodel->elements, femmodel->nodes,femmodel->vertices,femmodel->loads, femmodel->materials, femmodel->parameters); if(time+dt>finaltime) dt=finaltime-time; - femmodel->parameters->SetParam(dt,DtEnum); + femmodel->parameters->SetParam(dt,TimesteppingTimeStepEnum); } step+=1; Index: /issm/trunk/src/m/classes/model/model.m =================================================================== --- /issm/trunk/src/m/classes/model/model.m (revision 9627) +++ /issm/trunk/src/m/classes/model/model.m (revision 9628) @@ -24,4 +24,5 @@ radaroverlay = modelfield('default',0,'marshall',false); miscellaneous = modelfield('default',0,'marshall',true); + timestepping = modelfield('default',0,'marshall',true); %FIXME: all other fields should belong to other classes @@ -160,8 +161,4 @@ %Transient - dt = modelfield('default',0,'marshall',true,'format','Double'); - ndt = modelfield('default',0,'marshall',true,'format','Double'); - time_adapt = modelfield('default',0,'marshall',true,'format','Boolean'); - cfl_coefficient = modelfield('default',0,'marshall',true,'format','Double'); artificial_diffusivity = modelfield('default',0,'marshall',true,'format','Integer'); prognostic_DG = modelfield('default',0,'marshall',true,'format','Integer'); @@ -421,4 +418,8 @@ if isfield(structmd,'notes'), md.miscellaneous.notes=structmd.notes; end if isfield(structmd,'dummy'), md.miscellaneous.dummy=structmd.dummy; end + if isfield(structmd,'dt'), md.timestepping.time_step=structmd.dt; end + if isfield(structmd,'ndt'), md.timestepping.final_time=structmd.ndt; end + if isfield(structmd,'time_adapt'), md.timestepping.time_adapt=structmd.time_adapt; end + if isfield(structmd,'cfl_coefficient'), md.timestepping.cfl_coefficient=structmd.cfl_coefficient; end %Field changes @@ -536,4 +537,5 @@ md.radaroverlay=radaroverlay; md.miscellaneous=miscellaneous; + md.timestepping=timestepping; %Materials parameters @@ -629,16 +631,4 @@ md.min_thermal_constraints=0; md.min_mechanical_constraints=0; - - %Transient parameters - - %time between 2 time steps - md.dt=1/2; - - %number of time steps = md.ndt / md.dt - md.ndt=10*md.dt; - - %time adaptation? - md.time_adapt=0; - md.cfl_coefficient=.5; %Hydrostatic adjustment Index: /issm/trunk/src/m/classes/timestepping.m =================================================================== --- /issm/trunk/src/m/classes/timestepping.m (revision 9628) +++ /issm/trunk/src/m/classes/timestepping.m (revision 9628) @@ -0,0 +1,49 @@ +%TIMESTEPPING Class definition +% +% Usage: +% timestepping=timestepping(); + +classdef timestepping + properties (SetAccess=public) + time_step = modelfield('default',0,'marshall',true,'format','Double'); + final_time = modelfield('default',0,'marshall',true,'format','Double'); + time_adapt = modelfield('default',0,'marshall',true,'format','Boolean'); + cfl_coefficient = modelfield('default',0,'marshall',true,'format','Double'); + end + methods + function obj = timestepping(varargin) % {{{ + switch nargin + case 0 + obj=setdefaultparameters(obj); + case 1 + in=varargin{1}; + if (isa(in,'numeric') & in==0), + % requesting templates do nothing + else + error('constructor not supported'); + end + otherwise + error('constructor not supported'); + end + end % }}} + function obj = setdefaultparameters(obj) % {{{ + + %first, use the defaults provided by the properties definition above. + fieldnames=fields(obj); + for i=1:length(fieldnames), + fieldname=fieldnames{i}; + obj.(fieldname)=obj.(fieldname).default; + end + + %time between 2 time steps + obj.time_step=1/2; + + %final time + obj.final_time=10*obj.time_step; + + %time adaptation? + obj.time_adapt=0; + obj.cfl_coefficient=.5; + end % }}} + end +end Index: sm/trunk/src/m/enum/CflCoefficientEnum.m =================================================================== --- /issm/trunk/src/m/enum/CflCoefficientEnum.m (revision 9627) +++ (revision ) @@ -1,11 +1,0 @@ -function macro=CflCoefficientEnum() -%CFLCOEFFICIENTENUM - Enum of CflCoefficient -% -% WARNING: DO NOT MODIFY THIS FILE -% this file has been automatically generated by src/c/EnumDefinitions/Synchronize.sh -% Please read src/c/EnumDefinitions/README for more information -% -% Usage: -% macro=CflCoefficientEnum() - -macro=StringToEnum('CflCoefficient'); Index: sm/trunk/src/m/enum/DtEnum.m =================================================================== --- /issm/trunk/src/m/enum/DtEnum.m (revision 9627) +++ (revision ) @@ -1,11 +1,0 @@ -function macro=DtEnum() -%DTENUM - Enum of Dt -% -% WARNING: DO NOT MODIFY THIS FILE -% this file has been automatically generated by src/c/EnumDefinitions/Synchronize.sh -% Please read src/c/EnumDefinitions/README for more information -% -% Usage: -% macro=DtEnum() - -macro=StringToEnum('Dt'); Index: sm/trunk/src/m/enum/NdtEnum.m =================================================================== --- /issm/trunk/src/m/enum/NdtEnum.m (revision 9627) +++ (revision ) @@ -1,11 +1,0 @@ -function macro=NdtEnum() -%NDTENUM - Enum of Ndt -% -% WARNING: DO NOT MODIFY THIS FILE -% this file has been automatically generated by src/c/EnumDefinitions/Synchronize.sh -% Please read src/c/EnumDefinitions/README for more information -% -% Usage: -% macro=NdtEnum() - -macro=StringToEnum('Ndt'); Index: sm/trunk/src/m/enum/TimeAdaptEnum.m =================================================================== --- /issm/trunk/src/m/enum/TimeAdaptEnum.m (revision 9627) +++ (revision ) @@ -1,11 +1,0 @@ -function macro=TimeAdaptEnum() -%TIMEADAPTENUM - Enum of TimeAdapt -% -% WARNING: DO NOT MODIFY THIS FILE -% this file has been automatically generated by src/c/EnumDefinitions/Synchronize.sh -% Please read src/c/EnumDefinitions/README for more information -% -% Usage: -% macro=TimeAdaptEnum() - -macro=StringToEnum('TimeAdapt'); Index: /issm/trunk/src/m/enum/TimesteppingCflCoefficientEnum.m =================================================================== --- /issm/trunk/src/m/enum/TimesteppingCflCoefficientEnum.m (revision 9628) +++ /issm/trunk/src/m/enum/TimesteppingCflCoefficientEnum.m (revision 9628) @@ -0,0 +1,11 @@ +function macro=TimesteppingCflCoefficientEnum() +%TIMESTEPPINGCFLCOEFFICIENTENUM - Enum of TimesteppingCflCoefficient +% +% WARNING: DO NOT MODIFY THIS FILE +% this file has been automatically generated by src/c/EnumDefinitions/Synchronize.sh +% Please read src/c/EnumDefinitions/README for more information +% +% Usage: +% macro=TimesteppingCflCoefficientEnum() + +macro=StringToEnum('TimesteppingCflCoefficient'); Index: /issm/trunk/src/m/enum/TimesteppingFinalTimeEnum.m =================================================================== --- /issm/trunk/src/m/enum/TimesteppingFinalTimeEnum.m (revision 9628) +++ /issm/trunk/src/m/enum/TimesteppingFinalTimeEnum.m (revision 9628) @@ -0,0 +1,11 @@ +function macro=TimesteppingFinalTimeEnum() +%TIMESTEPPINGFINALTIMEENUM - Enum of TimesteppingFinalTime +% +% WARNING: DO NOT MODIFY THIS FILE +% this file has been automatically generated by src/c/EnumDefinitions/Synchronize.sh +% Please read src/c/EnumDefinitions/README for more information +% +% Usage: +% macro=TimesteppingFinalTimeEnum() + +macro=StringToEnum('TimesteppingFinalTime'); Index: /issm/trunk/src/m/enum/TimesteppingTimeAdaptEnum.m =================================================================== --- /issm/trunk/src/m/enum/TimesteppingTimeAdaptEnum.m (revision 9628) +++ /issm/trunk/src/m/enum/TimesteppingTimeAdaptEnum.m (revision 9628) @@ -0,0 +1,11 @@ +function macro=TimesteppingTimeAdaptEnum() +%TIMESTEPPINGTIMEADAPTENUM - Enum of TimesteppingTimeAdapt +% +% WARNING: DO NOT MODIFY THIS FILE +% this file has been automatically generated by src/c/EnumDefinitions/Synchronize.sh +% Please read src/c/EnumDefinitions/README for more information +% +% Usage: +% macro=TimesteppingTimeAdaptEnum() + +macro=StringToEnum('TimesteppingTimeAdapt'); Index: /issm/trunk/src/m/enum/TimesteppingTimeStepEnum.m =================================================================== --- /issm/trunk/src/m/enum/TimesteppingTimeStepEnum.m (revision 9628) +++ /issm/trunk/src/m/enum/TimesteppingTimeStepEnum.m (revision 9628) @@ -0,0 +1,11 @@ +function macro=TimesteppingTimeStepEnum() +%TIMESTEPPINGTIMESTEPENUM - Enum of TimesteppingTimeStep +% +% WARNING: DO NOT MODIFY THIS FILE +% this file has been automatically generated by src/c/EnumDefinitions/Synchronize.sh +% Please read src/c/EnumDefinitions/README for more information +% +% Usage: +% macro=TimesteppingTimeStepEnum() + +macro=StringToEnum('TimesteppingTimeStep'); Index: /issm/trunk/src/m/model/ismodelselfconsistent.m =================================================================== --- /issm/trunk/src/m/model/ismodelselfconsistent.m (revision 9627) +++ /issm/trunk/src/m/model/ismodelselfconsistent.m (revision 9628) @@ -172,5 +172,5 @@ message(['model not consistent: model ' md.miscellaneous.name ' settings.lowmem field should be 0 or 1']); end -if ~ismember(md.time_adapt,[0 1]), +if ~ismember(md.timestepping.time_adapt,[0 1]), message(['model not consistent: model ' md.miscellaneous.name ' time_adapt field should be 0 or 1']); end @@ -291,11 +291,11 @@ if (md.private.solution==TransientSolutionEnum), - if md.dt<=0, - message('model not consistent: field dt must be positive for a transient run') - end - if(md.cfl_coefficient>1 | md.cfl_coefficient<0), + if md.timestepping.time_step<=0, + message('model not consistent: field timesteppping.time_step must be positive for a transient run') + end + if(md.timestepping.cfl_coefficient>1 | md.timestepping.cfl_coefficient<0), message(['model not consistent: model ' md.miscellaneous.name ' cfl_coefficient field should between 0 and 1']); end - if(md.cfl_coefficient>1 | md.cfl_coefficient<0), + if(md.timestepping.cfl_coefficient>1 | md.timestepping.cfl_coefficient<0), message(['model not consistent: model ' md.miscellaneous.name ' cfl_coefficient field should between 0 and 1']); end @@ -315,6 +315,6 @@ %NDT - if md.dt~=0, - message(['model not consistent: for a steadystate computation, dt must be zero.']); + if md.timestepping.time_step~=0, + message(['model not consistent: for a steadystate computation, timesteppping.time_step must be zero.']); end @@ -331,6 +331,6 @@ end - if md.dt<=0, - message('model not consistent: field dt must be positive for a transient run') + if md.timestepping.time_step<=0, + message('model not consistent: field timesteppping.time_step must be positive for a transient run') end @@ -339,5 +339,5 @@ end - if(md.cfl_coefficient>1 | md.cfl_coefficient<0), + if(md.timestepping.cfl_coefficient>1 | md.timestepping.cfl_coefficient<0), message(['model not consistent: model ' md.miscellaneous.name ' cfl_coefficient field should between 0 and 1']); end @@ -502,8 +502,8 @@ %THERMAL TRANSIENT - if md.dt~=0, + if md.timestepping.time_step~=0, %DT and NDT - fields={'dt','ndt'}; + fields={'timesteppping.time_step','timesteppping.final_time'}; checkgreaterstrict(md,fields,0); @@ -541,8 +541,8 @@ %THERMAL TRANSIENT - if md.dt~=0, - - %DT and NDT - fields={'dt','ndt'}; + if md.timestepping.time_step~=0, + + %TIMESTEPPING + fields={'timestepping.time_step','timestepping.final_time'}; checkgreaterstrict(md,fields,0); Index: /issm/trunk/template =================================================================== --- /issm/trunk/template (revision 9627) +++ /issm/trunk/template (revision 9628) @@ -215,10 +215,4 @@ vwgt -> vertex_weight }}} -timestepping{{{ - dt ->time_step - ndt-> rename final_time - time_adapt -> "cfl" "none" - cfl_coefficient -}}} %To be completed Index: /issm/trunk/test/NightlyRun/test1110.m =================================================================== --- /issm/trunk/test/NightlyRun/test1110.m (revision 9627) +++ /issm/trunk/test/NightlyRun/test1110.m (revision 9628) @@ -47,6 +47,6 @@ md.penalties=[posx,posx2;posy,posy2]; - md.dt=3; - md.ndt=300; + md.timestepping.time_step=3; + md.timestepping.final_time=300; md.output_frequency=50; md.prognostic_DG=0; Index: /issm/trunk/test/NightlyRun/test115.m =================================================================== --- /issm/trunk/test/NightlyRun/test115.m (revision 9627) +++ /issm/trunk/test/NightlyRun/test115.m (revision 9628) @@ -4,5 +4,5 @@ md=extrude(md,3,1); md=setelementstype(md,'macayeal','all'); -md.dt=0; +md.timestepping.time_step=0; md.cluster=none; md=solve(md,ThermalSolutionEnum); Index: /issm/trunk/test/NightlyRun/test116.m =================================================================== --- /issm/trunk/test/NightlyRun/test116.m (revision 9627) +++ /issm/trunk/test/NightlyRun/test116.m (revision 9628) @@ -4,5 +4,5 @@ md=extrude(md,3,1); md=setelementstype(md,'macayeal','all'); -md.dt=0; +md.timestepping.time_step=0; md.cluster=generic('name',oshostname(),'np',3); md=solve(md,ThermalSolutionEnum); Index: /issm/trunk/test/NightlyRun/test1204.m =================================================================== --- /issm/trunk/test/NightlyRun/test1204.m (revision 9627) +++ /issm/trunk/test/NightlyRun/test1204.m (revision 9628) @@ -21,6 +21,6 @@ md.vy=PatchToVec(md.results.DiagnosticSolution.Vy); -md.dt=1; -md.ndt=5000; +md.timestepping.time_step=1; +md.timestepping.final_time=5000; md.artificial_diffusivity=1; md=solve(md,TransientSolutionEnum); Index: /issm/trunk/test/NightlyRun/test1208.m =================================================================== --- /issm/trunk/test/NightlyRun/test1208.m (revision 9627) +++ /issm/trunk/test/NightlyRun/test1208.m (revision 9628) @@ -19,7 +19,7 @@ %Adapt the time steps to the resolution -md.dt=20; +md.timestepping.time_step=20; md.output_frequency=20; -md.ndt=50000; +md.timestepping.final_time=50000; md.artificial_diffusivity=2; Index: /issm/trunk/test/NightlyRun/test1501.m =================================================================== --- /issm/trunk/test/NightlyRun/test1501.m (revision 9627) +++ /issm/trunk/test/NightlyRun/test1501.m (revision 9628) @@ -8,7 +8,7 @@ md.isthermal=0; -md.dt=1; +md.timestepping.time_step=1; md.output_frequency=1; -md.ndt=2000; +md.timestepping.final_time=2000; %Solve for thinning rate -> -1 * surface mass balance Index: /issm/trunk/test/NightlyRun/test1502.m =================================================================== --- /issm/trunk/test/NightlyRun/test1502.m (revision 9627) +++ /issm/trunk/test/NightlyRun/test1502.m (revision 9628) @@ -9,7 +9,7 @@ md.isthermal=0; -md.dt=1; +md.timestepping.time_step=1; md.output_frequency=1; -md.ndt=2000; +md.timestepping.final_time=2000; %Solve for thinning rate -> -1 * surface mass balance Index: /issm/trunk/test/NightlyRun/test211.m =================================================================== --- /issm/trunk/test/NightlyRun/test211.m (revision 9627) +++ /issm/trunk/test/NightlyRun/test211.m (revision 9628) @@ -4,5 +4,5 @@ md=extrude(md,3,1); md=setelementstype(md,'macayeal','all'); -md.dt=0; +md.timestepping.time_step=0; md.cluster=none; md=solve(md,ThermalSolutionEnum); Index: /issm/trunk/test/NightlyRun/test212.m =================================================================== --- /issm/trunk/test/NightlyRun/test212.m (revision 9627) +++ /issm/trunk/test/NightlyRun/test212.m (revision 9628) @@ -4,5 +4,5 @@ md=extrude(md,3,1); md=setelementstype(md,'macayeal','all'); -md.dt=0; +md.timestepping.time_step=0; md.cluster=generic('name',oshostname(),'np',3); md=solve(md,ThermalSolutionEnum); Index: /issm/trunk/test/NightlyRun/test251.m =================================================================== --- /issm/trunk/test/NightlyRun/test251.m (revision 9627) +++ /issm/trunk/test/NightlyRun/test251.m (revision 9628) @@ -4,6 +4,6 @@ md=setelementstype(md,'macayeal','all'); md.cluster=none; -md.time_adapt=1; -md.ndt=10; +md.timestepping.time_adapt=1; +md.timestepping.final_time=10; md=solve(md,TransientSolutionEnum); Index: /issm/trunk/test/NightlyRun/test252.m =================================================================== --- /issm/trunk/test/NightlyRun/test252.m (revision 9627) +++ /issm/trunk/test/NightlyRun/test252.m (revision 9628) @@ -4,6 +4,6 @@ md=setelementstype(md,'macayeal','all'); md.cluster=generic('name',oshostname(),'np',3); -md.time_adapt=1; -md.ndt=10; +md.timestepping.time_adapt=1; +md.timestepping.final_time=10; md=solve(md,TransientSolutionEnum); Index: /issm/trunk/test/NightlyRun/test253.m =================================================================== --- /issm/trunk/test/NightlyRun/test253.m (revision 9627) +++ /issm/trunk/test/NightlyRun/test253.m (revision 9628) @@ -5,6 +5,6 @@ md=setelementstype(md,'pattyn','all'); md.cluster=none; -md.time_adapt=1; -md.ndt=10; +md.timestepping.time_adapt=1; +md.timestepping.final_time=10; md=solve(md,TransientSolutionEnum); Index: /issm/trunk/test/NightlyRun/test254.m =================================================================== --- /issm/trunk/test/NightlyRun/test254.m (revision 9627) +++ /issm/trunk/test/NightlyRun/test254.m (revision 9628) @@ -5,6 +5,6 @@ md=setelementstype(md,'pattyn','all'); md.cluster=generic('name',oshostname(),'np',3); -md.time_adapt=1; -md.ndt=10; +md.timestepping.time_adapt=1; +md.timestepping.final_time=10; md=solve(md,TransientSolutionEnum); Index: /issm/trunk/test/NightlyRun/test255.m =================================================================== --- /issm/trunk/test/NightlyRun/test255.m (revision 9627) +++ /issm/trunk/test/NightlyRun/test255.m (revision 9628) @@ -5,7 +5,7 @@ md.cluster=none; -md.dt=1; +md.timestepping.time_step=1; md.output_frequency=1; -md.ndt=4; +md.timestepping.final_time=4; %Set up transient Index: /issm/trunk/test/NightlyRun/test256.m =================================================================== --- /issm/trunk/test/NightlyRun/test256.m (revision 9627) +++ /issm/trunk/test/NightlyRun/test256.m (revision 9628) @@ -5,7 +5,7 @@ md.cluster=generic('name',oshostname(),'np',3); -md.dt=1; +md.timestepping.time_step=1; md.output_frequency=1; -md.ndt=4; +md.timestepping.final_time=4; %Set up transient Index: /issm/trunk/test/NightlyRun/test257.m =================================================================== --- /issm/trunk/test/NightlyRun/test257.m (revision 9627) +++ /issm/trunk/test/NightlyRun/test257.m (revision 9628) @@ -5,7 +5,7 @@ md.cluster=none; -md.dt=1; +md.timestepping.time_step=1; md.output_frequency=1; -md.ndt=4; +md.timestepping.final_time=4; %Set up transient Index: /issm/trunk/test/NightlyRun/test258.m =================================================================== --- /issm/trunk/test/NightlyRun/test258.m (revision 9627) +++ /issm/trunk/test/NightlyRun/test258.m (revision 9628) @@ -5,7 +5,7 @@ md.cluster=generic('name',oshostname(),'np',3); -md.dt=1; +md.timestepping.time_step=1; md.output_frequency=1; -md.ndt=4; +md.timestepping.final_time=4; %Set up transient Index: /issm/trunk/test/NightlyRun/test259.m =================================================================== --- /issm/trunk/test/NightlyRun/test259.m (revision 9627) +++ /issm/trunk/test/NightlyRun/test259.m (revision 9628) @@ -6,7 +6,7 @@ md.cluster=none; -md.dt=1; +md.timestepping.time_step=1; md.output_frequency=1; -md.ndt=4; +md.timestepping.final_time=4; %Set up transient Index: /issm/trunk/test/NightlyRun/test260.m =================================================================== --- /issm/trunk/test/NightlyRun/test260.m (revision 9627) +++ /issm/trunk/test/NightlyRun/test260.m (revision 9628) @@ -6,7 +6,7 @@ md.cluster=generic('name',oshostname(),'np',3); -md.dt=1; +md.timestepping.time_step=1; md.output_frequency=1; -md.ndt=4; +md.timestepping.final_time=4; %Set up transient Index: /issm/trunk/test/NightlyRun/test261.m =================================================================== --- /issm/trunk/test/NightlyRun/test261.m (revision 9627) +++ /issm/trunk/test/NightlyRun/test261.m (revision 9628) @@ -6,7 +6,7 @@ md.cluster=none; -md.dt=1; +md.timestepping.time_step=1; md.output_frequency=1; -md.ndt=4; +md.timestepping.final_time=4; %Set up transient Index: /issm/trunk/test/NightlyRun/test262.m =================================================================== --- /issm/trunk/test/NightlyRun/test262.m (revision 9627) +++ /issm/trunk/test/NightlyRun/test262.m (revision 9628) @@ -6,7 +6,7 @@ md.cluster=generic('name',oshostname(),'np',3); -md.dt=1; +md.timestepping.time_step=1; md.output_frequency=1; -md.ndt=4; +md.timestepping.final_time=4; %Set up transient Index: /issm/trunk/test/NightlyRun/test263.m =================================================================== --- /issm/trunk/test/NightlyRun/test263.m (revision 9627) +++ /issm/trunk/test/NightlyRun/test263.m (revision 9628) @@ -6,6 +6,6 @@ md.cluster=none; md.spctemperature=[md.spctemperature, md.spctemperature+5, md.spctemperature+10, md.spctemperature+15; 1.5 2.5 3.5 4]; -md.dt=1; -md.ndt=4; +md.timestepping.time_step=1; +md.timestepping.final_time=4; md=solve(md,ThermalSolutionEnum); Index: /issm/trunk/test/NightlyRun/test264.m =================================================================== --- /issm/trunk/test/NightlyRun/test264.m (revision 9627) +++ /issm/trunk/test/NightlyRun/test264.m (revision 9628) @@ -6,6 +6,6 @@ md.cluster=generic('name',oshostname(),'np',3); md.spctemperature=[md.spctemperature, md.spctemperature+5, md.spctemperature+10, md.spctemperature+15; 1.5 2.5 3.5 4]; -md.dt=1; -md.ndt=4; +md.timestepping.time_step=1; +md.timestepping.final_time=4; md=solve(md,ThermalSolutionEnum); Index: /issm/trunk/test/NightlyRun/test265.m =================================================================== --- /issm/trunk/test/NightlyRun/test265.m (revision 9627) +++ /issm/trunk/test/NightlyRun/test265.m (revision 9628) @@ -6,6 +6,6 @@ md.cluster=none; md.spctemperature=[md.spctemperature, md.spctemperature+5; 1 2]; -md.dt=0.5; -md.ndt=2; +md.timestepping.time_step=0.5; +md.timestepping.final_time=2; md=solve(md,TransientSolutionEnum); Index: /issm/trunk/test/NightlyRun/test266.m =================================================================== --- /issm/trunk/test/NightlyRun/test266.m (revision 9627) +++ /issm/trunk/test/NightlyRun/test266.m (revision 9628) @@ -6,6 +6,6 @@ md.cluster=generic('name',oshostname(),'np',3); md.spctemperature=[md.spctemperature, md.spctemperature+5; 1 2]; -md.dt=0.5; -md.ndt=2; +md.timestepping.time_step=0.5; +md.timestepping.final_time=2; md=solve(md,TransientSolutionEnum); Index: /issm/trunk/test/NightlyRun/test323.m =================================================================== --- /issm/trunk/test/NightlyRun/test323.m (revision 9627) +++ /issm/trunk/test/NightlyRun/test323.m (revision 9628) @@ -4,5 +4,5 @@ md=extrude(md,3,1); md=setelementstype(md,'macayeal','all'); -md.dt=0; +md.timestepping.time_step=0; md.cluster=none; md=solve(md,ThermalSolutionEnum); Index: /issm/trunk/test/NightlyRun/test324.m =================================================================== --- /issm/trunk/test/NightlyRun/test324.m (revision 9627) +++ /issm/trunk/test/NightlyRun/test324.m (revision 9628) @@ -4,5 +4,5 @@ md=extrude(md,3,1); md=setelementstype(md,'macayeal','all'); -md.dt=0; +md.timestepping.time_step=0; md.cluster=generic('name',oshostname(),'np',3); md=solve(md,ThermalSolutionEnum); Index: /issm/trunk/test/NightlyRun/test335.m =================================================================== --- /issm/trunk/test/NightlyRun/test335.m (revision 9627) +++ /issm/trunk/test/NightlyRun/test335.m (revision 9628) @@ -5,5 +5,5 @@ md=setelementstype(md,'hutter','all'); md.cluster=none; -md.dt=0; +md.timestepping.time_step=0; md=solve(md,SteadystateSolutionEnum); Index: /issm/trunk/test/NightlyRun/test336.m =================================================================== --- /issm/trunk/test/NightlyRun/test336.m (revision 9627) +++ /issm/trunk/test/NightlyRun/test336.m (revision 9628) @@ -5,5 +5,5 @@ md=setelementstype(md,'hutter','all'); md.cluster=generic('name',oshostname(),'np',3); -md.dt=0; +md.timestepping.time_step=0; md=solve(md,SteadystateSolutionEnum); Index: /issm/trunk/test/NightlyRun/test345.m =================================================================== --- /issm/trunk/test/NightlyRun/test345.m (revision 9627) +++ /issm/trunk/test/NightlyRun/test345.m (revision 9628) @@ -4,6 +4,6 @@ md=setelementstype(md,'macayeal','all'); md.cluster=none; -md.time_adapt=1; -md.ndt=600; +md.timestepping.time_adapt=1; +md.timestepping.final_time=600; md=solve(md,TransientSolutionEnum); Index: /issm/trunk/test/NightlyRun/test346.m =================================================================== --- /issm/trunk/test/NightlyRun/test346.m (revision 9627) +++ /issm/trunk/test/NightlyRun/test346.m (revision 9628) @@ -4,6 +4,6 @@ md=setelementstype(md,'macayeal','all'); md.cluster=generic('name',oshostname(),'np',3); -md.time_adapt=1; -md.ndt=600; +md.timestepping.time_adapt=1; +md.timestepping.final_time=600; md=solve(md,TransientSolutionEnum); Index: /issm/trunk/test/NightlyRun/test347.m =================================================================== --- /issm/trunk/test/NightlyRun/test347.m (revision 9627) +++ /issm/trunk/test/NightlyRun/test347.m (revision 9628) @@ -5,6 +5,6 @@ md=setelementstype(md,'hutter','all'); md.cluster=none; -md.time_adapt=1; -md.ndt=500; +md.timestepping.time_adapt=1; +md.timestepping.final_time=500; md=solve(md,TransientSolutionEnum); Index: /issm/trunk/test/NightlyRun/test348.m =================================================================== --- /issm/trunk/test/NightlyRun/test348.m (revision 9627) +++ /issm/trunk/test/NightlyRun/test348.m (revision 9628) @@ -5,6 +5,6 @@ md=setelementstype(md,'hutter','all'); md.cluster=generic('name',oshostname(),'np',3); -md.time_adapt=1; -md.ndt=500; +md.timestepping.time_adapt=1; +md.timestepping.final_time=500; md=solve(md,TransientSolutionEnum); Index: /issm/trunk/test/NightlyRun/test411.m =================================================================== --- /issm/trunk/test/NightlyRun/test411.m (revision 9627) +++ /issm/trunk/test/NightlyRun/test411.m (revision 9628) @@ -5,5 +5,5 @@ md=setelementstype(md,'pattyn','all'); md.cluster=none; -md.dt=0; +md.timestepping.time_step=0; md=solve(md,ThermalSolutionEnum); Index: /issm/trunk/test/NightlyRun/test412.m =================================================================== --- /issm/trunk/test/NightlyRun/test412.m (revision 9627) +++ /issm/trunk/test/NightlyRun/test412.m (revision 9628) @@ -5,5 +5,5 @@ md=setelementstype(md,'pattyn','all'); md.cluster=generic('name',oshostname(),'np',3); -md.dt=0; +md.timestepping.time_step=0; md=solve(md,ThermalSolutionEnum); Index: /issm/trunk/test/NightlyRun/test419.m =================================================================== --- /issm/trunk/test/NightlyRun/test419.m (revision 9627) +++ /issm/trunk/test/NightlyRun/test419.m (revision 9628) @@ -5,5 +5,5 @@ md=setelementstype(md,'macayeal','all'); md.cluster=none; -md.dt=0; +md.timestepping.time_step=0; md=solve(md,SteadystateSolutionEnum); Index: /issm/trunk/test/NightlyRun/test420.m =================================================================== --- /issm/trunk/test/NightlyRun/test420.m (revision 9627) +++ /issm/trunk/test/NightlyRun/test420.m (revision 9628) @@ -5,5 +5,5 @@ md=setelementstype(md,'macayeal','all'); md.cluster=generic('name',oshostname(),'np',3); -md.dt=0; +md.timestepping.time_step=0; md=solve(md,SteadystateSolutionEnum); Index: /issm/trunk/test/NightlyRun/test421.m =================================================================== --- /issm/trunk/test/NightlyRun/test421.m (revision 9627) +++ /issm/trunk/test/NightlyRun/test421.m (revision 9628) @@ -5,5 +5,5 @@ md=setelementstype(md,'pattyn','all'); md.cluster=none; -md.dt=0; +md.timestepping.time_step=0; md=solve(md,SteadystateSolutionEnum); Index: /issm/trunk/test/NightlyRun/test422.m =================================================================== --- /issm/trunk/test/NightlyRun/test422.m (revision 9627) +++ /issm/trunk/test/NightlyRun/test422.m (revision 9628) @@ -5,5 +5,5 @@ md=setelementstype(md,'pattyn','all'); md.cluster=generic('name',oshostname(),'np',3); -md.dt=0; +md.timestepping.time_step=0; md=solve(md,SteadystateSolutionEnum); Index: /issm/trunk/test/NightlyRun/test429.m =================================================================== --- /issm/trunk/test/NightlyRun/test429.m (revision 9627) +++ /issm/trunk/test/NightlyRun/test429.m (revision 9628) @@ -16,5 +16,5 @@ md.maxiter=2*ones(md.nsteps,1); md.cm_jump=0.3*ones(md.nsteps,1); -md.dt=0; +md.timestepping.time_step=0; md.vx_obs=md.vx; md.vy_obs=md.vy; Index: /issm/trunk/test/NightlyRun/test430.m =================================================================== --- /issm/trunk/test/NightlyRun/test430.m (revision 9627) +++ /issm/trunk/test/NightlyRun/test430.m (revision 9628) @@ -16,5 +16,5 @@ md.maxiter=2*ones(md.nsteps,1); md.cm_jump=0.3*ones(md.nsteps,1); -md.dt=0; +md.timestepping.time_step=0; md.vx_obs=md.vx; md.vy_obs=md.vy; Index: /issm/trunk/test/NightlyRun/test431.m =================================================================== --- /issm/trunk/test/NightlyRun/test431.m (revision 9627) +++ /issm/trunk/test/NightlyRun/test431.m (revision 9628) @@ -16,5 +16,5 @@ md.maxiter=2*ones(md.nsteps,1); md.cm_jump=0.3*ones(md.nsteps,1); -md.dt=0; +md.timestepping.time_step=0; md.vx_obs=md.vx; md.vy_obs=md.vy; Index: /issm/trunk/test/NightlyRun/test432.m =================================================================== --- /issm/trunk/test/NightlyRun/test432.m (revision 9627) +++ /issm/trunk/test/NightlyRun/test432.m (revision 9628) @@ -16,5 +16,5 @@ md.maxiter=2*ones(md.nsteps,1); md.cm_jump=0.3*ones(md.nsteps,1); -md.dt=0; +md.timestepping.time_step=0; md.vx_obs=md.vx; md.vy_obs=md.vy; Index: /issm/trunk/test/NightlyRun/test515.m =================================================================== --- /issm/trunk/test/NightlyRun/test515.m (revision 9627) +++ /issm/trunk/test/NightlyRun/test515.m (revision 9628) @@ -5,5 +5,5 @@ md=setelementstype(md,'macayeal','all'); md.cluster=none; -md.dt=0; +md.timestepping.time_step=0; md=solve(md,SteadystateSolutionEnum); Index: /issm/trunk/test/NightlyRun/test516.m =================================================================== --- /issm/trunk/test/NightlyRun/test516.m (revision 9627) +++ /issm/trunk/test/NightlyRun/test516.m (revision 9628) @@ -5,5 +5,5 @@ md=setelementstype(md,'macayeal','all'); md.cluster=generic('name',oshostname(),'np',3); -md.dt=0; +md.timestepping.time_step=0; md=solve(md,SteadystateSolutionEnum); Index: /issm/trunk/test/NightlyRun/test517.m =================================================================== --- /issm/trunk/test/NightlyRun/test517.m (revision 9627) +++ /issm/trunk/test/NightlyRun/test517.m (revision 9628) @@ -5,5 +5,5 @@ md=setelementstype(md,'pattyn','all'); md.cluster=none; -md.dt=0; +md.timestepping.time_step=0; md=solve(md,SteadystateSolutionEnum); Index: /issm/trunk/test/NightlyRun/test518.m =================================================================== --- /issm/trunk/test/NightlyRun/test518.m (revision 9627) +++ /issm/trunk/test/NightlyRun/test518.m (revision 9628) @@ -5,5 +5,5 @@ md=setelementstype(md,'pattyn','all'); md.cluster=generic('name',oshostname(),'np',3); -md.dt=0; +md.timestepping.time_step=0; md=solve(md,SteadystateSolutionEnum); Index: /issm/trunk/test/NightlyRun/test519.m =================================================================== --- /issm/trunk/test/NightlyRun/test519.m (revision 9627) +++ /issm/trunk/test/NightlyRun/test519.m (revision 9628) @@ -5,5 +5,5 @@ md=setelementstype(md,'stokes','all'); md.cluster=none; -md.dt=0; +md.timestepping.time_step=0; md=solve(md,SteadystateSolutionEnum); Index: /issm/trunk/test/NightlyRun/test520.m =================================================================== --- /issm/trunk/test/NightlyRun/test520.m (revision 9627) +++ /issm/trunk/test/NightlyRun/test520.m (revision 9628) @@ -5,5 +5,5 @@ md=setelementstype(md,'stokes','all'); md.cluster=generic('name',oshostname(),'np',3); -md.dt=0; +md.timestepping.time_step=0; md=solve(md,SteadystateSolutionEnum); Index: /issm/trunk/test/NightlyRun/test525.m =================================================================== --- /issm/trunk/test/NightlyRun/test525.m (revision 9627) +++ /issm/trunk/test/NightlyRun/test525.m (revision 9628) @@ -17,5 +17,5 @@ md.cm_jump=0.99*ones(md.nsteps,1); md.vx_obs=md.vx; md.vy_obs=md.vy; -md.dt=0; +md.timestepping.time_step=0; md.cluster=none; Index: /issm/trunk/test/NightlyRun/test526.m =================================================================== --- /issm/trunk/test/NightlyRun/test526.m (revision 9627) +++ /issm/trunk/test/NightlyRun/test526.m (revision 9628) @@ -17,5 +17,5 @@ md.cm_jump=0.99*ones(md.nsteps,1); md.vx_obs=md.vx; md.vy_obs=md.vy; -md.dt=0; +md.timestepping.time_step=0; md.cluster=generic('name',oshostname(),'np',3); Index: /issm/trunk/test/NightlyRun/test531.m =================================================================== --- /issm/trunk/test/NightlyRun/test531.m (revision 9627) +++ /issm/trunk/test/NightlyRun/test531.m (revision 9628) @@ -5,5 +5,5 @@ md=setelementstype(md,'pattyn','all'); md.artificial_diffusivity=2; -md.dt=0; +md.timestepping.time_step=0; md.min_thermal_constraints=40; md=solve(md,ThermalSolutionEnum); Index: /issm/trunk/test/NightlyRun/test532.m =================================================================== --- /issm/trunk/test/NightlyRun/test532.m (revision 9627) +++ /issm/trunk/test/NightlyRun/test532.m (revision 9628) @@ -6,5 +6,5 @@ md.artificial_diffusivity=2; md.cluster=generic('name',oshostname(),'np',3); -md.dt=0; +md.timestepping.time_step=0; md.min_thermal_constraints=40; md=solve(md,ThermalSolutionEnum); Index: /issm/trunk/test/Par/79North.par =================================================================== --- /issm/trunk/test/Par/79North.par (revision 9627) +++ /issm/trunk/test/Par/79North.par (revision 9628) @@ -34,6 +34,6 @@ md.verbose=verbose(0); md.waitonlock=30; -md.dt=1; -md.ndt=3; +md.timestepping.time_step=1; +md.timestepping.final_time=3; md.eps_res=0.05; md.eps_rel=0.005; Index: /issm/trunk/test/Par/ISMIPF.par =================================================================== --- /issm/trunk/test/Par/ISMIPF.par (revision 9627) +++ /issm/trunk/test/Par/ISMIPF.par (revision 9628) @@ -38,6 +38,6 @@ %Transient options -md.dt=1; -md.ndt=10; +md.timestepping.time_step=1; +md.timestepping.final_time=10; md.artificial_diffusivity=1; md.min_thermal_constraints=10^5; Index: /issm/trunk/test/Par/Pig.par =================================================================== --- /issm/trunk/test/Par/Pig.par (revision 9627) +++ /issm/trunk/test/Par/Pig.par (revision 9628) @@ -32,6 +32,6 @@ md.verbose=verbose(0); md.waitonlock=30; -md.dt=1; -md.ndt=2; +md.timestepping.time_step=1; +md.timestepping.final_time=2; md.eps_res=0.05; md.eps_rel=1; Index: /issm/trunk/test/Par/RoundSheetEISMINT.par =================================================================== --- /issm/trunk/test/Par/RoundSheetEISMINT.par (revision 9627) +++ /issm/trunk/test/Par/RoundSheetEISMINT.par (revision 9628) @@ -50,5 +50,5 @@ %parallel options -md.ndt=50000; +md.timestepping.final_time=50000; %Constants Index: /issm/trunk/test/Par/RoundSheetShelf.par =================================================================== --- /issm/trunk/test/Par/RoundSheetShelf.par (revision 9627) +++ /issm/trunk/test/Par/RoundSheetShelf.par (revision 9628) @@ -64,6 +64,6 @@ md.eps_rel=0.05; md.eps_abs=NaN; -md.dt=.1; -md.ndt=5; +md.timestepping.time_step=.1; +md.timestepping.final_time=5; %bathymetry and grounding line migration: Index: /issm/trunk/test/Par/SquareEISMINT.par =================================================================== --- /issm/trunk/test/Par/SquareEISMINT.par (revision 9627) +++ /issm/trunk/test/Par/SquareEISMINT.par (revision 9628) @@ -34,5 +34,5 @@ md.spcthickness=NaN*ones(md.numberofnodes,1); md.spcthickness(pos)=500; -md.ndt=500; -md.dt=1; +md.timestepping.final_time=500; +md.timestepping.time_step=1; md.artificial_diffusivity=0; %Better result with no artificial diffusivity Index: /issm/trunk/test/Par/SquareSheetConstrained.par =================================================================== --- /issm/trunk/test/Par/SquareSheetConstrained.par (revision 9627) +++ /issm/trunk/test/Par/SquareSheetConstrained.par (revision 9628) @@ -38,6 +38,6 @@ md.eps_rel=0.05; md.eps_abs=NaN; -md.dt=1; -md.ndt=3; +md.timestepping.time_step=1; +md.timestepping.final_time=3; %Boundary conditions: Index: /issm/trunk/test/Par/SquareSheetShelf.par =================================================================== --- /issm/trunk/test/Par/SquareSheetShelf.par (revision 9627) +++ /issm/trunk/test/Par/SquareSheetShelf.par (revision 9628) @@ -45,6 +45,6 @@ md.eps_rel=0.05; md.eps_abs=NaN; -md.dt=1; -md.ndt=3; +md.timestepping.time_step=1; +md.timestepping.final_time=3; %Deal with boundary conditions: Index: /issm/trunk/test/Par/SquareShelf.par =================================================================== --- /issm/trunk/test/Par/SquareShelf.par (revision 9627) +++ /issm/trunk/test/Par/SquareShelf.par (revision 9628) @@ -38,6 +38,6 @@ md.eps_rel=0.02; md.eps_abs=NaN; -md.dt=1; -md.ndt=3; +md.timestepping.time_step=1; +md.timestepping.final_time=3; %Boundary conditions: Index: /issm/trunk/test/Par/SquareShelfConstrained.par =================================================================== --- /issm/trunk/test/Par/SquareShelfConstrained.par (revision 9627) +++ /issm/trunk/test/Par/SquareShelfConstrained.par (revision 9628) @@ -42,6 +42,6 @@ md.eps_rel=0.05; md.eps_abs=NaN; -md.dt=1; -md.ndt=3; +md.timestepping.time_step=1; +md.timestepping.final_time=3; %Deal with boundary conditions: Index: /issm/trunk/test/Par/SquareThermal.par =================================================================== --- /issm/trunk/test/Par/SquareThermal.par (revision 9627) +++ /issm/trunk/test/Par/SquareThermal.par (revision 9628) @@ -1,5 +1,5 @@ %Ok, start defining model parameters here -md.dt=0; +md.timestepping.time_step=0; disp(' creating thickness');