Changeset 23871

Timestamp:

04/19/19 08:16:15 (6 years ago)

Author:

Mathieu Morlighem

Message:

CHG: moving enums around

Location:

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

Files:

• EnumDefinitions.h (modified) (2 diffs)
• EnumToStringx.cpp (modified) (2 diffs)
• StringToEnumx.cpp (modified) (4 diffs)

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

@@ -283 +283 @@
         SealevelEustaticEnum,
         SealevelEustaticOceanMaskEnum,
-        SealevelEustaticMaskEnum,
         SealevelriseAbstolEnum,
         SealevelriseAngularVelocityEnum,
@@ -604 +603 @@
         RheologyBInitialguessEnum,
         SealevelEnum,
+        SealevelEustaticMaskEnum,
         SealevelriseCumDeltathicknessEnum,
         SealevelriseDeltathicknessEnum,

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

@@ -291 +291 @@
                 case SealevelEustaticEnum : return "SealevelEustatic";
                 case SealevelEustaticOceanMaskEnum : return "SealevelEustaticOceanMask";
-                case SealevelEustaticMaskEnum : return "SealevelEustaticMask";
                 case SealevelriseAbstolEnum : return "SealevelriseAbstol";
                 case SealevelriseAngularVelocityEnum : return "SealevelriseAngularVelocity";
@@ -610 +609 @@
                 case RheologyBInitialguessEnum : return "RheologyBInitialguess";
                 case SealevelEnum : return "Sealevel";
+                case SealevelEustaticMaskEnum : return "SealevelEustaticMask";
                 case SealevelriseCumDeltathicknessEnum : return "SealevelriseCumDeltathickness";
                 case SealevelriseDeltathicknessEnum : return "SealevelriseDeltathickness";

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

@@ -297 +297 @@
               else if (strcmp(name,"SealevelEustatic")==0) return SealevelEustaticEnum;
               else if (strcmp(name,"SealevelEustaticOceanMask")==0) return SealevelEustaticOceanMaskEnum;
-              else if (strcmp(name,"SealevelEustaticMask")==0) return SealevelEustaticMaskEnum;
               else if (strcmp(name,"SealevelriseAbstol")==0) return SealevelriseAbstolEnum;
               else if (strcmp(name,"SealevelriseAngularVelocity")==0) return SealevelriseAngularVelocityEnum;
@@ -383 +382 @@
               else if (strcmp(name,"SteadystateMaxiter")==0) return SteadystateMaxiterEnum;
               else if (strcmp(name,"SteadystateNumRequestedOutputs")==0) return SteadystateNumRequestedOutputsEnum;
+              else if (strcmp(name,"SteadystateReltol")==0) return SteadystateReltolEnum;
          else stage=4;
    }
    if(stage==4){
-              if (strcmp(name,"SteadystateReltol")==0) return SteadystateReltolEnum;
-              else if (strcmp(name,"SteadystateRequestedOutputs")==0) return SteadystateRequestedOutputsEnum;
+              if (strcmp(name,"SteadystateRequestedOutputs")==0) return SteadystateRequestedOutputsEnum;
               else if (strcmp(name,"Step")==0) return StepEnum;
               else if (strcmp(name,"StressbalanceAbstol")==0) return StressbalanceAbstolEnum;
@@ -506 +505 @@
               else if (strcmp(name,"DrivingStressY")==0) return DrivingStressYEnum;
               else if (strcmp(name,"EffectivePressureHydrostep")==0) return EffectivePressureHydrostepEnum;
+              else if (strcmp(name,"EffectivePressureStacked")==0) return EffectivePressureStackedEnum;
          else stage=5;
    }
    if(stage==5){
-              if (strcmp(name,"EffectivePressureStacked")==0) return EffectivePressureStackedEnum;
-              else if (strcmp(name,"EffectivePressure")==0) return EffectivePressureEnum;
+              if (strcmp(name,"EffectivePressure")==0) return EffectivePressureEnum;
               else if (strcmp(name,"Enthalpy")==0) return EnthalpyEnum;
               else if (strcmp(name,"EnthalpyPicard")==0) return EnthalpyPicardEnum;
@@ -622 +621 @@
               else if (strcmp(name,"RheologyBInitialguess")==0) return RheologyBInitialguessEnum;
               else if (strcmp(name,"Sealevel")==0) return SealevelEnum;
+              else if (strcmp(name,"SealevelEustaticMask")==0) return SealevelEustaticMaskEnum;
               else if (strcmp(name,"SealevelriseCumDeltathickness")==0) return SealevelriseCumDeltathicknessEnum;
               else if (strcmp(name,"SealevelriseDeltathickness")==0) return SealevelriseDeltathicknessEnum;