Changeset 9628


Ignore:
Timestamp:
09/06/11 15:31:08 (14 years ago)
Author:
Mathieu Morlighem
Message:

Added timestepping

Location:
issm/trunk
Files:
5 added
4 deleted
80 edited

Legend:

Unmodified
Added
Removed

  • issm/trunk/src/c/EnumDefinitions/EnumDefinitions.h

    r9625 r9628  
    3535        SettingsIoGatherEnum,
    3636        MiscellaneousNameEnum, //FIXME: only used by qmu, should not be marshalled (already in queueing script)
     37        TimesteppingTimeStepEnum,
     38        TimesteppingFinalTimeEnum,
     39        TimesteppingTimeAdaptEnum,
     40        TimesteppingCflCoefficientEnum,
    3741        /*}}}*/
    3842        /*Datasets {{{1*/
    … …  
    191195        ControlTypeEnum,
    192196        ConvergedEnum,
    193         DtEnum,
    194         TimeAdaptEnum,
    195         CflCoefficientEnum,
    196197        ElementOnBedEnum,
    197198        ElementOnIceSheetEnum,
    … …  
    350351        MinMechanicalConstraintsEnum,
    351352        MinThermalConstraintsEnum,
    352         NdtEnum,
    353353        NumberOfElementsEnum,
    354354        NumberOfVerticesEnum,

  • issm/trunk/src/c/modules/EnumToStringx/EnumToStringx.cpp

    r9625 r9628  
    3939                case SettingsIoGatherEnum : return "SettingsIoGather";
    4040                case MiscellaneousNameEnum : return "MiscellaneousName";
     41                case TimesteppingTimeStepEnum : return "TimesteppingTimeStep";
     42                case TimesteppingFinalTimeEnum : return "TimesteppingFinalTime";
     43                case TimesteppingTimeAdaptEnum : return "TimesteppingTimeAdapt";
     44                case TimesteppingCflCoefficientEnum : return "TimesteppingCflCoefficient";
    4145                case ConstraintsEnum : return "Constraints";
    4246                case ElementsEnum : return "Elements";
    … …  
    158162                case ControlTypeEnum : return "ControlType";
    159163                case ConvergedEnum : return "Converged";
    160                 case DtEnum : return "Dt";
    161                 case TimeAdaptEnum : return "TimeAdapt";
    162                 case CflCoefficientEnum : return "CflCoefficient";
    163164                case ElementOnBedEnum : return "ElementOnBed";
    164165                case ElementOnIceSheetEnum : return "ElementOnIceSheet";
    … …  
    301302                case MinMechanicalConstraintsEnum : return "MinMechanicalConstraints";
    302303                case MinThermalConstraintsEnum : return "MinThermalConstraints";
    303                 case NdtEnum : return "Ndt";
    304304                case NumberOfElementsEnum : return "NumberOfElements";
    305305                case NumberOfVerticesEnum : return "NumberOfVertices";

  • issm/trunk/src/c/modules/ModelProcessorx/CreateParameters.cpp

    r9622 r9628  
    3636        parameters->AddObject(iomodel->CopyConstantObject(MaxSteadystateIterationsEnum));
    3737        parameters->AddObject(iomodel->CopyConstantObject(ConstantsYtsEnum));
    38         parameters->AddObject(iomodel->CopyConstantObject(DtEnum));
    39         parameters->AddObject(iomodel->CopyConstantObject(NdtEnum));
    40         parameters->AddObject(iomodel->CopyConstantObject(TimeAdaptEnum));
    41         parameters->AddObject(iomodel->CopyConstantObject(CflCoefficientEnum));
     38        parameters->AddObject(iomodel->CopyConstantObject(TimesteppingTimeStepEnum));
     39        parameters->AddObject(iomodel->CopyConstantObject(TimesteppingFinalTimeEnum));
     40        parameters->AddObject(iomodel->CopyConstantObject(TimesteppingTimeAdaptEnum));
     41        parameters->AddObject(iomodel->CopyConstantObject(TimesteppingCflCoefficientEnum));
    4242        parameters->AddObject(iomodel->CopyConstantObject(HydrostaticAdjustmentEnum));
    4343        parameters->AddObject(iomodel->CopyConstantObject(PenaltyOffsetEnum));

  • issm/trunk/src/c/modules/StringToEnumx/StringToEnumx.cpp

    r9625 r9628  
    3737        else if (strcmp(name,"SettingsIoGather")==0) return SettingsIoGatherEnum;
    3838        else if (strcmp(name,"MiscellaneousName")==0) return MiscellaneousNameEnum;
     39        else if (strcmp(name,"TimesteppingTimeStep")==0) return TimesteppingTimeStepEnum;
     40        else if (strcmp(name,"TimesteppingFinalTime")==0) return TimesteppingFinalTimeEnum;
     41        else if (strcmp(name,"TimesteppingTimeAdapt")==0) return TimesteppingTimeAdaptEnum;
     42        else if (strcmp(name,"TimesteppingCflCoefficient")==0) return TimesteppingCflCoefficientEnum;
    3943        else if (strcmp(name,"Constraints")==0) return ConstraintsEnum;
    4044        else if (strcmp(name,"Elements")==0) return ElementsEnum;
    … …  
    156160        else if (strcmp(name,"ControlType")==0) return ControlTypeEnum;
    157161        else if (strcmp(name,"Converged")==0) return ConvergedEnum;
    158         else if (strcmp(name,"Dt")==0) return DtEnum;
    159         else if (strcmp(name,"TimeAdapt")==0) return TimeAdaptEnum;
    160         else if (strcmp(name,"CflCoefficient")==0) return CflCoefficientEnum;
    161162        else if (strcmp(name,"ElementOnBed")==0) return ElementOnBedEnum;
    162163        else if (strcmp(name,"ElementOnIceSheet")==0) return ElementOnIceSheetEnum;
    … …  
    299300        else if (strcmp(name,"MinMechanicalConstraints")==0) return MinMechanicalConstraintsEnum;
    300301        else if (strcmp(name,"MinThermalConstraints")==0) return MinThermalConstraintsEnum;
    301         else if (strcmp(name,"Ndt")==0) return NdtEnum;
    302302        else if (strcmp(name,"NumberOfElements")==0) return NumberOfElementsEnum;
    303303        else if (strcmp(name,"NumberOfVertices")==0) return NumberOfVerticesEnum;

  • issm/trunk/src/c/objects/Elements/Penta.cpp

    r9612 r9628  
    18741874        latentheat=matpar->GetLatentHeat();
    18751875        thermalconductivity=matpar->GetThermalConductivity();
    1876         this->parameters->FindParam(&dt,DtEnum);
     1876        this->parameters->FindParam(&dt,TimesteppingTimeStepEnum);
    18771877        this->parameters->FindParam(&artdiff,ArtificialDiffusivityEnum);
    18781878        Input* pressure_input=inputs->GetInput(PressureEnum);      _assert_(pressure_input);
    … …  
    20162016
    20172017        /*Retrieve all inputs and parameters*/
    2018         this->parameters->FindParam(&dt,DtEnum);
     2018        this->parameters->FindParam(&dt,TimesteppingTimeStepEnum);
    20192019        mixed_layer_capacity=matpar->GetMixedLayerCapacity();
    20202020        thermal_exchange_velocity=matpar->GetThermalExchangeVelocity();
    … …  
    21482148        heatcapacity=matpar->GetHeatCapacity();
    21492149        thermalconductivity=matpar->GetThermalConductivity();
    2150         this->parameters->FindParam(&dt,DtEnum);
     2150        this->parameters->FindParam(&dt,TimesteppingTimeStepEnum);
    21512151        this->parameters->FindParam(&artdiff,ArtificialDiffusivityEnum);
    21522152        Input* vx_input=inputs->GetInput(VxEnum);      _assert_(vx_input);
    … …  
    22852285
    22862286        /*Retrieve all inputs and parameters*/
    2287         this->parameters->FindParam(&dt,DtEnum);
     2287        this->parameters->FindParam(&dt,TimesteppingTimeStepEnum);
    22882288        mixed_layer_capacity=matpar->GetMixedLayerCapacity();
    22892289        thermal_exchange_velocity=matpar->GetThermalExchangeVelocity();
    … …  
    33103310        heatcapacity=matpar->GetHeatCapacity();
    33113311        thermalconductivity=matpar->GetThermalConductivity();
    3312         this->parameters->FindParam(&dt,DtEnum);
     3312        this->parameters->FindParam(&dt,TimesteppingTimeStepEnum);
    33133313        this->parameters->FindParam(&artdiff,ArtificialDiffusivityEnum);
    33143314        Input* vx_input=inputs->GetInput(VxEnum); _assert_(vx_input);
    … …  
    33963396        rho_ice=matpar->GetRhoIce();
    33973397        heatcapacity=matpar->GetHeatCapacity();
    3398         this->parameters->FindParam(&dt,DtEnum);
     3398        this->parameters->FindParam(&dt,TimesteppingTimeStepEnum);
    33993399        Input* pressure_input=inputs->GetInput(PressureEnum); _assert_(pressure_input);
    34003400
    … …  
    34533453        rho_ice=matpar->GetRhoIce();
    34543454        heatcapacity=matpar->GetHeatCapacity();
    3455         this->parameters->FindParam(&dt,DtEnum);
     3455        this->parameters->FindParam(&dt,TimesteppingTimeStepEnum);
    34563456        Input* vx_input=inputs->GetInput(VxEnum);                         _assert_(vx_input);
    34573457        Input* vy_input=inputs->GetInput(VyEnum);                         _assert_(vy_input);
    … …  
    35773577        heatcapacity=matpar->GetHeatCapacity();
    35783578        thermalconductivity=matpar->GetThermalConductivity();
    3579         this->parameters->FindParam(&dt,DtEnum);
     3579        this->parameters->FindParam(&dt,TimesteppingTimeStepEnum);
    35803580        this->parameters->FindParam(&artdiff,ArtificialDiffusivityEnum);
    35813581        Input* vx_input=inputs->GetInput(VxEnum); _assert_(vx_input);
    … …  
    36633663        rho_ice=matpar->GetRhoIce();
    36643664        heatcapacity=matpar->GetHeatCapacity();
    3665         this->parameters->FindParam(&dt,DtEnum);
     3665        this->parameters->FindParam(&dt,TimesteppingTimeStepEnum);
    36663666        Input* pressure_input=inputs->GetInput(PressureEnum); _assert_(pressure_input);
    36673667
    … …  
    37203720        rho_ice=matpar->GetRhoIce();
    37213721        heatcapacity=matpar->GetHeatCapacity();
    3722         this->parameters->FindParam(&dt,DtEnum);
     3722        this->parameters->FindParam(&dt,TimesteppingTimeStepEnum);
    37233723        Input* vx_input=inputs->GetInput(VxEnum);                         _assert_(vx_input);
    37243724        Input* vy_input=inputs->GetInput(VyEnum);                         _assert_(vy_input);
    … …  
    74337433
    74347434        /*get CFL coefficient:*/
    7435         this->parameters->FindParam(&C,CflCoefficientEnum);
     7435        this->parameters->FindParam(&C,TimesteppingCflCoefficientEnum);
    74367436
    74377437        /*Get for Vx and Vy, the max of abs value: */

  • issm/trunk/src/c/objects/Elements/Tria.cpp

    r9612 r9628  
    869869        /*Retrieve all inputs and parameters*/
    870870        GetVerticesCoordinates(&xyz_list[0][0], nodes, NUMVERTICES);
    871         this->parameters->FindParam(&dt,DtEnum);
     871        this->parameters->FindParam(&dt,TimesteppingTimeStepEnum);
    872872        this->parameters->FindParam(&artdiff,ArtificialDiffusivityEnum);
    873873        Input* vx_input=inputs->GetInput(HydrologyWaterVxEnum); _assert_(vx_input);
    … …  
    10271027        /*Retrieve all inputs and parameters*/
    10281028        GetVerticesCoordinates(&xyz_list[0][0], nodes, NUMVERTICES);
    1029         this->parameters->FindParam(&dt,DtEnum);
     1029        this->parameters->FindParam(&dt,TimesteppingTimeStepEnum);
    10301030        this->parameters->FindParam(&dim,DimEnum);
    10311031        this->parameters->FindParam(&artdiff,ArtificialDiffusivityEnum);
    … …  
    11371137        /*Retrieve all inputs and parameters*/
    11381138        GetVerticesCoordinates(&xyz_list[0][0], nodes, NUMVERTICES);
    1139         this->parameters->FindParam(&dt,DtEnum);
     1139        this->parameters->FindParam(&dt,TimesteppingTimeStepEnum);
    11401140        this->parameters->FindParam(&dim,DimEnum);
    11411141        Input* vxaverage_input=NULL;
    … …  
    19411941        /*Retrieve all inputs and parameters*/
    19421942        GetVerticesCoordinates(&xyz_list[0][0], nodes, NUMVERTICES);
    1943         this->parameters->FindParam(&dt,DtEnum);
     1943        this->parameters->FindParam(&dt,TimesteppingTimeStepEnum);
    19441944        Input* basal_melting_input=inputs->GetInput(BasalforcingsMeltingRateEnum); _assert_(basal_melting_input);
    19451945        Input* old_watercolumn_input=inputs->GetInput(WaterColumnOldEnum);         _assert_(old_watercolumn_input);
    … …  
    19861986        /*Retrieve all inputs and parameters*/
    19871987        GetVerticesCoordinates(&xyz_list[0][0], nodes, NUMVERTICES);
    1988         this->parameters->FindParam(&dt,DtEnum);
     1988        this->parameters->FindParam(&dt,TimesteppingTimeStepEnum);
    19891989        Input* surface_mass_balance_input=inputs->GetInput(SurfaceforcingsMassBalanceEnum); _assert_(surface_mass_balance_input);
    19901990        Input* basal_melting_input=inputs->GetInput(BasalforcingsMeltingRateEnum);          _assert_(basal_melting_input);
    … …  
    20332033
    20342034        /*Retrieve all inputs and parameters*/
    2035         this->parameters->FindParam(&dt,DtEnum);
     2035        this->parameters->FindParam(&dt,TimesteppingTimeStepEnum);
    20362036        GetVerticesCoordinates(&xyz_list[0][0], nodes, NUMVERTICES);
    20372037        Input* surface_mass_balance_input=inputs->GetInput(SurfaceforcingsMassBalanceEnum); _assert_(surface_mass_balance_input);
    … …  
    51745174
    51755175        /*get CFL coefficient:*/
    5176         this->parameters->FindParam(&C,CflCoefficientEnum);
     5176        this->parameters->FindParam(&C,TimesteppingCflCoefficientEnum);
    51775177
    51785178        /*Get for Vx and Vy, the max of abs value: */

  • issm/trunk/src/c/objects/Loads/Numericalflux.cpp

    r9405 r9628  
    456456        /*Retrieve all inputs and parameters*/
    457457        GetVerticesCoordinates(&xyz_list[0][0], nodes,NUMVERTICES_INTERNAL);
    458         parameters->FindParam(&dt,DtEnum);
     458        parameters->FindParam(&dt,TimesteppingTimeStepEnum);
    459459        Input* vxaverage_input=tria->inputs->GetInput(VxEnum);
    460460        Input* vyaverage_input=tria->inputs->GetInput(VyEnum);
    … …  
    519519        /*Retrieve all inputs and parameters*/
    520520        GetVerticesCoordinates(&xyz_list[0][0],nodes,NUMVERTICES_BOUNDARY);
    521         parameters->FindParam(&dt,DtEnum);
     521        parameters->FindParam(&dt,TimesteppingTimeStepEnum);
    522522        Input* vxaverage_input=tria->inputs->GetInput(VxEnum); _assert_(vxaverage_input);
    523523        Input* vyaverage_input=tria->inputs->GetInput(VyEnum); _assert_(vyaverage_input);
    … …  
    797797        /*Retrieve all inputs and parameters*/
    798798        GetVerticesCoordinates(&xyz_list[0][0],nodes,NUMVERTICES_BOUNDARY);
    799         parameters->FindParam(&dt,DtEnum);
     799        parameters->FindParam(&dt,TimesteppingTimeStepEnum);
    800800        Input* vxaverage_input   =tria->inputs->GetInput(VxEnum); _assert_(vxaverage_input);
    801801        Input* vyaverage_input   =tria->inputs->GetInput(VyEnum); _assert_(vyaverage_input);

  • issm/trunk/src/c/objects/Loads/Pengrid.cpp

    r9405 r9628  
    631631        penta->GetParameterValue(&temperature,node,TemperatureEnum);
    632632        inputs->GetParameterValue(&melting_offset,MeltingOffsetEnum);
    633         parameters->FindParam(&dt,DtEnum);
     633        parameters->FindParam(&dt,TimesteppingTimeStepEnum);
    634634        parameters->FindParam(&penalty_offset,PenaltyOffsetEnum);
    635635

  • issm/trunk/src/c/shared/Numerics/UnitConversion.cpp

    r9612 r9628  
    4747        double scale;
    4848        switch(type_enum){
    49                 case DtEnum:        scale=1.0/yts;break; //yr
    50                 case NdtEnum:        scale=1.0/yts;break; //yr
     49                case TimesteppingTimeStepEnum: scale=1.0/yts;break; //yr
     50                case TimesteppingFinalTimeEnum:    scale=1.0/yts;break; //yr
    5151                case TimeEnum:        scale=1.0/yts;break; //yr
    5252                case VxEnum:          scale=yts;break; //m/yr

  • issm/trunk/src/c/solutions/enthalpy_core.cpp

    r8926 r9628  
    1919        double time;
    2020        int    nsteps;
    21         double ndt;
     21        double final_time;
    2222        double dt;
    2323        double melting_offset;
    … …  
    2626
    2727        //first recover parameters common to all solutions
    28         femmodel->parameters->FindParam(&ndt,NdtEnum);
    29         femmodel->parameters->FindParam(&dt,DtEnum);
     28        femmodel->parameters->FindParam(&final_time,TimesteppingFinalTimeEnum);
     29        femmodel->parameters->FindParam(&dt,TimesteppingTimeStepEnum);
    3030        femmodel->parameters->FindParam(&control_analysis,ControlAnalysisEnum);
    3131        femmodel->parameters->FindParam(&solution_type,SolutionTypeEnum);
    3232
    3333        /*Compute number of time steps: */
    34         if((dt==0)|| (ndt==0)){
     34        if((dt==0)|| (final_time==0)){
    3535                dt=0;
    3636                nsteps=1;
    3737        }
    38         else nsteps=(int)(ndt/dt);
     38        else nsteps=(int)(final_time/dt);
    3939
    4040        /*Loop through time: */

  • issm/trunk/src/c/solutions/hydrology_core.cpp

    r9271 r9628  
    1818        double time;
    1919        int    nsteps;
    20         double ndt;
     20        double final_time;
    2121        double dt;
    2222        bool control_analysis;
    … …  
    2424
    2525        //first recover parameters common to all solutions
    26         femmodel->parameters->FindParam(&ndt,NdtEnum);
    27         femmodel->parameters->FindParam(&dt,DtEnum);
     26        femmodel->parameters->FindParam(&final_time,TimesteppingFinalTimeEnum);
     27        femmodel->parameters->FindParam(&dt,TimesteppingTimeStepEnum);
    2828        femmodel->parameters->FindParam(&control_analysis,ControlAnalysisEnum);
    2929        femmodel->parameters->FindParam(&solution_type,SolutionTypeEnum);
    … …  
    3434
    3535        /*Compute number of time steps: */
    36         if((dt==0)|| (ndt==0)){
     36        if((dt==0)|| (final_time==0)){
    3737                dt=0;
    3838                nsteps=1;
    3939        }
    40         else nsteps=(int)(ndt/dt);
     40        else nsteps=(int)(final_time/dt);
    4141
    4242        /*Loop through time: */

  • issm/trunk/src/c/solutions/thermal_core.cpp

    r9612 r9628  
    1919        double time;
    2020        int    nsteps;
    21         double ndt;
     21        double final_time;
    2222        double dt;
    2323        double melting_offset;
    … …  
    2727
    2828        //first recover parameters common to all solutions
    29         femmodel->parameters->FindParam(&ndt,NdtEnum);
    30         femmodel->parameters->FindParam(&dt,DtEnum);
     29        femmodel->parameters->FindParam(&final_time,TimesteppingFinalTimeEnum);
     30        femmodel->parameters->FindParam(&dt,TimesteppingTimeStepEnum);
    3131        femmodel->parameters->FindParam(&control_analysis,ControlAnalysisEnum);
    3232        femmodel->parameters->FindParam(&solution_type,SolutionTypeEnum);
    … …  
    3434
    3535        /*Compute number of time steps: */
    36         if((dt==0)|| (ndt==0)){
     36        if((dt==0)|| (final_time==0)){
    3737                dt=0;
    3838                nsteps=1;
    3939        }
    40         else nsteps=(int)(ndt/dt);
     40        else nsteps=(int)(final_time/dt);
    4141
    4242        if(dakota_analysis){

  • issm/trunk/src/c/solutions/transient_core.cpp

    r9612 r9628  
    2929        //first recover parameters common to all solutions
    3030        femmodel->parameters->FindParam(&dim,DimEnum);
    31         femmodel->parameters->FindParam(&finaltime,NdtEnum);
    32         femmodel->parameters->FindParam(&dt,DtEnum);
     31        femmodel->parameters->FindParam(&finaltime,TimesteppingFinalTimeEnum);
     32        femmodel->parameters->FindParam(&dt,TimesteppingTimeStepEnum);
    3333        femmodel->parameters->FindParam(&yts,ConstantsYtsEnum);
    3434        femmodel->parameters->FindParam(&control_analysis,ControlAnalysisEnum);
    3535        femmodel->parameters->FindParam(&solution_type,SolutionTypeEnum);
    3636        femmodel->parameters->FindParam(&output_frequency,OutputFrequencyEnum);
    37         femmodel->parameters->FindParam(&time_adapt,TimeAdaptEnum);
     37        femmodel->parameters->FindParam(&time_adapt,TimesteppingTimeAdaptEnum);
    3838        femmodel->parameters->FindParam(&groundingline_migration,GroundinglineMigrationEnum);
    3939        femmodel->parameters->FindParam(&isdiagnostic,IsdiagnosticEnum);
    … …  
    5151                        TimeAdaptx(&dt,femmodel->elements, femmodel->nodes,femmodel->vertices,femmodel->loads, femmodel->materials, femmodel->parameters);
    5252                        if(time+dt>finaltime) dt=finaltime-time;
    53                         femmodel->parameters->SetParam(dt,DtEnum);
     53                        femmodel->parameters->SetParam(dt,TimesteppingTimeStepEnum);
    5454                }
    5555                step+=1;

  • issm/trunk/src/m/classes/model/model.m

    r9625 r9628  
    2424                 radaroverlay = modelfield('default',0,'marshall',false);
    2525                 miscellaneous = modelfield('default',0,'marshall',true);
     26                 timestepping = modelfield('default',0,'marshall',true);
    2627
    2728                 %FIXME: all other fields should belong to other classes
    … …  
    160161
    161162                 %Transient
    162                  dt                     = modelfield('default',0,'marshall',true,'format','Double');
    163                  ndt                    = modelfield('default',0,'marshall',true,'format','Double');
    164                  time_adapt             = modelfield('default',0,'marshall',true,'format','Boolean');
    165                  cfl_coefficient        = modelfield('default',0,'marshall',true,'format','Double');
    166163                 artificial_diffusivity = modelfield('default',0,'marshall',true,'format','Integer');
    167164                 prognostic_DG          = modelfield('default',0,'marshall',true,'format','Integer');
    … …  
    421418                         if isfield(structmd,'notes'), md.miscellaneous.notes=structmd.notes; end
    422419                         if isfield(structmd,'dummy'), md.miscellaneous.dummy=structmd.dummy; end
     420                         if isfield(structmd,'dt'), md.timestepping.time_step=structmd.dt; end
     421                         if isfield(structmd,'ndt'), md.timestepping.final_time=structmd.ndt; end
     422                         if isfield(structmd,'time_adapt'), md.timestepping.time_adapt=structmd.time_adapt; end
     423                         if isfield(structmd,'cfl_coefficient'), md.timestepping.cfl_coefficient=structmd.cfl_coefficient; end
    423424
    424425                         %Field changes
    … …  
    536537                         md.radaroverlay=radaroverlay;
    537538                         md.miscellaneous=miscellaneous;
     539                         md.timestepping=timestepping;
    538540
    539541                         %Materials parameters
    … …  
    629631                         md.min_thermal_constraints=0;
    630632                         md.min_mechanical_constraints=0;
    631 
    632                          %Transient parameters
    633 
    634                          %time between 2 time steps
    635                          md.dt=1/2;
    636 
    637                          %number of time steps = md.ndt / md.dt
    638                          md.ndt=10*md.dt;
    639 
    640                          %time adaptation?
    641                          md.time_adapt=0;
    642                          md.cfl_coefficient=.5;
    643633
    644634                         %Hydrostatic adjustment

  • issm/trunk/src/m/model/ismodelselfconsistent.m

    r9625 r9628  
    172172        message(['model not consistent: model ' md.miscellaneous.name ' settings.lowmem field should be 0 or 1']);
    173173end
    174 if ~ismember(md.time_adapt,[0 1]),
     174if ~ismember(md.timestepping.time_adapt,[0 1]),
    175175        message(['model not consistent: model ' md.miscellaneous.name ' time_adapt field should be 0 or 1']);
    176176end
    … …  
    291291if (md.private.solution==TransientSolutionEnum),
    292292
    293         if md.dt<=0,
    294                 message('model not consistent: field dt must be positive for a transient run')
    295         end
    296         if(md.cfl_coefficient>1 | md.cfl_coefficient<0),
     293        if md.timestepping.time_step<=0,
     294                message('model not consistent: field timesteppping.time_step must be positive for a transient run')
     295        end
     296        if(md.timestepping.cfl_coefficient>1 | md.timestepping.cfl_coefficient<0),
    297297                message(['model not consistent: model ' md.miscellaneous.name ' cfl_coefficient field should between  0 and 1']);
    298298        end
    299         if(md.cfl_coefficient>1 | md.cfl_coefficient<0),
     299        if(md.timestepping.cfl_coefficient>1 | md.timestepping.cfl_coefficient<0),
    300300                message(['model not consistent: model ' md.miscellaneous.name ' cfl_coefficient field should between  0 and 1']);
    301301        end
    … …  
    315315
    316316        %NDT
    317         if md.dt~=0,
    318                 message(['model not consistent: for a steadystate computation, dt must be zero.']);
     317        if md.timestepping.time_step~=0,
     318                message(['model not consistent: for a steadystate computation, timesteppping.time_step must be zero.']);
    319319        end
    320320
    … …  
    331331        end
    332332
    333         if md.dt<=0,
    334                 message('model not consistent: field dt must be positive for a transient run')
     333        if md.timestepping.time_step<=0,
     334                message('model not consistent: field timesteppping.time_step must be positive for a transient run')
    335335        end
    336336
    … …  
    339339        end
    340340
    341         if(md.cfl_coefficient>1 | md.cfl_coefficient<0),
     341        if(md.timestepping.cfl_coefficient>1 | md.timestepping.cfl_coefficient<0),
    342342                message(['model not consistent: model ' md.miscellaneous.name ' cfl_coefficient field should between  0 and 1']);
    343343        end
    … …  
    502502
    503503                        %THERMAL TRANSIENT
    504                         if md.dt~=0,
     504                        if md.timestepping.time_step~=0,
    505505
    506506                                %DT and NDT
    507                                 fields={'dt','ndt'};
     507                                fields={'timesteppping.time_step','timesteppping.final_time'};
    508508                                checkgreaterstrict(md,fields,0);
    509509
    … …  
    541541
    542542                        %THERMAL TRANSIENT
    543                         if md.dt~=0,
    544 
    545                                 %DT and NDT
    546                                 fields={'dt','ndt'};
     543                        if md.timestepping.time_step~=0,
     544
     545                                %TIMESTEPPING
     546                                fields={'timestepping.time_step','timestepping.final_time'};
    547547                                checkgreaterstrict(md,fields,0);
    548548

  • issm/trunk/template

    r9625 r9628  
    215215        vwgt -> vertex_weight
    216216}}}
    217 timestepping{{{
    218         dt ->time_step
    219         ndt-> rename final_time
    220         time_adapt -> "cfl" "none"
    221         cfl_coefficient
    222 }}}
    223217
    224218%To be completed

  • issm/trunk/test/NightlyRun/test1110.m

    r9048 r9628  
    4747        md.penalties=[posx,posx2;posy,posy2];
    4848
    49         md.dt=3;
    50         md.ndt=300;
     49        md.timestepping.time_step=3;
     50        md.timestepping.final_time=300;
    5151        md.output_frequency=50;
    5252        md.prognostic_DG=0;

  • issm/trunk/test/NightlyRun/test115.m

    r9611 r9628  
    44md=extrude(md,3,1);
    55md=setelementstype(md,'macayeal','all');
    6 md.dt=0;
     6md.timestepping.time_step=0;
    77md.cluster=none;
    88md=solve(md,ThermalSolutionEnum);

  • issm/trunk/test/NightlyRun/test116.m

    r9611 r9628  
    44md=extrude(md,3,1);
    55md=setelementstype(md,'macayeal','all');
    6 md.dt=0;
     6md.timestepping.time_step=0;
    77md.cluster=generic('name',oshostname(),'np',3);
    88md=solve(md,ThermalSolutionEnum);

  • issm/trunk/test/NightlyRun/test1204.m

    r8824 r9628  
    2121md.vy=PatchToVec(md.results.DiagnosticSolution.Vy);
    2222
    23 md.dt=1;
    24 md.ndt=5000;
     23md.timestepping.time_step=1;
     24md.timestepping.final_time=5000;
    2525md.artificial_diffusivity=1;
    2626md=solve(md,TransientSolutionEnum);

  • issm/trunk/test/NightlyRun/test1208.m

    r9611 r9628  
    1919
    2020%Adapt the time steps to the resolution
    21 md.dt=20;
     21md.timestepping.time_step=20;
    2222md.output_frequency=20;
    23 md.ndt=50000;
     23md.timestepping.final_time=50000;
    2424md.artificial_diffusivity=2;
    2525

  • issm/trunk/test/NightlyRun/test1501.m

    r9619 r9628  
    88md.isthermal=0;
    99
    10 md.dt=1;
     10md.timestepping.time_step=1;
    1111md.output_frequency=1;
    12 md.ndt=2000;
     12md.timestepping.final_time=2000;
    1313
    1414%Solve for thinning rate -> -1 * surface mass balance

  • issm/trunk/test/NightlyRun/test1502.m

    r9619 r9628  
    99md.isthermal=0;
    1010
    11 md.dt=1;
     11md.timestepping.time_step=1;
    1212md.output_frequency=1;
    13 md.ndt=2000;
     13md.timestepping.final_time=2000;
    1414
    1515%Solve for thinning rate -> -1 * surface mass balance

  • issm/trunk/test/NightlyRun/test211.m

    r9611 r9628  
    44md=extrude(md,3,1);
    55md=setelementstype(md,'macayeal','all');
    6 md.dt=0;
     6md.timestepping.time_step=0;
    77md.cluster=none;
    88md=solve(md,ThermalSolutionEnum);

  • issm/trunk/test/NightlyRun/test212.m

    r9611 r9628  
    44md=extrude(md,3,1);
    55md=setelementstype(md,'macayeal','all');
    6 md.dt=0;
     6md.timestepping.time_step=0;
    77md.cluster=generic('name',oshostname(),'np',3);
    88md=solve(md,ThermalSolutionEnum);

  • issm/trunk/test/NightlyRun/test251.m

    r8433 r9628  
    44md=setelementstype(md,'macayeal','all');
    55md.cluster=none;
    6 md.time_adapt=1;
    7 md.ndt=10;
     6md.timestepping.time_adapt=1;
     7md.timestepping.final_time=10;
    88md=solve(md,TransientSolutionEnum);
    99

  • issm/trunk/test/NightlyRun/test252.m

    r8589 r9628  
    44md=setelementstype(md,'macayeal','all');
    55md.cluster=generic('name',oshostname(),'np',3);
    6 md.time_adapt=1;
    7 md.ndt=10;
     6md.timestepping.time_adapt=1;
     7md.timestepping.final_time=10;
    88md=solve(md,TransientSolutionEnum);
    99

  • issm/trunk/test/NightlyRun/test253.m

    r9611 r9628  
    55md=setelementstype(md,'pattyn','all');
    66md.cluster=none;
    7 md.time_adapt=1;
    8 md.ndt=10;
     7md.timestepping.time_adapt=1;
     8md.timestepping.final_time=10;
    99md=solve(md,TransientSolutionEnum);
    1010

  • issm/trunk/test/NightlyRun/test254.m

    r9611 r9628  
    55md=setelementstype(md,'pattyn','all');
    66md.cluster=generic('name',oshostname(),'np',3);
    7 md.time_adapt=1;
    8 md.ndt=10;
     7md.timestepping.time_adapt=1;
     8md.timestepping.final_time=10;
    99md=solve(md,TransientSolutionEnum);
    1010

  • issm/trunk/test/NightlyRun/test255.m

    r9619 r9628  
    55md.cluster=none;
    66
    7 md.dt=1;
     7md.timestepping.time_step=1;
    88md.output_frequency=1;
    9 md.ndt=4;
     9md.timestepping.final_time=4;
    1010
    1111%Set up transient

  • issm/trunk/test/NightlyRun/test256.m

    r9619 r9628  
    55md.cluster=generic('name',oshostname(),'np',3);
    66
    7 md.dt=1;
     7md.timestepping.time_step=1;
    88md.output_frequency=1;
    9 md.ndt=4;
     9md.timestepping.final_time=4;
    1010
    1111%Set up transient

  • issm/trunk/test/NightlyRun/test257.m

    r9619 r9628  
    55md.cluster=none;
    66
    7 md.dt=1;
     7md.timestepping.time_step=1;
    88md.output_frequency=1;
    9 md.ndt=4;
     9md.timestepping.final_time=4;
    1010
    1111%Set up transient

  • issm/trunk/test/NightlyRun/test258.m

    r9619 r9628  
    55md.cluster=generic('name',oshostname(),'np',3);
    66
    7 md.dt=1;
     7md.timestepping.time_step=1;
    88md.output_frequency=1;
    9 md.ndt=4;
     9md.timestepping.final_time=4;
    1010
    1111%Set up transient

  • issm/trunk/test/NightlyRun/test259.m

    r9619 r9628  
    66md.cluster=none;
    77
    8 md.dt=1;
     8md.timestepping.time_step=1;
    99md.output_frequency=1;
    10 md.ndt=4;
     10md.timestepping.final_time=4;
    1111
    1212%Set up transient

  • issm/trunk/test/NightlyRun/test260.m

    r9619 r9628  
    66md.cluster=generic('name',oshostname(),'np',3);
    77
    8 md.dt=1;
     8md.timestepping.time_step=1;
    99md.output_frequency=1;
    10 md.ndt=4;
     10md.timestepping.final_time=4;
    1111
    1212%Set up transient

  • issm/trunk/test/NightlyRun/test261.m

    r9619 r9628  
    66md.cluster=none;
    77
    8 md.dt=1;
     8md.timestepping.time_step=1;
    99md.output_frequency=1;
    10 md.ndt=4;
     10md.timestepping.final_time=4;
    1111
    1212%Set up transient

  • issm/trunk/test/NightlyRun/test262.m

    r9619 r9628  
    66md.cluster=generic('name',oshostname(),'np',3);
    77
    8 md.dt=1;
     8md.timestepping.time_step=1;
    99md.output_frequency=1;
    10 md.ndt=4;
     10md.timestepping.final_time=4;
    1111
    1212%Set up transient

  • issm/trunk/test/NightlyRun/test263.m

    r9611 r9628  
    66md.cluster=none;
    77md.spctemperature=[md.spctemperature, md.spctemperature+5, md.spctemperature+10, md.spctemperature+15; 1.5 2.5 3.5 4];
    8 md.dt=1;
    9 md.ndt=4;
     8md.timestepping.time_step=1;
     9md.timestepping.final_time=4;
    1010md=solve(md,ThermalSolutionEnum);
    1111

  • issm/trunk/test/NightlyRun/test264.m

    r9611 r9628  
    66md.cluster=generic('name',oshostname(),'np',3);
    77md.spctemperature=[md.spctemperature, md.spctemperature+5, md.spctemperature+10, md.spctemperature+15; 1.5 2.5 3.5 4];
    8 md.dt=1;
    9 md.ndt=4;
     8md.timestepping.time_step=1;
     9md.timestepping.final_time=4;
    1010md=solve(md,ThermalSolutionEnum);
    1111

  • issm/trunk/test/NightlyRun/test265.m

    r9611 r9628  
    66md.cluster=none;
    77md.spctemperature=[md.spctemperature, md.spctemperature+5; 1 2];
    8 md.dt=0.5;
    9 md.ndt=2;
     8md.timestepping.time_step=0.5;
     9md.timestepping.final_time=2;
    1010md=solve(md,TransientSolutionEnum);
    1111

  • issm/trunk/test/NightlyRun/test266.m

    r9611 r9628  
    66md.cluster=generic('name',oshostname(),'np',3);
    77md.spctemperature=[md.spctemperature, md.spctemperature+5; 1 2];
    8 md.dt=0.5;
    9 md.ndt=2;
     8md.timestepping.time_step=0.5;
     9md.timestepping.final_time=2;
    1010md=solve(md,TransientSolutionEnum);
    1111

  • issm/trunk/test/NightlyRun/test323.m

    r9611 r9628  
    44md=extrude(md,3,1);
    55md=setelementstype(md,'macayeal','all');
    6 md.dt=0;
     6md.timestepping.time_step=0;
    77md.cluster=none;
    88md=solve(md,ThermalSolutionEnum);

  • issm/trunk/test/NightlyRun/test324.m

    r9611 r9628  
    44md=extrude(md,3,1);
    55md=setelementstype(md,'macayeal','all');
    6 md.dt=0;
     6md.timestepping.time_step=0;
    77md.cluster=generic('name',oshostname(),'np',3);
    88md=solve(md,ThermalSolutionEnum);

  • issm/trunk/test/NightlyRun/test335.m

    r9611 r9628  
    55md=setelementstype(md,'hutter','all');
    66md.cluster=none;
    7 md.dt=0;
     7md.timestepping.time_step=0;
    88md=solve(md,SteadystateSolutionEnum);
    99

  • issm/trunk/test/NightlyRun/test336.m

    r9611 r9628  
    55md=setelementstype(md,'hutter','all');
    66md.cluster=generic('name',oshostname(),'np',3);
    7 md.dt=0;
     7md.timestepping.time_step=0;
    88md=solve(md,SteadystateSolutionEnum);
    99

  • issm/trunk/test/NightlyRun/test345.m

    r8433 r9628  
    44md=setelementstype(md,'macayeal','all');
    55md.cluster=none;
    6 md.time_adapt=1;
    7 md.ndt=600;
     6md.timestepping.time_adapt=1;
     7md.timestepping.final_time=600;
    88md=solve(md,TransientSolutionEnum);
    99

  • issm/trunk/test/NightlyRun/test346.m

    r8589 r9628  
    44md=setelementstype(md,'macayeal','all');
    55md.cluster=generic('name',oshostname(),'np',3);
    6 md.time_adapt=1;
    7 md.ndt=600;
     6md.timestepping.time_adapt=1;
     7md.timestepping.final_time=600;
    88md=solve(md,TransientSolutionEnum);
    99

  • issm/trunk/test/NightlyRun/test347.m

    r9611 r9628  
    55md=setelementstype(md,'hutter','all');
    66md.cluster=none;
    7 md.time_adapt=1;
    8 md.ndt=500;
     7md.timestepping.time_adapt=1;
     8md.timestepping.final_time=500;
    99md=solve(md,TransientSolutionEnum);
    1010

  • issm/trunk/test/NightlyRun/test348.m

    r9611 r9628  
    55md=setelementstype(md,'hutter','all');
    66md.cluster=generic('name',oshostname(),'np',3);
    7 md.time_adapt=1;
    8 md.ndt=500;
     7md.timestepping.time_adapt=1;
     8md.timestepping.final_time=500;
    99md=solve(md,TransientSolutionEnum);
    1010

  • issm/trunk/test/NightlyRun/test411.m

    r9611 r9628  
    55md=setelementstype(md,'pattyn','all');
    66md.cluster=none;
    7 md.dt=0;
     7md.timestepping.time_step=0;
    88md=solve(md,ThermalSolutionEnum);
    99

  • issm/trunk/test/NightlyRun/test412.m

    r9611 r9628  
    55md=setelementstype(md,'pattyn','all');
    66md.cluster=generic('name',oshostname(),'np',3);
    7 md.dt=0;
     7md.timestepping.time_step=0;
    88md=solve(md,ThermalSolutionEnum);
    99

  • issm/trunk/test/NightlyRun/test419.m

    r9611 r9628  
    55md=setelementstype(md,'macayeal','all');
    66md.cluster=none;
    7 md.dt=0;
     7md.timestepping.time_step=0;
    88md=solve(md,SteadystateSolutionEnum);
    99

  • issm/trunk/test/NightlyRun/test420.m

    r9611 r9628  
    55md=setelementstype(md,'macayeal','all');
    66md.cluster=generic('name',oshostname(),'np',3);
    7 md.dt=0;
     7md.timestepping.time_step=0;
    88md=solve(md,SteadystateSolutionEnum);
    99

  • issm/trunk/test/NightlyRun/test421.m

    r9611 r9628  
    55md=setelementstype(md,'pattyn','all');
    66md.cluster=none;
    7 md.dt=0;
     7md.timestepping.time_step=0;
    88md=solve(md,SteadystateSolutionEnum);
    99

  • issm/trunk/test/NightlyRun/test422.m

    r9611 r9628  
    55md=setelementstype(md,'pattyn','all');
    66md.cluster=generic('name',oshostname(),'np',3);
    7 md.dt=0;
     7md.timestepping.time_step=0;
    88md=solve(md,SteadystateSolutionEnum);
    99

  • issm/trunk/test/NightlyRun/test429.m

    r9611 r9628  
    1616md.maxiter=2*ones(md.nsteps,1);
    1717md.cm_jump=0.3*ones(md.nsteps,1);
    18 md.dt=0;
     18md.timestepping.time_step=0;
    1919md.vx_obs=md.vx; md.vy_obs=md.vy;
    2020

  • issm/trunk/test/NightlyRun/test430.m

    r9611 r9628  
    1616md.maxiter=2*ones(md.nsteps,1);
    1717md.cm_jump=0.3*ones(md.nsteps,1);
    18 md.dt=0;
     18md.timestepping.time_step=0;
    1919md.vx_obs=md.vx; md.vy_obs=md.vy;
    2020

  • issm/trunk/test/NightlyRun/test431.m

    r9611 r9628  
    1616md.maxiter=2*ones(md.nsteps,1);
    1717md.cm_jump=0.3*ones(md.nsteps,1);
    18 md.dt=0;
     18md.timestepping.time_step=0;
    1919md.vx_obs=md.vx; md.vy_obs=md.vy;
    2020

  • issm/trunk/test/NightlyRun/test432.m

    r9611 r9628  
    1616md.maxiter=2*ones(md.nsteps,1);
    1717md.cm_jump=0.3*ones(md.nsteps,1);
    18 md.dt=0;
     18md.timestepping.time_step=0;
    1919md.vx_obs=md.vx; md.vy_obs=md.vy;
    2020

  • issm/trunk/test/NightlyRun/test515.m

    r9611 r9628  
    55md=setelementstype(md,'macayeal','all');
    66md.cluster=none;
    7 md.dt=0;
     7md.timestepping.time_step=0;
    88md=solve(md,SteadystateSolutionEnum);
    99

  • issm/trunk/test/NightlyRun/test516.m

    r9611 r9628  
    55md=setelementstype(md,'macayeal','all');
    66md.cluster=generic('name',oshostname(),'np',3);
    7 md.dt=0;
     7md.timestepping.time_step=0;
    88md=solve(md,SteadystateSolutionEnum);
    99

  • issm/trunk/test/NightlyRun/test517.m

    r9611 r9628  
    55md=setelementstype(md,'pattyn','all');
    66md.cluster=none;
    7 md.dt=0;
     7md.timestepping.time_step=0;
    88md=solve(md,SteadystateSolutionEnum);
    99

  • issm/trunk/test/NightlyRun/test518.m

    r9611 r9628  
    55md=setelementstype(md,'pattyn','all');
    66md.cluster=generic('name',oshostname(),'np',3);
    7 md.dt=0;
     7md.timestepping.time_step=0;
    88md=solve(md,SteadystateSolutionEnum);
    99

  • issm/trunk/test/NightlyRun/test519.m

    r9611 r9628  
    55md=setelementstype(md,'stokes','all');
    66md.cluster=none;
    7 md.dt=0;
     7md.timestepping.time_step=0;
    88md=solve(md,SteadystateSolutionEnum);
    99

  • issm/trunk/test/NightlyRun/test520.m

    r9611 r9628  
    55md=setelementstype(md,'stokes','all');
    66md.cluster=generic('name',oshostname(),'np',3);
    7 md.dt=0;
     7md.timestepping.time_step=0;
    88md=solve(md,SteadystateSolutionEnum);
    99

  • issm/trunk/test/NightlyRun/test525.m

    r9611 r9628  
    1717md.cm_jump=0.99*ones(md.nsteps,1);
    1818md.vx_obs=md.vx; md.vy_obs=md.vy;
    19 md.dt=0;
     19md.timestepping.time_step=0;
    2020
    2121md.cluster=none;

  • issm/trunk/test/NightlyRun/test526.m

    r9611 r9628  
    1717md.cm_jump=0.99*ones(md.nsteps,1);
    1818md.vx_obs=md.vx; md.vy_obs=md.vy;
    19 md.dt=0;
     19md.timestepping.time_step=0;
    2020
    2121md.cluster=generic('name',oshostname(),'np',3);

  • issm/trunk/test/NightlyRun/test531.m

    r9611 r9628  
    55md=setelementstype(md,'pattyn','all');
    66md.artificial_diffusivity=2;
    7 md.dt=0;
     7md.timestepping.time_step=0;
    88md.min_thermal_constraints=40;
    99md=solve(md,ThermalSolutionEnum);

  • issm/trunk/test/NightlyRun/test532.m

    r9611 r9628  
    66md.artificial_diffusivity=2;
    77md.cluster=generic('name',oshostname(),'np',3);
    8 md.dt=0;
     8md.timestepping.time_step=0;
    99md.min_thermal_constraints=40;
    1010md=solve(md,ThermalSolutionEnum);

  • issm/trunk/test/Par/79North.par

    r9625 r9628  
    3434md.verbose=verbose(0);
    3535md.waitonlock=30;
    36 md.dt=1;
    37 md.ndt=3;
     36md.timestepping.time_step=1;
     37md.timestepping.final_time=3;
    3838md.eps_res=0.05;
    3939md.eps_rel=0.005;

  • issm/trunk/test/Par/ISMIPF.par

    r9611 r9628  
    3838
    3939%Transient options
    40 md.dt=1;
    41 md.ndt=10;
     40md.timestepping.time_step=1;
     41md.timestepping.final_time=10;
    4242md.artificial_diffusivity=1;
    4343md.min_thermal_constraints=10^5;

  • issm/trunk/test/Par/Pig.par

    r9625 r9628  
    3232md.verbose=verbose(0);
    3333md.waitonlock=30;
    34 md.dt=1;
    35 md.ndt=2;
     34md.timestepping.time_step=1;
     35md.timestepping.final_time=2;
    3636md.eps_res=0.05;
    3737md.eps_rel=1;

  • issm/trunk/test/Par/RoundSheetEISMINT.par

    r9611 r9628  
    5050
    5151%parallel options
    52 md.ndt=50000;
     52md.timestepping.final_time=50000;
    5353
    5454%Constants

  • issm/trunk/test/Par/RoundSheetShelf.par

    r9625 r9628  
    6464md.eps_rel=0.05;
    6565md.eps_abs=NaN;
    66 md.dt=.1;
    67 md.ndt=5;
     66md.timestepping.time_step=.1;
     67md.timestepping.final_time=5;
    6868
    6969%bathymetry and grounding line migration:

  • issm/trunk/test/Par/SquareEISMINT.par

    r9611 r9628  
    3434md.spcthickness=NaN*ones(md.numberofnodes,1);
    3535md.spcthickness(pos)=500;
    36 md.ndt=500;
    37 md.dt=1;
     36md.timestepping.final_time=500;
     37md.timestepping.time_step=1;
    3838md.artificial_diffusivity=0; %Better result with no artificial diffusivity

  • issm/trunk/test/Par/SquareSheetConstrained.par

    r9625 r9628  
    3838md.eps_rel=0.05;
    3939md.eps_abs=NaN;
    40 md.dt=1;
    41 md.ndt=3;
     40md.timestepping.time_step=1;
     41md.timestepping.final_time=3;
    4242
    4343%Boundary conditions:

  • issm/trunk/test/Par/SquareSheetShelf.par

    r9625 r9628  
    4545md.eps_rel=0.05;
    4646md.eps_abs=NaN;
    47 md.dt=1;
    48 md.ndt=3;
     47md.timestepping.time_step=1;
     48md.timestepping.final_time=3;
    4949
    5050%Deal with boundary conditions:

  • issm/trunk/test/Par/SquareShelf.par

    r9625 r9628  
    3838md.eps_rel=0.02;
    3939md.eps_abs=NaN;
    40 md.dt=1;
    41 md.ndt=3;
     40md.timestepping.time_step=1;
     41md.timestepping.final_time=3;
    4242
    4343%Boundary conditions:

  • issm/trunk/test/Par/SquareShelfConstrained.par

    r9625 r9628  
    4242md.eps_rel=0.05;
    4343md.eps_abs=NaN;
    44 md.dt=1;
    45 md.ndt=3;
     44md.timestepping.time_step=1;
     45md.timestepping.final_time=3;
    4646
    4747%Deal with boundary conditions:

  • issm/trunk/test/Par/SquareThermal.par

    r9611 r9628  
    11%Ok, start defining model parameters here
    22
    3 md.dt=0;
     3md.timestepping.time_step=0;
    44
    55disp('      creating thickness');
Note: See TracChangeset for help on using the changeset viewer.