Changeset 8934 for issm/trunk/src/c/EnumDefinitions/EnumDefinitions.h

Timestamp:

07/12/11 17:29:30 (14 years ago)

Author:

Mathieu Morlighem

Message:

ReAdded old enums

File:

• issm/trunk/src/c/EnumDefinitions/EnumDefinitions.h (modified) (11 diffs)

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

@@ -189 +189 @@
         ControlTypeEnum,
         ConvergedEnum,
+        DhDtEnum,  //TO BE DELETED 
         DragCoefficientEnum,
         DragPEnum,
@@ -200 +201 @@
         ElementOnSurfaceEnum,
         ElementOnWaterEnum,
+        EpsVelEnum,  //TO BE DELETED 
         FillEnum,
         FractionIncrementEnum,
         FrictionEnum,
+        GeothermalFluxEnum, //TO BE DELETED 
         HydrostaticAdjustmentEnum,
         InternalEnum,
@@ -216 +219 @@
         SurfaceAverageVelMisfitEnum,
         MaxPenetrationEnum,
+        MeanVelEnum, //TO BE DELETED 
         MeltingOffsetEnum,
         GroundingLineMeltingRateEnum,
@@ -238 +242 @@
         ShelfDampeningEnum,
         StabilizeConstraintsEnum,
+        StokesReconditioningEnum,  //TO BE DELETED
         SurfaceAccumulationRateEnum,
         SurfaceAblationRateEnum,
@@ -299 +304 @@
         TimeEnum,
         OutputFrequencyEnum,
+        WaterColumnEnum, //TO BE DELETED
         WaterColumnOldEnum,
         WaterColumnPicardEnum,
@@ -333 +339 @@
         RhoWaterEnum,
         GravityEnum,
+        ThermalConductivityEnum, //TO BE DELETED
         BasalMeltingRateCorrectionEnum,
         BasalMeltingRateCorrectionApplyEnum,
@@ -364 +371 @@
         EpsRelEnum,
         EpsResEnum,
+        HeatCapacityEnum,   //TO BE DELETED
+        IsHutterEnum, //TO BE DELETED
+        IsMacAyealPattynEnum, //TO BE DELETED
+        IsStokesEnum, //TO BE DELETED
+        KffEnum, //TO BE DELETED
+        LatentHeatEnum, //TO BE DELETED
         LowmemEnum,
+        MaxIterEnum, //TO BE DELETED
         MaxNonlinearIterationsEnum,
+        MeltingPointEnum, //TO BE DELETED
         MinMechanicalConstraintsEnum,
         MinThermalConstraintsEnum,
+        NStepsEnum, //TO BE DELETED
         NdtEnum,
         NumOutputEnum,
@@ -374 +390 @@
         NumberOfNodesEnum,
         NumberOfVerticesEnum,
+        OptScalEnum, //TO BE DELETED
         OutputFilePointerEnum,
+        OutputFileNameEnum, //TO BE DELETED
+        ParameterOutputEnum, //TO BE DELETED
         PenaltyMeltingEnum,
         QmuAnalysisEnum,
@@ -393 +412 @@
         PetscRcEnum,
         SparsityEnum,
+        TolXEnum, //TO BE DELETED
         VariableDescriptorsEnum,
         VerboseEnum,
+        WaitOnLockEnum, //TO BE DELETED
         PetscOptionsStringsEnum,
         PetscOptionsAnalysesEnum,
@@ -421 +442 @@
         ArrheniusEnum,
         /*}}}*/
-        /*Temporary{{{1*/
+        VxMeshEnum,
+        VyMeshEnum,
+        VzMeshEnum,
+        IsDiagnosticEnum, //TO BE DELETED
+        IsPrognosticEnum, //TO BE DELETED
+        IsThermalEnum, //TO BE DELETED
+        EnthalpySolutionEnum,
+        EnthalpyAnalysisEnum,
+        EnthalpyEnum,
+        EnthalpyPicardEnum,
+        WaterFractionEnum, //TO BE DELETED
+        ReferenceTemperatureEnum, //TO BE DELETED
+        ThicknessAbsGradientEnum,
+        VelAbsGradientEnum,
+        DatasetInputEnum,
+        NumResponsesEnum,
+        StepResponsesEnum,
+        IntMatParamEnum,
+        RheologyBbarAbsGradientEnum,
+        DragCoefficientAbsGradientEnum,
+        TransientInputEnum,
+        /*Temporary*/
         NumberOfElements2DEnum,
         NumControlTypeEnum,
@@ -499 +541 @@
         NumresponsedescriptorsEnum,
         NpartEnum,
-        QmuMassFluxNumProfilesEnum,
-        /*}}}*/
-        VxMeshEnum,
-        VyMeshEnum,
-        VzMeshEnum,
-        EnthalpySolutionEnum,
-        EnthalpyAnalysisEnum,
-        EnthalpyEnum,
-        EnthalpyPicardEnum,
-        ThicknessAbsGradientEnum,
-        VelAbsGradientEnum,
-        DatasetInputEnum,
-        NumResponsesEnum,
-        StepResponsesEnum,
-        IntMatParamEnum,
-        RheologyBbarAbsGradientEnum,
-        DragCoefficientAbsGradientEnum,
-        TransientInputEnum
+        QmuMassFluxNumProfilesEnum
 };