Changeset 6130

Timestamp:

10/04/10 00:01:17 (14 years ago)

Author:

Eric.Larour

Message:

New time stepping, using CFL criterion. Just set time_adapt=1, and set cfl_coefficient (usually 1/2),
and off we go computing new time steps at every iteration.

Location:

issm/trunk/src

Files:

• c/EnumDefinitions/EnumDefinitions.h (modified) (1 diff)
• c/EnumDefinitions/EnumToString.cpp (modified) (1 diff)
• c/EnumDefinitions/StringToEnum.cpp (modified) (1 diff)
• c/Makefile.am (modified) (2 diffs)
• c/modules/ModelProcessorx/CreateParameters.cpp (modified) (1 diff)
• c/modules/TimeAdaptx (added)
• c/modules/TimeAdaptx/TimeAdaptx.cpp (added)
• c/modules/TimeAdaptx/TimeAdaptx.h (added)
• c/modules/modules.h (modified) (1 diff)
• c/objects/Elements/Element.h (modified) (1 diff)
• c/objects/Elements/Penta.cpp (modified) (1 diff)
• c/objects/Elements/Penta.h (modified) (1 diff)
• c/objects/Elements/Tria.cpp (modified) (1 diff)
• c/objects/Elements/Tria.h (modified) (1 diff)
• c/objects/IoModel.cpp (modified) (2 diffs)
• c/objects/IoModel.h (modified) (1 diff)
• c/shared/Numerics/cfl_time.cpp (added)
• c/solutions/transient2d_core.cpp (modified) (3 diffs)
• c/solutions/transient3d_core.cpp (modified) (3 diffs)
• m/classes/@model/model.m (modified) (1 diff)
• m/classes/@model/setdefaultparameters.m (modified) (1 diff)
• m/classes/clusters/pfe.m (modified) (1 diff)
• m/enum/AbsoluteEnum.m (modified) (1 diff)
• m/enum/AdjointEnum.m (modified) (1 diff)
• m/enum/BetaEnum.m (modified) (1 diff)
• m/enum/BoolExternalResultEnum.m (modified) (1 diff)
• m/enum/CflCoefficientEnum.m (added)
• m/enum/CmGradientEnum.m (modified) (1 diff)
• m/enum/CmJumpEnum.m (modified) (1 diff)
• m/enum/CmMaxEnum.m (modified) (1 diff)
• m/enum/CmMinEnum.m (modified) (1 diff)
• m/enum/ColinearEnum.m (modified) (1 diff)
• m/enum/ConnectivityEnum.m (modified) (1 diff)
• m/enum/ControlParameterEnum.m (modified) (1 diff)
• m/enum/ControlSteadyEnum.m (modified) (1 diff)
• m/enum/DakotaParameterEnum.m (modified) (1 diff)
• m/enum/DimEnum.m (modified) (1 diff)
• m/enum/DoubleElementResultEnum.m (modified) (1 diff)
• m/enum/DoubleExternalResultEnum.m (modified) (1 diff)
• m/enum/DoubleMatExternalResultEnum.m (modified) (1 diff)
• m/enum/DoubleVecExternalResultEnum.m (modified) (1 diff)
• m/enum/ElementOnBedEnum.m (modified) (1 diff)
• m/enum/ElementOnIceShelfEnum.m (modified) (1 diff)
• m/enum/ElementOnSurfaceEnum.m (modified) (1 diff)
• m/enum/ElementOnWaterEnum.m (modified) (1 diff)
• m/enum/EnumToString.m (modified) (1 diff)
• m/enum/EpsAbsEnum.m (modified) (1 diff)
• m/enum/EpsCmEnum.m (modified) (1 diff)
• m/enum/EpsRelEnum.m (modified) (1 diff)
• m/enum/EpsResEnum.m (modified) (1 diff)
• m/enum/EpsVelEnum.m (modified) (1 diff)
• m/enum/ExtToIuEnum.m (modified) (1 diff)
• m/enum/FillEnum.m (modified) (1 diff)
• m/enum/FractionIncrementEnum.m (modified) (1 diff)
• m/enum/FrictionEnum.m (modified) (1 diff)
• m/enum/FsetEnum.m (modified) (1 diff)
• m/enum/GeothermalFluxEnum.m (modified) (1 diff)
• m/enum/GradientEnum.m (modified) (1 diff)
• m/enum/GravityEnum.m (modified) (1 diff)
• m/enum/GsetEnum.m (modified) (1 diff)
• m/enum/HeatCapacityEnum.m (modified) (1 diff)
• m/enum/IndexEnum.m (modified) (1 diff)
• m/enum/IndexedEnum.m (modified) (1 diff)
• m/enum/IntExternalResultEnum.m (modified) (1 diff)
• m/enum/InternalEnum.m (modified) (1 diff)
• m/enum/IntersectEnum.m (modified) (1 diff)
• m/enum/IsHutterEnum.m (modified) (1 diff)
• m/enum/IsMacAyealPattynEnum.m (modified) (1 diff)
• m/enum/IsStokesEnum.m (modified) (1 diff)
• m/enum/IuToExtEnum.m (modified) (1 diff)
• m/enum/JEnum.m (modified) (1 diff)
• m/enum/KffEnum.m (modified) (1 diff)
• m/enum/KflagEnum.m (modified) (1 diff)
• m/enum/LatentHeatEnum.m (modified) (1 diff)
• m/enum/LowmemEnum.m (modified) (1 diff)
• m/enum/MassFluxEnum.m (modified) (1 diff)
• m/enum/MaxAbsVxEnum.m (modified) (1 diff)
• m/enum/MaxAbsVyEnum.m (modified) (1 diff)
• m/enum/MaxAbsVzEnum.m (modified) (1 diff)
• m/enum/MaxIterEnum.m (modified) (1 diff)
• m/enum/MaxNonlinearIterationsEnum.m (modified) (1 diff)
• m/enum/MaxPenetrationEnum.m (modified) (1 diff)
• m/enum/MaxVelEnum.m (modified) (1 diff)
• m/enum/MaxVxEnum.m (modified) (1 diff)
• m/enum/MaxVyEnum.m (modified) (1 diff)
• m/enum/MaxVzEnum.m (modified) (1 diff)
• m/enum/MeanVelEnum.m (modified) (1 diff)
• m/enum/MeltingOffsetEnum.m (modified) (1 diff)
• m/enum/MeltingPointEnum.m (modified) (1 diff)
• m/enum/MeltingRateEnum.m (modified) (1 diff)
• m/enum/MinMechanicalConstraintsEnum.m (modified) (1 diff)
• m/enum/MinThermalConstraintsEnum.m (modified) (1 diff)
• m/enum/MinVelEnum.m (modified) (1 diff)
• m/enum/MinVxEnum.m (modified) (1 diff)
• m/enum/MinVyEnum.m (modified) (1 diff)
• m/enum/MinVzEnum.m (modified) (1 diff)
• m/enum/MiniEnum.m (modified) (1 diff)
• m/enum/MisfitEnum.m (modified) (1 diff)
• m/enum/MixedLayerCapacityEnum.m (modified) (1 diff)
• m/enum/NStepsEnum.m (modified) (1 diff)
• m/enum/NdtEnum.m (modified) (1 diff)
• m/enum/NodalEnum.m (modified) (1 diff)
• m/enum/NodeOnBedEnum.m (modified) (1 diff)
• m/enum/NodeOnIceSheetEnum.m (modified) (1 diff)
• m/enum/NodeOnIceShelfEnum.m (modified) (1 diff)
• m/enum/NodeOnSurfaceEnum.m (modified) (1 diff)
• m/enum/NumOutputEnum.m (modified) (1 diff)
• m/enum/NumRiftsEnum.m (modified) (1 diff)
• m/enum/NumberNodeToElementConnectivityEnum.m (modified) (1 diff)
• m/enum/NumberOfElementsEnum.m (modified) (1 diff)
• m/enum/NumberOfNodesEnum.m (modified) (1 diff)
• m/enum/NumberOfVerticesEnum.m (modified) (1 diff)
• m/enum/OldGradientEnum.m (modified) (1 diff)
• m/enum/OptScalEnum.m (modified) (1 diff)
• m/enum/OutputFilePointerEnum.m (modified) (1 diff)
• m/enum/OutputFrequencyEnum.m (modified) (1 diff)
• m/enum/P0Enum.m (modified) (1 diff)
• m/enum/P1DGEnum.m (modified) (1 diff)
• m/enum/P1Enum.m (modified) (1 diff)
• m/enum/ParameterOutputEnum.m (modified) (1 diff)
• m/enum/PatchEnum.m (modified) (1 diff)
• m/enum/PatchNodesEnum.m (modified) (1 diff)
• m/enum/PatchVerticesEnum.m (modified) (1 diff)
• m/enum/PenaltyMeltingEnum.m (modified) (1 diff)
• m/enum/PenaltyOffsetEnum.m (modified) (1 diff)
• m/enum/PentaVertexElementResultEnum.m (modified) (1 diff)
• m/enum/PetscOptionsAnalysesEnum.m (modified) (1 diff)
• m/enum/PetscOptionsStringsEnum.m (modified) (1 diff)
• m/enum/PetscRcEnum.m (modified) (1 diff)
• m/enum/PetscVecExternalResultEnum.m (modified) (1 diff)
• m/enum/PflagEnum.m (modified) (1 diff)
• m/enum/PressureEnum.m (modified) (1 diff)
• m/enum/PressureOldEnum.m (modified) (1 diff)
• m/enum/QmuAnalysisEnum.m (modified) (1 diff)
• m/enum/QmuErrNameEnum.m (modified) (1 diff)
• m/enum/QmuInNameEnum.m (modified) (1 diff)
• m/enum/QmuMassFluxSegmentsEnum.m (modified) (1 diff)
• m/enum/QmuNPartEnum.m (modified) (1 diff)
• m/enum/QmuNumberOfResponsesEnum.m (modified) (1 diff)
• m/enum/QmuOutNameEnum.m (modified) (1 diff)
• m/enum/QmuPartEnum.m (modified) (1 diff)
• m/enum/QmuPressureEnum.m (modified) (1 diff)
• m/enum/QmuVxEnum.m (modified) (1 diff)
• m/enum/QmuVyEnum.m (modified) (1 diff)
• m/enum/QmuVzEnum.m (modified) (1 diff)
• m/enum/RegularEnum.m (modified) (1 diff)
• m/enum/RelativeEnum.m (modified) (1 diff)
• m/enum/ResetPenaltiesEnum.m (modified) (1 diff)
• m/enum/ResidualEnum.m (modified) (1 diff)
• m/enum/ResponseDescriptorsEnum.m (modified) (1 diff)
• m/enum/RheologyBEnum.m (modified) (1 diff)
• m/enum/RheologyBbarEnum.m (modified) (1 diff)
• m/enum/RheologyNEnum.m (modified) (1 diff)
• m/enum/RhoIceEnum.m (modified) (1 diff)
• m/enum/RhoWaterEnum.m (modified) (1 diff)
• m/enum/ScaledEnum.m (modified) (1 diff)
• m/enum/SegmentOnIceShelfEnum.m (modified) (1 diff)
• m/enum/SeparateEnum.m (modified) (1 diff)
• m/enum/SparsityEnum.m (modified) (1 diff)
• m/enum/SsetEnum.m (modified) (1 diff)
• m/enum/StabilizeConstraintsEnum.m (modified) (1 diff)
• m/enum/StokesReconditioningEnum.m (modified) (1 diff)
• m/enum/StringExternalResultEnum.m (modified) (1 diff)
• m/enum/StringToEnum.m (modified) (1 diff)
• m/enum/SurfaceAbsVelMisfitEnum.m (modified) (1 diff)
• m/enum/SurfaceAreaEnum.m (modified) (1 diff)
• m/enum/SurfaceAverageVelMisfitEnum.m (modified) (1 diff)
• m/enum/SurfaceEnum.m (modified) (1 diff)
• m/enum/SurfaceLogVelMisfitEnum.m (modified) (1 diff)
• m/enum/SurfaceLogVxVyMisfitEnum.m (modified) (1 diff)
• m/enum/SurfaceRelVelMisfitEnum.m (modified) (1 diff)
• m/enum/SurfaceSlopeXEnum.m (modified) (1 diff)
• m/enum/SurfaceSlopeYEnum.m (modified) (1 diff)
• m/enum/TemperatureEnum.m (modified) (1 diff)
• m/enum/TemperatureOldEnum.m (modified) (1 diff)
• m/enum/TemporaryTemperatureEnum.m (modified) (1 diff)
• m/enum/ThermalConductivityEnum.m (modified) (1 diff)
• m/enum/ThermalExchangeVelocityEnum.m (modified) (1 diff)
• m/enum/ThicknessAbsMisfitEnum.m (modified) (1 diff)
• m/enum/ThicknessEnum.m (modified) (1 diff)
• m/enum/ThicknessObsEnum.m (modified) (1 diff)
• m/enum/TimeAdaptEnum.m (added)
• m/enum/TimeEnum.m (modified) (1 diff)
• m/enum/TolXEnum.m (modified) (1 diff)
• m/enum/TriaVertexElementResultEnum.m (modified) (1 diff)
• m/enum/TypeEnum.m (modified) (1 diff)
• m/enum/VariableDescriptorsEnum.m (modified) (1 diff)
• m/enum/VelEnum.m (modified) (1 diff)
• m/enum/VelObsEnum.m (modified) (1 diff)
• m/enum/VerboseEnum.m (modified) (1 diff)
• m/enum/ViscosityOvershootEnum.m (modified) (1 diff)
• m/enum/VxAverageEnum.m (modified) (1 diff)
• m/enum/VxEnum.m (modified) (1 diff)
• m/enum/VxObsEnum.m (modified) (1 diff)
• m/enum/VxOldEnum.m (modified) (1 diff)
• m/enum/VyAverageEnum.m (modified) (1 diff)
• m/enum/VyEnum.m (modified) (1 diff)
• m/enum/VyObsEnum.m (modified) (1 diff)
• m/enum/VyOldEnum.m (modified) (1 diff)
• m/enum/VzAverageEnum.m (modified) (1 diff)
• m/enum/VzEnum.m (modified) (1 diff)
• m/enum/VzObsEnum.m (modified) (1 diff)
• m/enum/VzOldEnum.m (modified) (1 diff)
• m/enum/VzPattynEnum.m (modified) (1 diff)
• m/enum/VzStokesEnum.m (modified) (1 diff)
• m/enum/WaitOnLockEnum.m (modified) (1 diff)
• m/enum/WeightsEnum.m (modified) (1 diff)
• m/enum/YtsEnum.m (modified) (1 diff)
• m/model/display/displaytransient.m (modified) (1 diff)
• m/model/loadresultsfromcluster.m (modified) (1 diff)
• m/model/marshall.m (modified) (1 diff)
• m/model/tres.m (modified) (1 diff)
• m/solutions/transient2d_core.m (modified) (2 diffs)
• m/solutions/transient3d_core.m (modified) (2 diffs)
• m/utils/Model/loadmodel.m (modified) (1 diff)
• m/utils/OS/issmbbftpin.m (added)
• mex/Makefile.am (modified) (2 diffs)
• mex/TimeAdapt (added)
• mex/TimeAdapt/TimeAdapt.cpp (added)
• mex/TimeAdapt/TimeAdapt.h (added)

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

@@ -179 +179 @@
         DragTypeEnum,
         DtEnum,
+        TimeAdaptEnum,
+        CflCoefficientEnum,
         ElementOnBedEnum,
         ElementOnIceShelfEnum,

issm/trunk/src/c/EnumDefinitions/EnumToString.cpp

@@ -153 +153 @@
                 case DragTypeEnum : return "DragType";
                 case DtEnum : return "Dt";
+                case TimeAdaptEnum : return "TimeAdapt";
+                case CflCoefficientEnum : return "CflCoefficient";
                 case ElementOnBedEnum : return "ElementOnBed";
                 case ElementOnIceShelfEnum : return "ElementOnIceShelf";

issm/trunk/src/c/EnumDefinitions/StringToEnum.cpp

@@ -151 +151 @@
         else if (strcmp(name,"DragType")==0) return DragTypeEnum;
         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,"ElementOnIceShelf")==0) return ElementOnIceShelfEnum;

issm/trunk/src/c/Makefile.am

@@ -480 +480 @@
                                         ./modules/UpdateGeometryx/UpdateGeometryx.h\
                                         ./modules/UpdateGeometryx/UpdateGeometryx.cpp\
+                                        ./modules/TimeAdaptx/TimeAdaptx.h\
+                                        ./modules/TimeAdaptx/TimeAdaptx.cpp\
                                         ./modules/UpdateVertexPositionsx/UpdateVertexPositionsx.h\
                                         ./modules/UpdateVertexPositionsx/UpdateVertexPositionsx.cpp\
@@ -1039 +1041 @@
                                         ./modules/UpdateGeometryx/UpdateGeometryx.h\
                                         ./modules/UpdateGeometryx/UpdateGeometryx.cpp\
+                                        ./modules/TimeAdaptx/TimeAdaptx.h\
+                                        ./modules/TimeAdaptx/TimeAdaptx.cpp\
                                         ./modules/UpdateVertexPositionsx/UpdateVertexPositionsx.h\
                                         ./modules/UpdateVertexPositionsx/UpdateVertexPositionsx.cpp\

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

@@ -54 +54 @@
         parameters->AddObject(new DoubleParam(DtEnum,iomodel->dt*iomodel->yts)); //Dt is in years in iomodel
         parameters->AddObject(new DoubleParam(NdtEnum,iomodel->ndt*iomodel->yts)); //Ndt is in yeats in iomodel
+        parameters->AddObject(new BoolParam(TimeAdaptEnum,iomodel->time_adapt)); 
+        parameters->AddObject(new DoubleParam(CflCoefficientEnum,iomodel->cfl_coefficient)); 
         parameters->AddObject(new DoubleParam(PenaltyOffsetEnum,iomodel->penalty_offset));
         parameters->AddObject(new DoubleParam(SparsityEnum,iomodel->sparsity));

issm/trunk/src/c/modules/modules.h

@@ -83 +83 @@
 #include "./SurfaceAreax/SurfaceAreax.h"
 #include "./SystemMatricesx/SystemMatricesx.h"
+#include "./TimeAdaptx/TimeAdaptx.h"
 #include "./TriaSearchx/TriaSearchx.h"
 #include "./ThicknessAbsMisfitx/ThicknessAbsMisfitx.h"

issm/trunk/src/c/objects/Elements/Element.h

@@ -77 +77 @@
                 virtual bool   InputConvergence(double* eps, int* enums,int num_enums,int* criterionenums,double* criterionvalues,int num_criterionenums)=0;
                 virtual void   AverageOntoPartition(Vec partition_contributions,Vec partition_areas,double* vertex_response,double* qmu_part)=0;
+                virtual double TimeAdapt()=0;
 
                 /*Implementation: */

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

@@ -1288 +1288 @@
 }
 /*}}}*/
+/*FUNCTION Penta::TimeAdapt{{{1*/
+double  Penta::TimeAdapt(void){
+
+        /*intermediary: */
+        double C;
+        double maxabsvx;
+        double maxabsvy;
+        double maxabsvz;
+        double maxx,minx;
+        double maxy,miny;
+        double maxz,minz;
+        double dx,dy,dz;
+        double xyz_list[NUMVERTICES][3];
+        int    i;
+
+        /*output: */
+        double dt;
+
+        /*get CFL coefficient:*/
+        this->parameters->FindParam(&C,CflCoefficientEnum);
+
+        /*Get for Vx and Vy, the max of abs value: */
+        this->MaxAbsVx(&maxabsvx,false);
+        this->MaxAbsVy(&maxabsvy,false);
+        this->MaxAbsVz(&maxabsvz,false);
+
+        /* Get node coordinates and dof list: */
+        GetVerticesCoordinates(&xyz_list[0][0], this->nodes, NUMVERTICES);
+
+        minx=xyz_list[0][0];
+        maxx=xyz_list[0][0];
+        miny=xyz_list[0][1];
+        maxy=xyz_list[0][1];
+        minz=xyz_list[0][2];
+        maxz=xyz_list[0][2];
+        
+        for(i=1;i<NUMVERTICES;i++){
+                if (xyz_list[i][0]<minx)minx=xyz_list[i][0];
+                if (xyz_list[i][0]>maxx)maxx=xyz_list[i][0];
+                if (xyz_list[i][1]<miny)miny=xyz_list[i][1];
+                if (xyz_list[i][1]>maxy)maxy=xyz_list[i][1];
+                if (xyz_list[i][2]<minz)minz=xyz_list[i][2];
+                if (xyz_list[i][2]>maxz)maxz=xyz_list[i][2];
+        }
+        dx=maxx-minx;
+        dy=maxy-miny;
+        dz=maxz-minz;
+
+        /*CFL criterion: */
+        dt=C/(maxabsvy/dx+maxabsvy/dy+maxabsvz/dz);
+
+        return dt;
+
+}
 /*FUNCTION Penta::ThicknessAbsMisfit {{{1*/
 double Penta::ThicknessAbsMisfit(bool process_units){

issm/trunk/src/c/objects/Elements/Penta.h

@@ -118 +118 @@
                 void   Update(int index, IoModel* iomodel,int analysis_counter,int analysis_type);
                 void   UpdateGeometry(void);
+                double TimeAdapt();
                 /*}}}*/
                 /*Penta specific routines:{{{1*/

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

@@ -1509 +1509 @@
 }
 /*}}}*/
+/*FUNCTION Tria::TimeAdapt{{{1*/
+double  Tria::TimeAdapt(void){
+
+        /*intermediary: */
+        double C;
+        double maxabsvx;
+        double maxabsvy;
+        double maxx,minx;
+        double maxy,miny;
+        double xyz_list[NUMVERTICES][3];
+        double dx,dy;
+        int    i;
+
+        /*output: */
+        double dt;
+
+        /*get CFL coefficient:*/
+        this->parameters->FindParam(&C,CflCoefficientEnum);
+
+        /*Get for Vx and Vy, the max of abs value: */
+        this->MaxAbsVx(&maxabsvx,false);
+        this->MaxAbsVy(&maxabsvy,false);
+
+        /* Get node coordinates and dof list: */
+        GetVerticesCoordinates(&xyz_list[0][0], this->nodes, NUMVERTICES);
+
+        minx=xyz_list[0][0];
+        maxx=xyz_list[0][0];
+        miny=xyz_list[0][1];
+        maxy=xyz_list[0][1];
+        
+        for(i=1;i<NUMVERTICES;i++){
+                if (xyz_list[i][0]<minx)minx=xyz_list[i][0];
+                if (xyz_list[i][0]>maxx)maxx=xyz_list[i][0];
+                if (xyz_list[i][1]<miny)miny=xyz_list[i][1];
+                if (xyz_list[i][1]>maxy)maxy=xyz_list[i][1];
+        }
+        dx=maxx-minx;
+        dy=maxy-miny;
+
+        /*CFL criterion: */
+        dt=C/(maxabsvy/dx+maxabsvy/dy);
+
+        return dt;
+
+}
+/*}}}*/
 /*FUNCTION Tria::ThicknessAbsMisfit {{{1*/
 double Tria::ThicknessAbsMisfit(bool process_units){

issm/trunk/src/c/objects/Elements/Tria.h

@@ -119 +119 @@
                 void   Update(int index, IoModel* iomodel,int analysis_counter,int analysis_type);
                 void   UpdateGeometry(void);
+                double TimeAdapt();
                 /*}}}*/
                 /*Tria specific routines:{{{1*/

issm/trunk/src/c/objects/IoModel.cpp

@@ -175 +175 @@
         IoModelFetchData(&this->dt,iomodel_handle,"dt");
         IoModelFetchData(&this->ndt,iomodel_handle,"ndt");
+        IoModelFetchData(&this->time_adapt,iomodel_handle,"time_adapt");
+        IoModelFetchData(&this->cfl_coefficient,iomodel_handle,"cfl_coefficient");
         IoModelFetchData(&this->penalty_offset,iomodel_handle,"penalty_offset");
         IoModelFetchData(&this->penalty_melting,iomodel_handle,"penalty_melting");
@@ -316 +318 @@
         this->dt=0;
         this->ndt=0;
+        this->time_adapt=0;
+        this->cfl_coefficient=0;
         this->penalty_offset=0;
         this->penalty_melting=0;

issm/trunk/src/c/objects/IoModel.h

@@ -140 +140 @@
                 double  max_nonlinear_iterations;
                 double  dt,ndt;
+                int     time_adapt;
+                double  cfl_coefficient;
                 double  penalty_offset;
                 double  penalty_melting;

issm/trunk/src/c/solutions/transient2d_core.cpp

@@ -21 +21 @@
         int    solution_type;
         bool   control_analysis;
+        bool   time_adapt=false;
         int    output_frequency;
 
@@ -35 +36 @@
         femmodel->parameters->FindParam(&solution_type,SolutionTypeEnum);
         femmodel->parameters->FindParam(&output_frequency,OutputFrequencyEnum);
+        femmodel->parameters->FindParam(&time_adapt,TimeAdaptEnum);
 
         /*initialize: */
@@ -43 +45 @@
         
                 /*Increment*/
+                if(time_adapt) TimeAdaptx(&dt,femmodel->elements, femmodel->nodes,femmodel->vertices,femmodel->loads, femmodel->materials, femmodel->parameters); 
                 time+=dt;
                 step+=1;
 
-                _printf_("%s%g%s%i%s%g\n","time [yr]: ",time,"    iteration number: ",step,"/",floor(finaltime/dt));
+                _printf_("%s%g%s%i%s%g%s%g\n","time [yr]: ",time/yts,"    iteration number: ",step,"/",floor(finaltime/dt)," dt [yr]: ",dt/yts);
 
                 if(verbose)_printf_("%s\n","computing new velocity");

issm/trunk/src/c/solutions/transient3d_core.cpp

@@ -20 +20 @@
         double dt,yts;
         bool control_analysis;
+        bool   time_adapt=false;
         int    solution_type;
         int    output_frequency;
@@ -35 +36 @@
         femmodel->parameters->FindParam(&solution_type,SolutionTypeEnum);
         femmodel->parameters->FindParam(&output_frequency,OutputFrequencyEnum);
+        femmodel->parameters->FindParam(&time_adapt,TimeAdaptEnum);
 
         /*initialize: */
@@ -43 +45 @@
 
                 /*Increment*/
+                if(time_adapt) TimeAdaptx(&dt,femmodel->elements, femmodel->nodes,femmodel->vertices,femmodel->loads, femmodel->materials, femmodel->parameters); 
                 step+=1;
                 time+=dt;
 
-                if(verbose)_printf_("%s%g%s%i%s%g\n","time [yr]: ",time,"    iteration number: ",step,"/",floor(finaltime/dt));
+                _printf_("%s%g%s%i%s%g%s%g\n","time [yr]: ",time/yts,"    iteration number: ",step,"/",floor(finaltime/dt)," dt [yr]: ",dt/yts);
 
                 if(verbose)_printf_("computing temperatures:\n");

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

@@ -183 +183 @@
         md.dt=0;
         md.ndt=0;
+        md.time_adapt=0;
+        md.cfl_coefficient=1/2;
+        md.adaptative_cfl=0;
         md.artificial_diffusivity=0;
         md.prognostic_DG=0;

issm/trunk/src/m/classes/@model/setdefaultparameters.m

@@ -127 +127 @@
 md.ndt=10*md.dt;
 
+%time adaptation? 
+md.time_adapt=0;
+md.cfl_coefficient=1/2;
+
 %the artificial diffusivity is used in prognostic to avoid
 %numerical wiggles of the solution.

issm/trunk/src/m/classes/clusters/pfe.m

@@ -187 +187 @@
                         if ~cluster.interactive,
                                 packages={[md.name '.outlog'],[md.name '.errlog']};
+                        else
+                                packages={};
                         end
                         if md.qmu_analysis,

issm/trunk/src/m/enum/AbsoluteEnum.m

@@ -9 +9 @@
 %      macro=AbsoluteEnum()
 
-macro=243;
+macro=245;

issm/trunk/src/m/enum/AdjointEnum.m

@@ -9 +9 @@
 %      macro=AdjointEnum()
 
-macro=258;
+macro=260;

issm/trunk/src/m/enum/BetaEnum.m

@@ -9 +9 @@
 %      macro=BetaEnum()
 
-macro=253;
+macro=255;

issm/trunk/src/m/enum/BoolExternalResultEnum.m

@@ -9 +9 @@
 %      macro=BoolExternalResultEnum()
 
-macro=217;
+macro=219;

issm/trunk/src/m/enum/CmGradientEnum.m

@@ -9 +9 @@
 %      macro=CmGradientEnum()
 
-macro=254;
+macro=256;

issm/trunk/src/m/enum/CmJumpEnum.m

@@ -9 +9 @@
 %      macro=CmJumpEnum()
 
-macro=255;
+macro=257;

issm/trunk/src/m/enum/CmMaxEnum.m

@@ -9 +9 @@
 %      macro=CmMaxEnum()
 
-macro=256;
+macro=258;

issm/trunk/src/m/enum/CmMinEnum.m

@@ -9 +9 @@
 %      macro=CmMinEnum()
 
-macro=257;
+macro=259;

issm/trunk/src/m/enum/ColinearEnum.m

@@ -9 +9 @@
 %      macro=ColinearEnum()
 
-macro=251;
+macro=253;

issm/trunk/src/m/enum/ConnectivityEnum.m

@@ -9 +9 @@
 %      macro=ConnectivityEnum()
 
-macro=261;
+macro=263;

issm/trunk/src/m/enum/ControlParameterEnum.m

@@ -9 +9 @@
 %      macro=ControlParameterEnum()
 
-macro=262;
+macro=264;

issm/trunk/src/m/enum/ControlSteadyEnum.m

@@ -9 +9 @@
 %      macro=ControlSteadyEnum()
 
-macro=263;
+macro=265;

issm/trunk/src/m/enum/DakotaParameterEnum.m

@@ -9 +9 @@
 %      macro=DakotaParameterEnum()
 
-macro=264;
+macro=266;

issm/trunk/src/m/enum/DimEnum.m

@@ -9 +9 @@
 %      macro=DimEnum()
 
-macro=265;
+macro=267;

issm/trunk/src/m/enum/DoubleElementResultEnum.m

@@ -9 +9 @@
 %      macro=DoubleElementResultEnum()
 
-macro=214;
+macro=216;

issm/trunk/src/m/enum/DoubleExternalResultEnum.m

@@ -9 +9 @@
 %      macro=DoubleExternalResultEnum()
 
-macro=218;
+macro=220;

issm/trunk/src/m/enum/DoubleMatExternalResultEnum.m

@@ -9 +9 @@
 %      macro=DoubleMatExternalResultEnum()
 
-macro=220;
+macro=222;

issm/trunk/src/m/enum/DoubleVecExternalResultEnum.m

@@ -9 +9 @@
 %      macro=DoubleVecExternalResultEnum()
 
-macro=219;
+macro=221;

issm/trunk/src/m/enum/ElementOnBedEnum.m

@@ -9 +9 @@
 %      macro=ElementOnBedEnum()
 
-macro=137;
+macro=139;

issm/trunk/src/m/enum/ElementOnIceShelfEnum.m

@@ -9 +9 @@
 %      macro=ElementOnIceShelfEnum()
 
-macro=138;
+macro=140;

issm/trunk/src/m/enum/ElementOnSurfaceEnum.m

@@ -9 +9 @@
 %      macro=ElementOnSurfaceEnum()
 
-macro=139;
+macro=141;

issm/trunk/src/m/enum/ElementOnWaterEnum.m

@@ -9 +9 @@
 %      macro=ElementOnWaterEnum()
 
-macro=140;
+macro=142;

issm/trunk/src/m/enum/EnumToString.m

@@ -148 +148 @@
 case DragTypeEnum(), string='DragType'; return
 case DtEnum(), string='Dt'; return
+case TimeAdaptEnum(), string='TimeAdapt'; return
+case CflCoefficientEnum(), string='CflCoefficient'; return
 case ElementOnBedEnum(), string='ElementOnBed'; return
 case ElementOnIceShelfEnum(), string='ElementOnIceShelf'; return

issm/trunk/src/m/enum/EpsAbsEnum.m

@@ -9 +9 @@
 %      macro=EpsAbsEnum()
 
-macro=266;
+macro=268;

issm/trunk/src/m/enum/EpsCmEnum.m

@@ -9 +9 @@
 %      macro=EpsCmEnum()
 
-macro=267;
+macro=269;

issm/trunk/src/m/enum/EpsRelEnum.m

@@ -9 +9 @@
 %      macro=EpsRelEnum()
 
-macro=268;
+macro=270;

issm/trunk/src/m/enum/EpsResEnum.m

@@ -9 +9 @@
 %      macro=EpsResEnum()
 
-macro=269;
+macro=271;

issm/trunk/src/m/enum/EpsVelEnum.m

@@ -9 +9 @@
 %      macro=EpsVelEnum()
 
-macro=141;
+macro=143;

issm/trunk/src/m/enum/ExtToIuEnum.m

@@ -9 +9 @@
 %      macro=ExtToIuEnum()
 
-macro=149;
+macro=151;

issm/trunk/src/m/enum/FillEnum.m

@@ -9 +9 @@
 %      macro=FillEnum()
 
-macro=142;
+macro=144;

issm/trunk/src/m/enum/FractionIncrementEnum.m

@@ -9 +9 @@
 %      macro=FractionIncrementEnum()
 
-macro=143;
+macro=145;

issm/trunk/src/m/enum/FrictionEnum.m

@@ -9 +9 @@
 %      macro=FrictionEnum()
 
-macro=144;
+macro=146;

issm/trunk/src/m/enum/FsetEnum.m

@@ -9 +9 @@
 %      macro=FsetEnum()
 
-macro=316;
+macro=318;

issm/trunk/src/m/enum/GeothermalFluxEnum.m

@@ -9 +9 @@
 %      macro=GeothermalFluxEnum()
 
-macro=145;
+macro=147;

issm/trunk/src/m/enum/GradientEnum.m

@@ -9 +9 @@
 %      macro=GradientEnum()
 
-macro=259;
+macro=261;

issm/trunk/src/m/enum/GravityEnum.m

@@ -9 +9 @@
 %      macro=GravityEnum()
 
-macro=246;
+macro=248;

issm/trunk/src/m/enum/GsetEnum.m

@@ -9 +9 @@
 %      macro=GsetEnum()
 
-macro=315;
+macro=317;

issm/trunk/src/m/enum/HeatCapacityEnum.m

@@ -9 +9 @@
 %      macro=HeatCapacityEnum()
 
-macro=270;
+macro=272;

issm/trunk/src/m/enum/IndexEnum.m

@@ -9 +9 @@
 %      macro=IndexEnum()
 
-macro=303;
+macro=305;

issm/trunk/src/m/enum/IndexedEnum.m

@@ -9 +9 @@
 %      macro=IndexedEnum()
 
-macro=301;
+macro=303;

issm/trunk/src/m/enum/IntExternalResultEnum.m

@@ -9 +9 @@
 %      macro=IntExternalResultEnum()
 
-macro=221;
+macro=223;

issm/trunk/src/m/enum/InternalEnum.m

@@ -9 +9 @@
 %      macro=InternalEnum()
 
-macro=146;
+macro=148;

issm/trunk/src/m/enum/IntersectEnum.m

@@ -9 +9 @@
 %      macro=IntersectEnum()
 
-macro=250;
+macro=252;

issm/trunk/src/m/enum/IsHutterEnum.m

@@ -9 +9 @@
 %      macro=IsHutterEnum()
 
-macro=271;
+macro=273;

issm/trunk/src/m/enum/IsMacAyealPattynEnum.m

@@ -9 +9 @@
 %      macro=IsMacAyealPattynEnum()
 
-macro=272;
+macro=274;

issm/trunk/src/m/enum/IsStokesEnum.m

@@ -9 +9 @@
 %      macro=IsStokesEnum()
 
-macro=273;
+macro=275;

issm/trunk/src/m/enum/IuToExtEnum.m

@@ -9 +9 @@
 %      macro=IuToExtEnum()
 
-macro=148;
+macro=150;

issm/trunk/src/m/enum/JEnum.m

@@ -9 +9 @@
 %      macro=JEnum()
 
-macro=224;
+macro=226;

issm/trunk/src/m/enum/KffEnum.m

@@ -9 +9 @@
 %      macro=KffEnum()
 
-macro=274;
+macro=276;

issm/trunk/src/m/enum/KflagEnum.m

@@ -9 +9 @@
 %      macro=KflagEnum()
 
-macro=147;
+macro=149;

issm/trunk/src/m/enum/LatentHeatEnum.m

@@ -9 +9 @@
 %      macro=LatentHeatEnum()
 
-macro=275;
+macro=277;

issm/trunk/src/m/enum/LowmemEnum.m

@@ -9 +9 @@
 %      macro=LowmemEnum()
 
-macro=276;
+macro=278;

issm/trunk/src/m/enum/MassFluxEnum.m

@@ -9 +9 @@
 %      macro=MassFluxEnum()
 
-macro=150;
+macro=152;

issm/trunk/src/m/enum/MaxAbsVxEnum.m

@@ -9 +9 @@
 %      macro=MaxAbsVxEnum()
 
-macro=234;
+macro=236;

issm/trunk/src/m/enum/MaxAbsVyEnum.m

@@ -9 +9 @@
 %      macro=MaxAbsVyEnum()
 
-macro=237;
+macro=239;

issm/trunk/src/m/enum/MaxAbsVzEnum.m

@@ -9 +9 @@
 %      macro=MaxAbsVzEnum()
 
-macro=240;
+macro=242;

issm/trunk/src/m/enum/MaxIterEnum.m

@@ -9 +9 @@
 %      macro=MaxIterEnum()
 
-macro=277;
+macro=279;

issm/trunk/src/m/enum/MaxNonlinearIterationsEnum.m

@@ -9 +9 @@
 %      macro=MaxNonlinearIterationsEnum()
 
-macro=278;
+macro=280;

issm/trunk/src/m/enum/MaxPenetrationEnum.m

@@ -9 +9 @@
 %      macro=MaxPenetrationEnum()
 
-macro=157;
+macro=159;

issm/trunk/src/m/enum/MaxVelEnum.m

@@ -9 +9 @@
 %      macro=MaxVelEnum()
 
-macro=231;
+macro=233;

issm/trunk/src/m/enum/MaxVxEnum.m

@@ -9 +9 @@
 %      macro=MaxVxEnum()
 
-macro=233;
+macro=235;

issm/trunk/src/m/enum/MaxVyEnum.m

@@ -9 +9 @@
 %      macro=MaxVyEnum()
 
-macro=236;
+macro=238;

issm/trunk/src/m/enum/MaxVzEnum.m

@@ -9 +9 @@
 %      macro=MaxVzEnum()
 
-macro=239;
+macro=241;

issm/trunk/src/m/enum/MeanVelEnum.m

@@ -9 +9 @@
 %      macro=MeanVelEnum()
 
-macro=158;
+macro=160;

issm/trunk/src/m/enum/MeltingOffsetEnum.m

@@ -9 +9 @@
 %      macro=MeltingOffsetEnum()
 
-macro=159;
+macro=161;

issm/trunk/src/m/enum/MeltingPointEnum.m

@@ -9 +9 @@
 %      macro=MeltingPointEnum()
 
-macro=279;
+macro=281;

issm/trunk/src/m/enum/MeltingRateEnum.m

@@ -9 +9 @@
 %      macro=MeltingRateEnum()
 
-macro=160;
+macro=162;

issm/trunk/src/m/enum/MinMechanicalConstraintsEnum.m

@@ -9 +9 @@
 %      macro=MinMechanicalConstraintsEnum()
 
-macro=280;
+macro=282;

issm/trunk/src/m/enum/MinThermalConstraintsEnum.m

@@ -9 +9 @@
 %      macro=MinThermalConstraintsEnum()
 
-macro=281;
+macro=283;

issm/trunk/src/m/enum/MinVelEnum.m

@@ -9 +9 @@
 %      macro=MinVelEnum()
 
-macro=230;
+macro=232;

issm/trunk/src/m/enum/MinVxEnum.m

@@ -9 +9 @@
 %      macro=MinVxEnum()
 
-macro=232;
+macro=234;

issm/trunk/src/m/enum/MinVyEnum.m

@@ -9 +9 @@
 %      macro=MinVyEnum()
 
-macro=235;
+macro=237;

issm/trunk/src/m/enum/MinVzEnum.m

@@ -9 +9 @@
 %      macro=MinVzEnum()
 
-macro=238;
+macro=240;

issm/trunk/src/m/enum/MiniEnum.m

@@ -9 +9 @@
 %      macro=MiniEnum()
 
-macro=213;
+macro=215;

issm/trunk/src/m/enum/MisfitEnum.m

@@ -9 +9 @@
 %      macro=MisfitEnum()
 
-macro=161;
+macro=163;

issm/trunk/src/m/enum/MixedLayerCapacityEnum.m

@@ -9 +9 @@
 %      macro=MixedLayerCapacityEnum()
 
-macro=248;
+macro=250;

issm/trunk/src/m/enum/NStepsEnum.m

@@ -9 +9 @@
 %      macro=NStepsEnum()
 
-macro=282;
+macro=284;

issm/trunk/src/m/enum/NdtEnum.m

@@ -9 +9 @@
 %      macro=NdtEnum()
 
-macro=283;
+macro=285;

issm/trunk/src/m/enum/NodalEnum.m

@@ -9 +9 @@
 %      macro=NodalEnum()
 
-macro=305;
+macro=307;

issm/trunk/src/m/enum/NodeOnBedEnum.m

@@ -9 +9 @@
 %      macro=NodeOnBedEnum()
 
-macro=162;
+macro=164;

issm/trunk/src/m/enum/NodeOnIceSheetEnum.m

@@ -9 +9 @@
 %      macro=NodeOnIceSheetEnum()
 
-macro=163;
+macro=165;

issm/trunk/src/m/enum/NodeOnIceShelfEnum.m

@@ -9 +9 @@
 %      macro=NodeOnIceShelfEnum()
 
-macro=164;
+macro=166;

issm/trunk/src/m/enum/NodeOnSurfaceEnum.m

@@ -9 +9 @@
 %      macro=NodeOnSurfaceEnum()
 
-macro=165;
+macro=167;

issm/trunk/src/m/enum/NumOutputEnum.m

@@ -9 +9 @@
 %      macro=NumOutputEnum()
 
-macro=284;
+macro=286;

issm/trunk/src/m/enum/NumRiftsEnum.m

@@ -9 +9 @@
 %      macro=NumRiftsEnum()
 
-macro=285;
+macro=287;

issm/trunk/src/m/enum/NumberNodeToElementConnectivityEnum.m

@@ -9 +9 @@
 %      macro=NumberNodeToElementConnectivityEnum()
 
-macro=166;
+macro=168;

issm/trunk/src/m/enum/NumberOfElementsEnum.m

@@ -9 +9 @@
 %      macro=NumberOfElementsEnum()
 
-macro=286;
+macro=288;

issm/trunk/src/m/enum/NumberOfNodesEnum.m

@@ -9 +9 @@
 %      macro=NumberOfNodesEnum()
 
-macro=287;
+macro=289;

issm/trunk/src/m/enum/NumberOfVerticesEnum.m

@@ -9 +9 @@
 %      macro=NumberOfVerticesEnum()
 
-macro=288;
+macro=290;

issm/trunk/src/m/enum/OldGradientEnum.m

@@ -9 +9 @@
 %      macro=OldGradientEnum()
 
-macro=260;
+macro=262;

issm/trunk/src/m/enum/OptScalEnum.m

@@ -9 +9 @@
 %      macro=OptScalEnum()
 
-macro=289;
+macro=291;

issm/trunk/src/m/enum/OutputFilePointerEnum.m

@@ -9 +9 @@
 %      macro=OutputFilePointerEnum()
 
-macro=290;
+macro=292;

issm/trunk/src/m/enum/OutputFrequencyEnum.m

@@ -9 +9 @@
 %      macro=OutputFrequencyEnum()
 
-macro=229;
+macro=231;

issm/trunk/src/m/enum/P0Enum.m

@@ -9 +9 @@
 %      macro=P0Enum()
 
-macro=210;
+macro=212;

issm/trunk/src/m/enum/P1DGEnum.m

@@ -9 +9 @@
 %      macro=P1DGEnum()
 
-macro=212;
+macro=214;

issm/trunk/src/m/enum/P1Enum.m

@@ -9 +9 @@
 %      macro=P1Enum()
 
-macro=211;
+macro=213;

issm/trunk/src/m/enum/ParameterOutputEnum.m

@@ -9 +9 @@
 %      macro=ParameterOutputEnum()
 
-macro=291;
+macro=293;

issm/trunk/src/m/enum/PatchEnum.m

@@ -9 +9 @@
 %      macro=PatchEnum()
 
-macro=225;
+macro=227;

issm/trunk/src/m/enum/PatchNodesEnum.m

@@ -9 +9 @@
 %      macro=PatchNodesEnum()
 
-macro=227;
+macro=229;

issm/trunk/src/m/enum/PatchVerticesEnum.m

@@ -9 +9 @@
 %      macro=PatchVerticesEnum()
 
-macro=226;
+macro=228;

issm/trunk/src/m/enum/PenaltyMeltingEnum.m

@@ -9 +9 @@
 %      macro=PenaltyMeltingEnum()
 
-macro=292;
+macro=294;

issm/trunk/src/m/enum/PenaltyOffsetEnum.m

@@ -9 +9 @@
 %      macro=PenaltyOffsetEnum()
 
-macro=167;
+macro=169;

issm/trunk/src/m/enum/PentaVertexElementResultEnum.m

@@ -9 +9 @@
 %      macro=PentaVertexElementResultEnum()
 
-macro=216;
+macro=218;

issm/trunk/src/m/enum/PetscOptionsAnalysesEnum.m

@@ -9 +9 @@
 %      macro=PetscOptionsAnalysesEnum()
 
-macro=314;
+macro=316;

issm/trunk/src/m/enum/PetscOptionsStringsEnum.m

@@ -9 +9 @@
 %      macro=PetscOptionsStringsEnum()
 
-macro=313;
+macro=315;

issm/trunk/src/m/enum/PetscRcEnum.m

@@ -9 +9 @@
 %      macro=PetscRcEnum()
 
-macro=307;
+macro=309;

issm/trunk/src/m/enum/PetscVecExternalResultEnum.m

@@ -9 +9 @@
 %      macro=PetscVecExternalResultEnum()
 
-macro=222;
+macro=224;

issm/trunk/src/m/enum/PflagEnum.m

@@ -9 +9 @@
 %      macro=PflagEnum()
 
-macro=168;
+macro=170;

issm/trunk/src/m/enum/PressureEnum.m

@@ -9 +9 @@
 %      macro=PressureEnum()
 
-macro=169;
+macro=171;

issm/trunk/src/m/enum/PressureOldEnum.m

@@ -9 +9 @@
 %      macro=PressureOldEnum()
 
-macro=170;
+macro=172;

issm/trunk/src/m/enum/QmuAnalysisEnum.m

@@ -9 +9 @@
 %      macro=QmuAnalysisEnum()
 
-macro=293;
+macro=295;

issm/trunk/src/m/enum/QmuErrNameEnum.m

@@ -9 +9 @@
 %      macro=QmuErrNameEnum()
 
-macro=294;
+macro=296;

issm/trunk/src/m/enum/QmuInNameEnum.m

@@ -9 +9 @@
 %      macro=QmuInNameEnum()
 
-macro=295;
+macro=297;

issm/trunk/src/m/enum/QmuMassFluxSegmentsEnum.m

@@ -9 +9 @@
 %      macro=QmuMassFluxSegmentsEnum()
 
-macro=296;
+macro=298;

issm/trunk/src/m/enum/QmuNPartEnum.m

@@ -9 +9 @@
 %      macro=QmuNPartEnum()
 
-macro=297;
+macro=299;

issm/trunk/src/m/enum/QmuNumberOfResponsesEnum.m

@@ -9 +9 @@
 %      macro=QmuNumberOfResponsesEnum()
 
-macro=300;
+macro=302;

issm/trunk/src/m/enum/QmuOutNameEnum.m

@@ -9 +9 @@
 %      macro=QmuOutNameEnum()
 
-macro=298;
+macro=300;

issm/trunk/src/m/enum/QmuPartEnum.m

@@ -9 +9 @@
 %      macro=QmuPartEnum()
 
-macro=299;
+macro=301;

issm/trunk/src/m/enum/QmuPressureEnum.m

@@ -9 +9 @@
 %      macro=QmuPressureEnum()
 
-macro=171;
+macro=173;

issm/trunk/src/m/enum/QmuVxEnum.m

@@ -9 +9 @@
 %      macro=QmuVxEnum()
 
-macro=196;
+macro=198;

issm/trunk/src/m/enum/QmuVyEnum.m

@@ -9 +9 @@
 %      macro=QmuVyEnum()
 
-macro=201;
+macro=203;

issm/trunk/src/m/enum/QmuVzEnum.m

@@ -9 +9 @@
 %      macro=QmuVzEnum()
 
-macro=208;
+macro=210;

issm/trunk/src/m/enum/RegularEnum.m

@@ -9 +9 @@
 %      macro=RegularEnum()
 
-macro=302;
+macro=304;

issm/trunk/src/m/enum/RelativeEnum.m

@@ -9 +9 @@
 %      macro=RelativeEnum()
 
-macro=241;
+macro=243;

issm/trunk/src/m/enum/ResetPenaltiesEnum.m

@@ -9 +9 @@
 %      macro=ResetPenaltiesEnum()
 
-macro=172;
+macro=174;

issm/trunk/src/m/enum/ResidualEnum.m

@@ -9 +9 @@
 %      macro=ResidualEnum()
 
-macro=242;
+macro=244;

issm/trunk/src/m/enum/ResponseDescriptorsEnum.m

@@ -9 +9 @@
 %      macro=ResponseDescriptorsEnum()
 
-macro=306;
+macro=308;

issm/trunk/src/m/enum/RheologyBEnum.m

@@ -9 +9 @@
 %      macro=RheologyBEnum()
 
-macro=173;
+macro=175;

issm/trunk/src/m/enum/RheologyBbarEnum.m

@@ -9 +9 @@
 %      macro=RheologyBbarEnum()
 
-macro=174;
+macro=176;

issm/trunk/src/m/enum/RheologyNEnum.m

@@ -9 +9 @@
 %      macro=RheologyNEnum()
 
-macro=175;
+macro=177;

issm/trunk/src/m/enum/RhoIceEnum.m

@@ -9 +9 @@
 %      macro=RhoIceEnum()
 
-macro=244;
+macro=246;

issm/trunk/src/m/enum/RhoWaterEnum.m

@@ -9 +9 @@
 %      macro=RhoWaterEnum()
 
-macro=245;
+macro=247;

issm/trunk/src/m/enum/ScaledEnum.m

@@ -9 +9 @@
 %      macro=ScaledEnum()
 
-macro=304;
+macro=306;

issm/trunk/src/m/enum/SegmentOnIceShelfEnum.m

@@ -9 +9 @@
 %      macro=SegmentOnIceShelfEnum()
 
-macro=176;
+macro=178;

issm/trunk/src/m/enum/SeparateEnum.m

@@ -9 +9 @@
 %      macro=SeparateEnum()
 
-macro=252;
+macro=254;

issm/trunk/src/m/enum/SparsityEnum.m

@@ -9 +9 @@
 %      macro=SparsityEnum()
 
-macro=308;
+macro=310;

issm/trunk/src/m/enum/SsetEnum.m

@@ -9 +9 @@
 %      macro=SsetEnum()
 
-macro=317;
+macro=319;

issm/trunk/src/m/enum/StabilizeConstraintsEnum.m

@@ -9 +9 @@
 %      macro=StabilizeConstraintsEnum()
 
-macro=177;
+macro=179;

issm/trunk/src/m/enum/StokesReconditioningEnum.m

@@ -9 +9 @@
 %      macro=StokesReconditioningEnum()
 
-macro=178;
+macro=180;

issm/trunk/src/m/enum/StringExternalResultEnum.m

@@ -9 +9 @@
 %      macro=StringExternalResultEnum()
 
-macro=223;
+macro=225;

issm/trunk/src/m/enum/StringToEnum.m

@@ -146 +146 @@
                         elseif (strcmpi(name,'DragType')), enum=DragTypeEnum(); return
                         elseif (strcmpi(name,'Dt')), enum=DtEnum(); return
+                        elseif (strcmpi(name,'TimeAdapt')), enum=TimeAdaptEnum(); return
+                        elseif (strcmpi(name,'CflCoefficient')), enum=CflCoefficientEnum(); return
                         elseif (strcmpi(name,'ElementOnBed')), enum=ElementOnBedEnum(); return
                         elseif (strcmpi(name,'ElementOnIceShelf')), enum=ElementOnIceShelfEnum(); return

issm/trunk/src/m/enum/SurfaceAbsVelMisfitEnum.m

@@ -9 +9 @@
 %      macro=SurfaceAbsVelMisfitEnum()
 
-macro=152;
+macro=154;

issm/trunk/src/m/enum/SurfaceAreaEnum.m

@@ -9 +9 @@
 %      macro=SurfaceAreaEnum()
 
-macro=179;
+macro=181;

issm/trunk/src/m/enum/SurfaceAverageVelMisfitEnum.m

@@ -9 +9 @@
 %      macro=SurfaceAverageVelMisfitEnum()
 
-macro=156;
+macro=158;

issm/trunk/src/m/enum/SurfaceEnum.m

@@ -9 +9 @@
 %      macro=SurfaceEnum()
 
-macro=180;
+macro=182;

issm/trunk/src/m/enum/SurfaceLogVelMisfitEnum.m

@@ -9 +9 @@
 %      macro=SurfaceLogVelMisfitEnum()
 
-macro=154;
+macro=156;

issm/trunk/src/m/enum/SurfaceLogVxVyMisfitEnum.m

@@ -9 +9 @@
 %      macro=SurfaceLogVxVyMisfitEnum()
 
-macro=155;
+macro=157;

issm/trunk/src/m/enum/SurfaceRelVelMisfitEnum.m

@@ -9 +9 @@
 %      macro=SurfaceRelVelMisfitEnum()
 
-macro=153;
+macro=155;

issm/trunk/src/m/enum/SurfaceSlopeXEnum.m

@@ -9 +9 @@
 %      macro=SurfaceSlopeXEnum()
 
-macro=181;
+macro=183;

issm/trunk/src/m/enum/SurfaceSlopeYEnum.m

@@ -9 +9 @@
 %      macro=SurfaceSlopeYEnum()
 
-macro=182;
+macro=184;

issm/trunk/src/m/enum/TemperatureEnum.m

@@ -9 +9 @@
 %      macro=TemperatureEnum()
 
-macro=183;
+macro=185;

issm/trunk/src/m/enum/TemperatureOldEnum.m

@@ -9 +9 @@
 %      macro=TemperatureOldEnum()
 
-macro=185;
+macro=187;

issm/trunk/src/m/enum/TemporaryTemperatureEnum.m

@@ -9 +9 @@
 %      macro=TemporaryTemperatureEnum()
 
-macro=184;
+macro=186;

issm/trunk/src/m/enum/ThermalConductivityEnum.m

@@ -9 +9 @@
 %      macro=ThermalConductivityEnum()
 
-macro=247;
+macro=249;

issm/trunk/src/m/enum/ThermalExchangeVelocityEnum.m

@@ -9 +9 @@
 %      macro=ThermalExchangeVelocityEnum()
 
-macro=249;
+macro=251;

issm/trunk/src/m/enum/ThicknessAbsMisfitEnum.m

@@ -9 +9 @@
 %      macro=ThicknessAbsMisfitEnum()
 
-macro=151;
+macro=153;

issm/trunk/src/m/enum/ThicknessEnum.m

@@ -9 +9 @@
 %      macro=ThicknessEnum()
 
-macro=186;
+macro=188;

issm/trunk/src/m/enum/ThicknessObsEnum.m

@@ -9 +9 @@
 %      macro=ThicknessObsEnum()
 
-macro=187;
+macro=189;

issm/trunk/src/m/enum/TimeEnum.m

@@ -9 +9 @@
 %      macro=TimeEnum()
 
-macro=228;
+macro=230;

issm/trunk/src/m/enum/TolXEnum.m

@@ -9 +9 @@
 %      macro=TolXEnum()
 
-macro=309;
+macro=311;

issm/trunk/src/m/enum/TriaVertexElementResultEnum.m

@@ -9 +9 @@
 %      macro=TriaVertexElementResultEnum()
 
-macro=215;
+macro=217;

issm/trunk/src/m/enum/TypeEnum.m

@@ -9 +9 @@
 %      macro=TypeEnum()
 
-macro=188;
+macro=190;

issm/trunk/src/m/enum/VariableDescriptorsEnum.m

@@ -9 +9 @@
 %      macro=VariableDescriptorsEnum()
 
-macro=310;
+macro=312;

issm/trunk/src/m/enum/VelEnum.m

@@ -9 +9 @@
 %      macro=VelEnum()
 
-macro=189;
+macro=191;

issm/trunk/src/m/enum/VelObsEnum.m

@@ -9 +9 @@
 %      macro=VelObsEnum()
 
-macro=190;
+macro=192;

issm/trunk/src/m/enum/VerboseEnum.m

@@ -9 +9 @@
 %      macro=VerboseEnum()
 
-macro=311;
+macro=313;

issm/trunk/src/m/enum/ViscosityOvershootEnum.m

@@ -9 +9 @@
 %      macro=ViscosityOvershootEnum()
 
-macro=191;
+macro=193;

issm/trunk/src/m/enum/VxAverageEnum.m

@@ -9 +9 @@
 %      macro=VxAverageEnum()
 
-macro=192;
+macro=194;

issm/trunk/src/m/enum/VxEnum.m

@@ -9 +9 @@
 %      macro=VxEnum()
 
-macro=193;
+macro=195;

issm/trunk/src/m/enum/VxObsEnum.m

@@ -9 +9 @@
 %      macro=VxObsEnum()
 
-macro=194;
+macro=196;

issm/trunk/src/m/enum/VxOldEnum.m

@@ -9 +9 @@
 %      macro=VxOldEnum()
 
-macro=195;
+macro=197;

issm/trunk/src/m/enum/VyAverageEnum.m

@@ -9 +9 @@
 %      macro=VyAverageEnum()
 
-macro=197;
+macro=199;

issm/trunk/src/m/enum/VyEnum.m

@@ -9 +9 @@
 %      macro=VyEnum()
 
-macro=198;
+macro=200;

issm/trunk/src/m/enum/VyObsEnum.m

@@ -9 +9 @@
 %      macro=VyObsEnum()
 
-macro=199;
+macro=201;

issm/trunk/src/m/enum/VyOldEnum.m

@@ -9 +9 @@
 %      macro=VyOldEnum()
 
-macro=200;
+macro=202;

issm/trunk/src/m/enum/VzAverageEnum.m

@@ -9 +9 @@
 %      macro=VzAverageEnum()
 
-macro=202;
+macro=204;

issm/trunk/src/m/enum/VzEnum.m

@@ -9 +9 @@
 %      macro=VzEnum()
 
-macro=203;
+macro=205;

issm/trunk/src/m/enum/VzObsEnum.m

@@ -9 +9 @@
 %      macro=VzObsEnum()
 
-macro=204;
+macro=206;

issm/trunk/src/m/enum/VzOldEnum.m

@@ -9 +9 @@
 %      macro=VzOldEnum()
 
-macro=205;
+macro=207;

issm/trunk/src/m/enum/VzPattynEnum.m

@@ -9 +9 @@
 %      macro=VzPattynEnum()
 
-macro=206;
+macro=208;

issm/trunk/src/m/enum/VzStokesEnum.m

@@ -9 +9 @@
 %      macro=VzStokesEnum()
 
-macro=207;
+macro=209;

issm/trunk/src/m/enum/WaitOnLockEnum.m

@@ -9 +9 @@
 %      macro=WaitOnLockEnum()
 
-macro=312;
+macro=314;

issm/trunk/src/m/enum/WeightsEnum.m

@@ -9 +9 @@
 %      macro=WeightsEnum()
 
-macro=209;
+macro=211;

issm/trunk/src/m/enum/YtsEnum.m

@@ -9 +9 @@
 %      macro=YtsEnum()
 
-macro=318;
+macro=320;

issm/trunk/src/m/model/display/displaytransient.m

@@ -27 +27 @@
 fielddisplay(md,'timeacc','multiplier to time step when time stepping increases time step');
 fielddisplay(md,'timedec','multiplier to time step when time stepping decresaes time step');
+fielddisplay(md,'time_adapt','compute new time step each iteration, using CFL criterion');
+fielddisplay(md,'cfl_coefficient','CFL coefficient');

issm/trunk/src/m/model/loadresultsfromcluster.m

@@ -16 +16 @@
 
 %read log files onto  fields
-md.errlog=char(textread([md.name '.errlog'],'%s','delimiter','\n'));
-md.outlog=char(textread([md.name '.outlog'],'%s','delimiter','\n'));
+if exist([md.name '.errlog'],'file'),
+        md.errlog=char(textread([md.name '.errlog'],'%s','delimiter','\n'));
+else
+        md.errlog='';
+end
+
+if exist([md.name '.outlog'],'file'),
+        md.outlog=char(textread([md.name '.outlog'],'%s','delimiter','\n'));
+else
+        md.outlog='';
+end
+
 if ~isempty(md.errlog),
         disp(['loadresultsfromcluster info message: error during solution. Check your errlog and outlog model fields']);

issm/trunk/src/m/model/marshall.m

@@ -127 +127 @@
 WriteData(fid,md.dt,'Scalar','dt');
 WriteData(fid,md.ndt,'Scalar','ndt');
+WriteData(fid,md.time_adapt,'Integer','time_adapt');
+WriteData(fid,md.cfl_coefficient,'Scalar','cfl_coefficient');
 WriteData(fid,md.penalty_offset,'Scalar','penalty_offset');
 WriteData(fid,md.penalty_melting,'Scalar','penalty_melting');

issm/trunk/src/m/model/tres.m

@@ -52 +52 @@
 elseif strcmpi(string,'dakota'),
         md.dakotaresults=md.results.dakota;
+
+elseif strcmpi(string,'transient'),
+        results=md.results.Transient2DSolution;
+        results2.Vel=NaN;
+        count=1;
+        for i=1:length(results),
+                if ~isempty(md.results.Transient2DSolution(i).Vel),
+                        results2(count).Vel=PatchToVec(md.results.Transient2DSolution(i).Vel);
+                        results2(count).Thickness=PatchToVec(md.results.Transient2DSolution(i).Thickness);
+                        results2(count).time=md.results.Transient2DSolution(i).time;
+                        results2(count).step=md.results.Transient2DSolution(i).step;
+                        count=count+1;
+                end
+        end
+        md.results.Transient2DSolution=results2;
+        clear results,results2;
 elseif strcmpi(string,'steadystate'),
         md.vx=PatchToVec(md.results.SteadystateSolution.Vx);

issm/trunk/src/m/solutions/transient2d_core.m

@@ -13 +13 @@
         solution_type=femmodel.parameters.SolutionType;
         output_frequency=femmodel.parameters.OutputFrequency;
+        time_adapt=femmodel.parameters.time_adapt;
 
         %Initialize
@@ -22 +23 @@
 
                 %increment
+                if(time_adapt)dt=TimeAdapt(femmodel.elements,femmodel.nodes,femmodel.vertices,femmodel.loads,femmodel.materials,femmodel.parameters);
                 step=step+1;
                 time=time+dt;

issm/trunk/src/m/solutions/transient3d_core.m

@@ -13 +13 @@
         solution_type=femmodel.parameters.SolutionType;
         output_frequency=femmodel.parameters.OutputFrequency;
+        time_adapt=femmodel.parameters.time_adapt;
 
         %Initialize
@@ -22 +23 @@
 
                 %Increment
+                if(time_adapt)dt=TimeAdapt(femmodel.elements,femmodel.nodes,femmodel.vertices,femmodel.loads,femmodel.materials,femmodel.parameters);
                 step=step+1;
                 time=time+dt;

issm/trunk/src/m/utils/Model/loadmodel.m

@@ -27 +27 @@
 
 try,
+        %recover model and name it md
         struc=load(path,'-mat');
-
-        %get name of model variable
         fieldname=char(fieldnames(struc));
         md=eval(['struc.' fieldname]);
+        
+        %now, transform md into a new model
         if ~strcmpi(class(md),'model'),
                 md2=model;

issm/trunk/src/mex/Makefile.am

@@ -61 +61 @@
                                 SystemMatrices\
                                 Test\
+                                TimeAdapt\
                                 TriaSearch\
                                 TriMesh\
@@ -265 +266 @@
                                                                  SurfaceArea/SurfaceArea.h
 
+TimeAdapt_SOURCES = TimeAdapt/TimeAdapt.cpp\
+                          TimeAdapt/TimeAdapt.h
+
 TriaSearch_SOURCES = TriaSearch/TriaSearch.cpp\
                           TriaSearch/TriaSearch.h