Changeset 15189

Timestamp:

06/04/13 18:23:11 (12 years ago)

Author:

bdef

Message:

CHG:adding an enum for the active EPL mask

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

@@ -99 +99 @@
         HydrologydcWaterCompressibilityEnum,
         HydrologydcSpceplHeadEnum,
+        HydrologydcMaskEplactiveEnum,
         HydrologydcEplCompressibilityEnum,
         HydrologydcEplPorosityEnum,

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

@@ -107 +107 @@
                 case HydrologydcWaterCompressibilityEnum : return "HydrologydcWaterCompressibility";
                 case HydrologydcSpceplHeadEnum : return "HydrologydcSpceplHead";
+                case HydrologydcMaskEplactiveEnum : return "HydrologydcMaskEplactive";
                 case HydrologydcEplCompressibilityEnum : return "HydrologydcEplCompressibility";
                 case HydrologydcEplPorosityEnum : return "HydrologydcEplPorosity";

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

@@ -107 +107 @@
               else if (strcmp(name,"HydrologydcWaterCompressibility")==0) return HydrologydcWaterCompressibilityEnum;
               else if (strcmp(name,"HydrologydcSpceplHead")==0) return HydrologydcSpceplHeadEnum;
+              else if (strcmp(name,"HydrologydcMaskEplactive")==0) return HydrologydcMaskEplactiveEnum;
               else if (strcmp(name,"HydrologydcEplCompressibility")==0) return HydrologydcEplCompressibilityEnum;
               else if (strcmp(name,"HydrologydcEplPorosity")==0) return HydrologydcEplPorosityEnum;
@@ -136 +137 @@
               else if (strcmp(name,"InversionMaxiterPerStep")==0) return InversionMaxiterPerStepEnum;
               else if (strcmp(name,"InversionMinParameters")==0) return InversionMinParametersEnum;
-              else if (strcmp(name,"InversionNsteps")==0) return InversionNstepsEnum;
          else stage=2;
    }
    if(stage==2){
-              if (strcmp(name,"InversionNumControlParameters")==0) return InversionNumControlParametersEnum;
+              if (strcmp(name,"InversionNsteps")==0) return InversionNstepsEnum;
+              else if (strcmp(name,"InversionNumControlParameters")==0) return InversionNumControlParametersEnum;
               else if (strcmp(name,"InversionNumCostFunctions")==0) return InversionNumCostFunctionsEnum;
               else if (strcmp(name,"InversionStepThreshold")==0) return InversionStepThresholdEnum;
@@ -259 +260 @@
               else if (strcmp(name,"Thickness")==0) return ThicknessEnum;
               else if (strcmp(name,"TimesteppingStartTime")==0) return TimesteppingStartTimeEnum;
-              else if (strcmp(name,"TimesteppingFinalTime")==0) return TimesteppingFinalTimeEnum;
          else stage=3;
    }
    if(stage==3){
-              if (strcmp(name,"TimesteppingCflCoefficient")==0) return TimesteppingCflCoefficientEnum;
+              if (strcmp(name,"TimesteppingFinalTime")==0) return TimesteppingFinalTimeEnum;
+              else if (strcmp(name,"TimesteppingCflCoefficient")==0) return TimesteppingCflCoefficientEnum;
               else if (strcmp(name,"TimesteppingTimeAdapt")==0) return TimesteppingTimeAdaptEnum;
               else if (strcmp(name,"TimesteppingTimeStep")==0) return TimesteppingTimeStepEnum;
@@ -382 +383 @@
               else if (strcmp(name,"SegmentRiftfront")==0) return SegmentRiftfrontEnum;
               else if (strcmp(name,"SpcDynamic")==0) return SpcDynamicEnum;
-              else if (strcmp(name,"SpcStatic")==0) return SpcStaticEnum;
          else stage=4;
    }
    if(stage==4){
-              if (strcmp(name,"SpcTransient")==0) return SpcTransientEnum;
+              if (strcmp(name,"SpcStatic")==0) return SpcStaticEnum;
+              else if (strcmp(name,"SpcTransient")==0) return SpcTransientEnum;
               else if (strcmp(name,"StokesIceFront")==0) return StokesIceFrontEnum;
               else if (strcmp(name,"StringArrayParam")==0) return StringArrayParamEnum;
@@ -505 +506 @@
               else if (strcmp(name,"PatchVertices")==0) return PatchVerticesEnum;
               else if (strcmp(name,"PentaP1ElementResult")==0) return PentaP1ElementResultEnum;
-              else if (strcmp(name,"StringExternalResult")==0) return StringExternalResultEnum;
          else stage=5;
    }
    if(stage==5){
-              if (strcmp(name,"Step")==0) return StepEnum;
+              if (strcmp(name,"StringExternalResult")==0) return StringExternalResultEnum;
+              else if (strcmp(name,"Step")==0) return StepEnum;
               else if (strcmp(name,"Time")==0) return TimeEnum;
               else if (strcmp(name,"TriaP1ElementResult")==0) return TriaP1ElementResultEnum;