Changeset 26210

Timestamp:

04/23/21 18:17:35 (4 years ago)

Author:

schlegel

Message:

CHG: removing Smb MassBalance Clim enum

Location:

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

Files:

• Enum.vim (modified) (1 diff)
• EnumDefinitions.h (modified) (1 diff)
• EnumToStringx.cpp (modified) (1 diff)
• StringToEnumx.cpp (modified) (6 diffs)

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

@@ -829 +829 @@
 syn keyword cConstant SmbIsInitializedEnum
 syn keyword cConstant SmbMAddEnum
-syn keyword cConstant SmbMassBalanceClimateEnum
 syn keyword cConstant SmbMassBalanceEnum
 syn keyword cConstant SmbMassBalanceSubstepEnum

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

@@ -825 +825 @@
         SmbIsInitializedEnum,
         SmbMAddEnum,
-        SmbMassBalanceClimateEnum,
         SmbMassBalanceEnum,
    SmbMassBalanceSubstepEnum,

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

@@ -831 +831 @@
                 case SmbIsInitializedEnum : return "SmbIsInitialized";
                 case SmbMAddEnum : return "SmbMAdd";
-                case SmbMassBalanceClimateEnum : return "SmbMassBalanceClimate";
                 case SmbMassBalanceEnum : return "SmbMassBalance";
                 case SmbMassBalanceSubstepEnum : return "SmbMassBalanceSubstep";

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

@@ -849 +849 @@
               else if (strcmp(name,"SmbIsInitialized")==0) return SmbIsInitializedEnum;
               else if (strcmp(name,"SmbMAdd")==0) return SmbMAddEnum;
-              else if (strcmp(name,"SmbMassBalanceClimate")==0) return SmbMassBalanceClimateEnum;
               else if (strcmp(name,"SmbMassBalance")==0) return SmbMassBalanceEnum;
               else if (strcmp(name,"SmbMassBalanceSubstep")==0) return SmbMassBalanceSubstepEnum;
@@ -875 +874 @@
               else if (strcmp(name,"SmbRunoff")==0) return SmbRunoffEnum;
               else if (strcmp(name,"SmbRunoffSubstep")==0) return SmbRunoffSubstepEnum;
+              else if (strcmp(name,"SmbRunoffTransient")==0) return SmbRunoffTransientEnum;
          else stage=8;
    }
    if(stage==8){
-              if (strcmp(name,"SmbRunoffTransient")==0) return SmbRunoffTransientEnum;
-              else if (strcmp(name,"SmbS0gcm")==0) return SmbS0gcmEnum;
+              if (strcmp(name,"SmbS0gcm")==0) return SmbS0gcmEnum;
               else if (strcmp(name,"SmbS0p")==0) return SmbS0pEnum;
               else if (strcmp(name,"SmbS0t")==0) return SmbS0tEnum;
@@ -998 +997 @@
               else if (strcmp(name,"Outputdefinition19")==0) return Outputdefinition19Enum;
               else if (strcmp(name,"Outputdefinition20")==0) return Outputdefinition20Enum;
+              else if (strcmp(name,"Outputdefinition21")==0) return Outputdefinition21Enum;
          else stage=9;
    }
    if(stage==9){
-              if (strcmp(name,"Outputdefinition21")==0) return Outputdefinition21Enum;
-              else if (strcmp(name,"Outputdefinition22")==0) return Outputdefinition22Enum;
+              if (strcmp(name,"Outputdefinition22")==0) return Outputdefinition22Enum;
               else if (strcmp(name,"Outputdefinition23")==0) return Outputdefinition23Enum;
               else if (strcmp(name,"Outputdefinition24")==0) return Outputdefinition24Enum;
@@ -1121 +1120 @@
               else if (strcmp(name,"Boundary")==0) return BoundaryEnum;
               else if (strcmp(name,"BuddJacka")==0) return BuddJackaEnum;
+              else if (strcmp(name,"CalvingDev2")==0) return CalvingDev2Enum;
          else stage=10;
    }
    if(stage==10){
-              if (strcmp(name,"CalvingDev2")==0) return CalvingDev2Enum;
-              else if (strcmp(name,"CalvingHab")==0) return CalvingHabEnum;
+              if (strcmp(name,"CalvingHab")==0) return CalvingHabEnum;
               else if (strcmp(name,"CalvingLevermann")==0) return CalvingLevermannEnum;
               else if (strcmp(name,"CalvingVonmises")==0) return CalvingVonmisesEnum;
@@ -1244 +1243 @@
               else if (strcmp(name,"ElementInput")==0) return ElementInputEnum;
               else if (strcmp(name,"IntMatExternalResult")==0) return IntMatExternalResultEnum;
+              else if (strcmp(name,"IntMatParam")==0) return IntMatParamEnum;
          else stage=11;
    }
    if(stage==11){
-              if (strcmp(name,"IntMatParam")==0) return IntMatParamEnum;
-              else if (strcmp(name,"IntParam")==0) return IntParamEnum;
+              if (strcmp(name,"IntParam")==0) return IntParamEnum;
               else if (strcmp(name,"IntVecParam")==0) return IntVecParamEnum;
               else if (strcmp(name,"Inputs")==0) return InputsEnum;
@@ -1367 +1366 @@
               else if (strcmp(name,"SamplingSolution")==0) return SamplingSolutionEnum;
               else if (strcmp(name,"SIAApproximation")==0) return SIAApproximationEnum;
+              else if (strcmp(name,"SMBcomponents")==0) return SMBcomponentsEnum;
          else stage=12;
    }
    if(stage==12){
-              if (strcmp(name,"SMBcomponents")==0) return SMBcomponentsEnum;
-              else if (strcmp(name,"SMBd18opdd")==0) return SMBd18opddEnum;
+              if (strcmp(name,"SMBd18opdd")==0) return SMBd18opddEnum;
               else if (strcmp(name,"SMBforcing")==0) return SMBforcingEnum;
               else if (strcmp(name,"SMBgcm")==0) return SMBgcmEnum;