Changeset 16723

Timestamp:

11/12/13 17:20:17 (11 years ago)

Author:

bdef

Message:

NEW: Adding an enum to deal with initial thickness of the EPL

Location:

issm/trunk-jpl/src/c/shared/Enum

Files:

• EnumDefinitions.h (modified) (1 diff)
• EnumToStringx.cpp (modified) (1 diff)
• StringToEnumx.cpp (modified) (5 diffs)

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

@@ -113 +113 @@
         HydrologydcEplCompressibilityEnum,
         HydrologydcEplPorosityEnum,
+        HydrologydcEplInitialThicknessEnum,
         HydrologydcEplThicknessEnum,
         HydrologydcEplThicknessOldEnum,

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

@@ -121 +121 @@
                 case HydrologydcEplCompressibilityEnum : return "HydrologydcEplCompressibility";
                 case HydrologydcEplPorosityEnum : return "HydrologydcEplPorosity";
+                case HydrologydcEplInitialThicknessEnum : return "HydrologydcEplInitialThickness";
                 case HydrologydcEplThicknessEnum : return "HydrologydcEplThickness";
                 case HydrologydcEplThicknessOldEnum : return "HydrologydcEplThicknessOld";

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

@@ -121 +121 @@
               else if (strcmp(name,"HydrologydcEplCompressibility")==0) return HydrologydcEplCompressibilityEnum;
               else if (strcmp(name,"HydrologydcEplPorosity")==0) return HydrologydcEplPorosityEnum;
+              else if (strcmp(name,"HydrologydcEplInitialThickness")==0) return HydrologydcEplInitialThicknessEnum;
               else if (strcmp(name,"HydrologydcEplThickness")==0) return HydrologydcEplThicknessEnum;
               else if (strcmp(name,"HydrologydcEplThicknessOld")==0) return HydrologydcEplThicknessOldEnum;
@@ -136 +137 @@
               else if (strcmp(name,"HydrologySedimentKmax")==0) return HydrologySedimentKmaxEnum;
               else if (strcmp(name,"WaterTransfer")==0) return WaterTransferEnum;
-              else if (strcmp(name,"IndependentObject")==0) return IndependentObjectEnum;
          else stage=2;
    }
    if(stage==2){
-              if (strcmp(name,"InversionControlParameters")==0) return InversionControlParametersEnum;
+              if (strcmp(name,"IndependentObject")==0) return IndependentObjectEnum;
+              else if (strcmp(name,"InversionControlParameters")==0) return InversionControlParametersEnum;
               else if (strcmp(name,"InversionCostFunctionThreshold")==0) return InversionCostFunctionThresholdEnum;
               else if (strcmp(name,"InversionCostFunctionsCoefficients")==0) return InversionCostFunctionsCoefficientsEnum;
@@ -259 +260 @@
               else if (strcmp(name,"SteadystateNumRequestedOutputs")==0) return SteadystateNumRequestedOutputsEnum;
               else if (strcmp(name,"SteadystateReltol")==0) return SteadystateReltolEnum;
-              else if (strcmp(name,"SteadystateRequestedOutputs")==0) return SteadystateRequestedOutputsEnum;
          else stage=3;
    }
    if(stage==3){
-              if (strcmp(name,"Surface")==0) return SurfaceEnum;
+              if (strcmp(name,"SteadystateRequestedOutputs")==0) return SteadystateRequestedOutputsEnum;
+              else if (strcmp(name,"Surface")==0) return SurfaceEnum;
               else if (strcmp(name,"SurfaceforcingsPrecipitation")==0) return SurfaceforcingsPrecipitationEnum;
               else if (strcmp(name,"SurfaceforcingsMassBalance")==0) return SurfaceforcingsMassBalanceEnum;
@@ -382 +383 @@
               else if (strcmp(name,"DoubleMatParam")==0) return DoubleMatParamEnum;
               else if (strcmp(name,"DoubleParam")==0) return DoubleParamEnum;
-              else if (strcmp(name,"DoubleVecParam")==0) return DoubleVecParamEnum;
          else stage=4;
    }
    if(stage==4){
-              if (strcmp(name,"Element")==0) return ElementEnum;
+              if (strcmp(name,"DoubleVecParam")==0) return DoubleVecParamEnum;
+              else if (strcmp(name,"Element")==0) return ElementEnum;
               else if (strcmp(name,"ExternalResult")==0) return ExternalResultEnum;
               else if (strcmp(name,"FileParam")==0) return FileParamEnum;
@@ -505 +506 @@
               else if (strcmp(name,"Watercolumn")==0) return WatercolumnEnum;
               else if (strcmp(name,"BasalFriction")==0) return BasalFrictionEnum;
-              else if (strcmp(name,"ViscousHeating")==0) return ViscousHeatingEnum;
          else stage=5;
    }
    if(stage==5){
-              if (strcmp(name,"QmuTemperature")==0) return QmuTemperatureEnum;
+              if (strcmp(name,"ViscousHeating")==0) return ViscousHeatingEnum;
+              else if (strcmp(name,"QmuTemperature")==0) return QmuTemperatureEnum;
               else if (strcmp(name,"HydrologyWaterVx")==0) return HydrologyWaterVxEnum;
               else if (strcmp(name,"HydrologyWaterVy")==0) return HydrologyWaterVyEnum;