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

Timestamp:

02/29/24 15:22:20 (13 months ago)

Author:

poinelli

Message:

NEW: Add IntrusionMelt module to include melt under grounding zones, edits after Robel, Wilson, Seroussi TC (2022)

File:

• issm/trunk-jpl/src/c/shared/Enum/StringToEnumx.cpp (modified) (9 diffs)

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

@@ -891 +891 @@
               else if (strcmp(name,"FrontalForcingsSubglacialDischarge")==0) return FrontalForcingsSubglacialDischargeEnum;
               else if (strcmp(name,"GeometryHydrostaticRatio")==0) return GeometryHydrostaticRatioEnum;
+              else if (strcmp(name,"GroundinglineIntrusionDistance")==0) return GroundinglineIntrusionDistanceEnum;
               else if (strcmp(name,"NGia")==0) return NGiaEnum;
               else if (strcmp(name,"NGiaRate")==0) return NGiaRateEnum;
@@ -948 +949 @@
               else if (strcmp(name,"InversionVxObs")==0) return InversionVxObsEnum;
               else if (strcmp(name,"InversionVyObs")==0) return InversionVyObsEnum;
+              else if (strcmp(name,"IntrusionMelt")==0) return IntrusionMeltEnum;
               else if (strcmp(name,"LevelsetfunctionSlopeX")==0) return LevelsetfunctionSlopeXEnum;
               else if (strcmp(name,"LevelsetfunctionSlopeY")==0) return LevelsetfunctionSlopeYEnum;
@@ -996 +998 @@
               else if (strcmp(name,"RheologyBbarAbsGradient")==0) return RheologyBbarAbsGradientEnum;
               else if (strcmp(name,"Sample")==0) return SampleEnum;
-              else if (strcmp(name,"SampleOld")==0) return SampleOldEnum;
-              else if (strcmp(name,"SampleNoise")==0) return SampleNoiseEnum;
          else stage=9;
    }
    if(stage==9){
-              if (strcmp(name,"SamplingBeta")==0) return SamplingBetaEnum;
+              if (strcmp(name,"SampleOld")==0) return SampleOldEnum;
+              else if (strcmp(name,"SampleNoise")==0) return SampleNoiseEnum;
+              else if (strcmp(name,"SamplingBeta")==0) return SamplingBetaEnum;
               else if (strcmp(name,"SamplingKappa")==0) return SamplingKappaEnum;
               else if (strcmp(name,"SamplingPhi")==0) return SamplingPhiEnum;
@@ -1119 +1121 @@
               else if (strcmp(name,"SmbDzAdd")==0) return SmbDzAddEnum;
               else if (strcmp(name,"SmbDz")==0) return SmbDzEnum;
-              else if (strcmp(name,"SmbDzMin")==0) return SmbDzMinEnum;
-              else if (strcmp(name,"SmbDzTop")==0) return SmbDzTopEnum;
          else stage=10;
    }
    if(stage==10){
-              if (strcmp(name,"SmbDzini")==0) return SmbDziniEnum;
+              if (strcmp(name,"SmbDzMin")==0) return SmbDzMinEnum;
+              else if (strcmp(name,"SmbDzTop")==0) return SmbDzTopEnum;
+              else if (strcmp(name,"SmbDzini")==0) return SmbDziniEnum;
               else if (strcmp(name,"SmbEAir")==0) return SmbEAirEnum;
               else if (strcmp(name,"SmbEC")==0) return SmbECEnum;
@@ -1242 +1244 @@
               else if (strcmp(name,"SubglacialdischargeValuesMovingaverage")==0) return SubglacialdischargeValuesMovingaverageEnum;
               else if (strcmp(name,"SurfaceAbsMisfit")==0) return SurfaceAbsMisfitEnum;
-              else if (strcmp(name,"SurfaceAbsVelMisfit")==0) return SurfaceAbsVelMisfitEnum;
-              else if (strcmp(name,"Area")==0) return AreaEnum;
          else stage=11;
    }
    if(stage==11){
-              if (strcmp(name,"SealevelArea")==0) return SealevelAreaEnum;
+              if (strcmp(name,"SurfaceAbsVelMisfit")==0) return SurfaceAbsVelMisfitEnum;
+              else if (strcmp(name,"Area")==0) return AreaEnum;
+              else if (strcmp(name,"SealevelArea")==0) return SealevelAreaEnum;
               else if (strcmp(name,"SurfaceArea")==0) return SurfaceAreaEnum;
               else if (strcmp(name,"SurfaceAverageVelMisfit")==0) return SurfaceAverageVelMisfitEnum;
@@ -1365 +1367 @@
               else if (strcmp(name,"Outputdefinition53")==0) return Outputdefinition53Enum;
               else if (strcmp(name,"Outputdefinition54")==0) return Outputdefinition54Enum;
-              else if (strcmp(name,"Outputdefinition55")==0) return Outputdefinition55Enum;
-              else if (strcmp(name,"Outputdefinition56")==0) return Outputdefinition56Enum;
          else stage=12;
    }
    if(stage==12){
-              if (strcmp(name,"Outputdefinition57")==0) return Outputdefinition57Enum;
+              if (strcmp(name,"Outputdefinition55")==0) return Outputdefinition55Enum;
+              else if (strcmp(name,"Outputdefinition56")==0) return Outputdefinition56Enum;
+              else if (strcmp(name,"Outputdefinition57")==0) return Outputdefinition57Enum;
               else if (strcmp(name,"Outputdefinition58")==0) return Outputdefinition58Enum;
               else if (strcmp(name,"Outputdefinition59")==0) return Outputdefinition59Enum;
@@ -1488 +1490 @@
               else if (strcmp(name,"Cuffey")==0) return CuffeyEnum;
               else if (strcmp(name,"CuffeyTemperate")==0) return CuffeyTemperateEnum;
-              else if (strcmp(name,"DamageEvolutionAnalysis")==0) return DamageEvolutionAnalysisEnum;
-              else if (strcmp(name,"DamageEvolutionSolution")==0) return DamageEvolutionSolutionEnum;
          else stage=13;
    }
    if(stage==13){
-              if (strcmp(name,"DataSet")==0) return DataSetEnum;
+              if (strcmp(name,"DamageEvolutionAnalysis")==0) return DamageEvolutionAnalysisEnum;
+              else if (strcmp(name,"DamageEvolutionSolution")==0) return DamageEvolutionSolutionEnum;
+              else if (strcmp(name,"DataSet")==0) return DataSetEnum;
               else if (strcmp(name,"DataSetParam")==0) return DataSetParamEnum;
               else if (strcmp(name,"DatasetInput")==0) return DatasetInputEnum;
@@ -1611 +1613 @@
               else if (strcmp(name,"LevelsetAnalysis")==0) return LevelsetAnalysisEnum;
               else if (strcmp(name,"LevelsetfunctionPicard")==0) return LevelsetfunctionPicardEnum;
-              else if (strcmp(name,"LinearFloatingMeltRate")==0) return LinearFloatingMeltRateEnum;
-              else if (strcmp(name,"LinearFloatingMeltRatearma")==0) return LinearFloatingMeltRatearmaEnum;
          else stage=14;
    }
    if(stage==14){
-              if (strcmp(name,"LliboutryDuval")==0) return LliboutryDuvalEnum;
+              if (strcmp(name,"LinearFloatingMeltRate")==0) return LinearFloatingMeltRateEnum;
+              else if (strcmp(name,"LinearFloatingMeltRatearma")==0) return LinearFloatingMeltRatearmaEnum;
+              else if (strcmp(name,"LliboutryDuval")==0) return LliboutryDuvalEnum;
               else if (strcmp(name,"Loads")==0) return LoadsEnum;
               else if (strcmp(name,"LoveAnalysis")==0) return LoveAnalysisEnum;
@@ -1734 +1736 @@
               else if (strcmp(name,"SMBgradients")==0) return SMBgradientsEnum;
               else if (strcmp(name,"SMBgradientscomponents")==0) return SMBgradientscomponentsEnum;
-              else if (strcmp(name,"SMBgradientsela")==0) return SMBgradientselaEnum;
-              else if (strcmp(name,"SMBhenning")==0) return SMBhenningEnum;
          else stage=15;
    }
    if(stage==15){
-              if (strcmp(name,"SMBmeltcomponents")==0) return SMBmeltcomponentsEnum;
+              if (strcmp(name,"SMBgradientsela")==0) return SMBgradientselaEnum;
+              else if (strcmp(name,"SMBhenning")==0) return SMBhenningEnum;
+              else if (strcmp(name,"SMBmeltcomponents")==0) return SMBmeltcomponentsEnum;
               else if (strcmp(name,"SMBpdd")==0) return SMBpddEnum;
               else if (strcmp(name,"SMBpddSicopolis")==0) return SMBpddSicopolisEnum;