Changeset 22605

Timestamp:

03/22/18 09:53:58 (7 years ago)

Author:

Mathieu Morlighem

Message:

CHG: adding more enums

Location:

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

Files:

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

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

@@ -157 +157 @@
         InversionControlScalingFactorsEnum,
         InversionCostFunctionsEnum,
+        InversionCostFunctionThresholdEnum,
         InversionDxminEnum,
         InversionGatolEnum,
@@ -774 +775 @@
         IntParamEnum,
         IntVecParamEnum,
-        InversionCostFunctionThresholdEnum,
         InversionFatolEnum,
         InversionFrtolEnum,

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

@@ -165 +165 @@
                 case InversionControlScalingFactorsEnum : return "InversionControlScalingFactors";
                 case InversionCostFunctionsEnum : return "InversionCostFunctions";
+                case InversionCostFunctionThresholdEnum : return "InversionCostFunctionThreshold";
                 case InversionDxminEnum : return "InversionDxmin";
                 case InversionGatolEnum : return "InversionGatol";
@@ -778 +779 @@
                 case IntParamEnum : return "IntParam";
                 case IntVecParamEnum : return "IntVecParam";
-                case InversionCostFunctionThresholdEnum : return "InversionCostFunctionThreshold";
                 case InversionFatolEnum : return "InversionFatol";
                 case InversionFrtolEnum : return "InversionFrtol";

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

@@ -168 +168 @@
               else if (strcmp(name,"InversionControlScalingFactors")==0) return InversionControlScalingFactorsEnum;
               else if (strcmp(name,"InversionCostFunctions")==0) return InversionCostFunctionsEnum;
+              else if (strcmp(name,"InversionCostFunctionThreshold")==0) return InversionCostFunctionThresholdEnum;
               else if (strcmp(name,"InversionDxmin")==0) return InversionDxminEnum;
               else if (strcmp(name,"InversionGatol")==0) return InversionGatolEnum;
@@ -259 +260 @@
               else if (strcmp(name,"SmbAdThresh")==0) return SmbAdThreshEnum;
               else if (strcmp(name,"SmbAIce")==0) return SmbAIceEnum;
-              else if (strcmp(name,"SmbAIdx")==0) return SmbAIdxEnum;
          else stage=3;
    }
    if(stage==3){
-              if (strcmp(name,"SmbASnow")==0) return SmbASnowEnum;
+              if (strcmp(name,"SmbAIdx")==0) return SmbAIdxEnum;
+              else if (strcmp(name,"SmbASnow")==0) return SmbASnowEnum;
               else if (strcmp(name,"SmbCldFrac")==0) return SmbCldFracEnum;
               else if (strcmp(name,"SmbDelta18o")==0) return SmbDelta18oEnum;
@@ -382 +383 @@
               else if (strcmp(name,"CalvinglevermannMeltingrate")==0) return CalvinglevermannMeltingrateEnum;
               else if (strcmp(name,"CalvingMeltingrate")==0) return CalvingMeltingrateEnum;
-              else if (strcmp(name,"CalvingratexAverage")==0) return CalvingratexAverageEnum;
          else stage=4;
    }
    if(stage==4){
-              if (strcmp(name,"Calvingratex")==0) return CalvingratexEnum;
+              if (strcmp(name,"CalvingratexAverage")==0) return CalvingratexAverageEnum;
+              else if (strcmp(name,"Calvingratex")==0) return CalvingratexEnum;
               else if (strcmp(name,"CalvingrateyAverage")==0) return CalvingrateyAverageEnum;
               else if (strcmp(name,"Calvingratey")==0) return CalvingrateyEnum;
@@ -505 +506 @@
               else if (strcmp(name,"SmbBNeg")==0) return SmbBNegEnum;
               else if (strcmp(name,"SmbBPos")==0) return SmbBPosEnum;
-              else if (strcmp(name,"SmbC")==0) return SmbCEnum;
          else stage=5;
    }
    if(stage==5){
-              if (strcmp(name,"SmbD")==0) return SmbDEnum;
+              if (strcmp(name,"SmbC")==0) return SmbCEnum;
+              else if (strcmp(name,"SmbD")==0) return SmbDEnum;
               else if (strcmp(name,"SmbDini")==0) return SmbDiniEnum;
               else if (strcmp(name,"SmbDlwrf")==0) return SmbDlwrfEnum;
@@ -628 +629 @@
               else if (strcmp(name,"AmrBamg")==0) return AmrBamgEnum;
               else if (strcmp(name,"AmrNeopz")==0) return AmrNeopzEnum;
-              else if (strcmp(name,"AndroidFrictionCoefficient")==0) return AndroidFrictionCoefficientEnum;
          else stage=6;
    }
    if(stage==6){
-              if (strcmp(name,"Arrhenius")==0) return ArrheniusEnum;
+              if (strcmp(name,"AndroidFrictionCoefficient")==0) return AndroidFrictionCoefficientEnum;
+              else if (strcmp(name,"Arrhenius")==0) return ArrheniusEnum;
               else if (strcmp(name,"AutodiffJacobian")==0) return AutodiffJacobianEnum;
               else if (strcmp(name,"AutodiffKeep")==0) return AutodiffKeepEnum;
@@ -751 +752 @@
               else if (strcmp(name,"GroundedAreaScaled")==0) return GroundedAreaScaledEnum;
               else if (strcmp(name,"GroundingOnly")==0) return GroundingOnlyEnum;
-              else if (strcmp(name,"Gset")==0) return GsetEnum;
          else stage=7;
    }
    if(stage==7){
-              if (strcmp(name,"Gsl")==0) return GslEnum;
+              if (strcmp(name,"Gset")==0) return GsetEnum;
+              else if (strcmp(name,"Gsl")==0) return GslEnum;
               else if (strcmp(name,"HOApproximation")==0) return HOApproximationEnum;
               else if (strcmp(name,"HOFSApproximation")==0) return HOFSApproximationEnum;
@@ -796 +797 @@
               else if (strcmp(name,"IntParam")==0) return IntParamEnum;
               else if (strcmp(name,"IntVecParam")==0) return IntVecParamEnum;
-              else if (strcmp(name,"InversionCostFunctionThreshold")==0) return InversionCostFunctionThresholdEnum;
               else if (strcmp(name,"InversionFatol")==0) return InversionFatolEnum;
               else if (strcmp(name,"InversionFrtol")==0) return InversionFrtolEnum;