Changeset 22602

Timestamp:

03/21/18 21:42:00 (7 years ago)

Author:

Mathieu Morlighem

Message:

CHG: adding one more ENum to paramter list

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

@@ -87 +87 @@
         ConstantsReferencetemperatureEnum,
         ConstantsYtsEnum,
+        ControlSteadyEnum,
         DamageC1Enum,
         DamageC2Enum,
@@ -648 +649 @@
         ContoursEnum,
         ControlInputEnum,
-        ControlSteadyEnum,
         CrouzeixRaviartEnum,
         CuffeyEnum,

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

@@ -95 +95 @@
                 case ConstantsReferencetemperatureEnum : return "ConstantsReferencetemperature";
                 case ConstantsYtsEnum : return "ConstantsYts";
+                case ControlSteadyEnum : return "ControlSteady";
                 case DamageC1Enum : return "DamageC1";
                 case DamageC2Enum : return "DamageC2";
@@ -652 +653 @@
                 case ContoursEnum : return "Contours";
                 case ControlInputEnum : return "ControlInput";
-                case ControlSteadyEnum : return "ControlSteady";
                 case CrouzeixRaviartEnum : return "CrouzeixRaviart";
                 case CuffeyEnum : return "Cuffey";

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

@@ -95 +95 @@
               else if (strcmp(name,"ConstantsReferencetemperature")==0) return ConstantsReferencetemperatureEnum;
               else if (strcmp(name,"ConstantsYts")==0) return ConstantsYtsEnum;
+              else if (strcmp(name,"ControlSteady")==0) return ControlSteadyEnum;
               else if (strcmp(name,"DamageC1")==0) return DamageC1Enum;
               else if (strcmp(name,"DamageC2")==0) return DamageC2Enum;
@@ -136 +137 @@
               else if (strcmp(name,"HydrologydcLeakageFactor")==0) return HydrologydcLeakageFactorEnum;
               else if (strcmp(name,"HydrologydcMaxIter")==0) return HydrologydcMaxIterEnum;
-              else if (strcmp(name,"HydrologydcPenaltyFactor")==0) return HydrologydcPenaltyFactorEnum;
          else stage=2;
    }
    if(stage==2){
-              if (strcmp(name,"HydrologydcPenaltyLock")==0) return HydrologydcPenaltyLockEnum;
+              if (strcmp(name,"HydrologydcPenaltyFactor")==0) return HydrologydcPenaltyFactorEnum;
+              else if (strcmp(name,"HydrologydcPenaltyLock")==0) return HydrologydcPenaltyLockEnum;
               else if (strcmp(name,"HydrologydcRelTol")==0) return HydrologydcRelTolEnum;
               else if (strcmp(name,"HydrologydcSedimentlimit")==0) return HydrologydcSedimentlimitEnum;
@@ -259 +260 @@
               else if (strcmp(name,"SmbAIce")==0) return SmbAIceEnum;
               else if (strcmp(name,"SmbAIdx")==0) return SmbAIdxEnum;
-              else if (strcmp(name,"SmbASnow")==0) return SmbASnowEnum;
          else stage=3;
    }
    if(stage==3){
-              if (strcmp(name,"SmbCldFrac")==0) return SmbCldFracEnum;
+              if (strcmp(name,"SmbASnow")==0) return SmbASnowEnum;
+              else if (strcmp(name,"SmbCldFrac")==0) return SmbCldFracEnum;
               else if (strcmp(name,"SmbDelta18o")==0) return SmbDelta18oEnum;
               else if (strcmp(name,"SmbDelta18oSurface")==0) return SmbDelta18oSurfaceEnum;
@@ -382 +383 @@
               else if (strcmp(name,"CalvingMeltingrate")==0) return CalvingMeltingrateEnum;
               else if (strcmp(name,"CalvingratexAverage")==0) return CalvingratexAverageEnum;
-              else if (strcmp(name,"Calvingratex")==0) return CalvingratexEnum;
          else stage=4;
    }
    if(stage==4){
-              if (strcmp(name,"CalvingrateyAverage")==0) return CalvingrateyAverageEnum;
+              if (strcmp(name,"Calvingratex")==0) return CalvingratexEnum;
+              else if (strcmp(name,"CalvingrateyAverage")==0) return CalvingrateyAverageEnum;
               else if (strcmp(name,"Calvingratey")==0) return CalvingrateyEnum;
               else if (strcmp(name,"CalvingStressThresholdFloatingice")==0) return CalvingStressThresholdFloatingiceEnum;
@@ -505 +506 @@
               else if (strcmp(name,"SmbBPos")==0) return SmbBPosEnum;
               else if (strcmp(name,"SmbC")==0) return SmbCEnum;
-              else if (strcmp(name,"SmbD")==0) return SmbDEnum;
          else stage=5;
    }
    if(stage==5){
-              if (strcmp(name,"SmbDini")==0) return SmbDiniEnum;
+              if (strcmp(name,"SmbD")==0) return SmbDEnum;
+              else if (strcmp(name,"SmbDini")==0) return SmbDiniEnum;
               else if (strcmp(name,"SmbDlwrf")==0) return SmbDlwrfEnum;
               else if (strcmp(name,"SmbDswrf")==0) return SmbDswrfEnum;
@@ -628 +629 @@
               else if (strcmp(name,"AmrNeopz")==0) return AmrNeopzEnum;
               else if (strcmp(name,"AndroidFrictionCoefficient")==0) return AndroidFrictionCoefficientEnum;
-              else if (strcmp(name,"Arrhenius")==0) return ArrheniusEnum;
          else stage=6;
    }
    if(stage==6){
-              if (strcmp(name,"AutodiffJacobian")==0) return AutodiffJacobianEnum;
+              if (strcmp(name,"Arrhenius")==0) return ArrheniusEnum;
+              else if (strcmp(name,"AutodiffJacobian")==0) return AutodiffJacobianEnum;
               else if (strcmp(name,"AutodiffKeep")==0) return AutodiffKeepEnum;
               else if (strcmp(name,"Balancethickness2Analysis")==0) return Balancethickness2AnalysisEnum;
@@ -667 +668 @@
               else if (strcmp(name,"Contours")==0) return ContoursEnum;
               else if (strcmp(name,"ControlInput")==0) return ControlInputEnum;
-              else if (strcmp(name,"ControlSteady")==0) return ControlSteadyEnum;
               else if (strcmp(name,"CrouzeixRaviart")==0) return CrouzeixRaviartEnum;
               else if (strcmp(name,"Cuffey")==0) return CuffeyEnum;