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

Timestamp:

12/18/19 11:11:43 (5 years ago)

Author:

Mathieu Morlighem

Message:

CHG: making overturning C in PICO spatially variable

File:

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

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

@@ -92 +92 @@
               else if (strcmp(name,"BasalforcingsPicoMaxboxcount")==0) return BasalforcingsPicoMaxboxcountEnum;
               else if (strcmp(name,"BasalforcingsPicoNumBasins")==0) return BasalforcingsPicoNumBasinsEnum;
-              else if (strcmp(name,"BasalforcingsPicoOverturningCoeff")==0) return BasalforcingsPicoOverturningCoeffEnum;
               else if (strcmp(name,"BasalforcingsPlumeradius")==0) return BasalforcingsPlumeradiusEnum;
               else if (strcmp(name,"BasalforcingsPlumex")==0) return BasalforcingsPlumexEnum;
@@ -137 +136 @@
               else if (strcmp(name,"EplZigZagCounter")==0) return EplZigZagCounterEnum;
               else if (strcmp(name,"EsaHElastic")==0) return EsaHElasticEnum;
+              else if (strcmp(name,"EsaHemisphere")==0) return EsaHemisphereEnum;
          else stage=2;
    }
    if(stage==2){
-              if (strcmp(name,"EsaHemisphere")==0) return EsaHemisphereEnum;
-              else if (strcmp(name,"EsaRequestedOutputs")==0) return EsaRequestedOutputsEnum;
+              if (strcmp(name,"EsaRequestedOutputs")==0) return EsaRequestedOutputsEnum;
               else if (strcmp(name,"EsaUElastic")==0) return EsaUElasticEnum;
               else if (strcmp(name,"ExtrapolationVariable")==0) return ExtrapolationVariableEnum;
@@ -260 +259 @@
               else if (strcmp(name,"MaterialsLithosphereDensity")==0) return MaterialsLithosphereDensityEnum;
               else if (strcmp(name,"MaterialsLithosphereShearModulus")==0) return MaterialsLithosphereShearModulusEnum;
+              else if (strcmp(name,"MaterialsMantleDensity")==0) return MaterialsMantleDensityEnum;
          else stage=3;
    }
    if(stage==3){
-              if (strcmp(name,"MaterialsMantleDensity")==0) return MaterialsMantleDensityEnum;
-              else if (strcmp(name,"MaterialsMantleShearModulus")==0) return MaterialsMantleShearModulusEnum;
+              if (strcmp(name,"MaterialsMantleShearModulus")==0) return MaterialsMantleShearModulusEnum;
               else if (strcmp(name,"MaterialsMeltingpoint")==0) return MaterialsMeltingpointEnum;
               else if (strcmp(name,"MaterialsMixedLayerCapacity")==0) return MaterialsMixedLayerCapacityEnum;
@@ -383 +382 @@
               else if (strcmp(name,"SmbRunoffgrad")==0) return SmbRunoffgradEnum;
               else if (strcmp(name,"SmbRunoffref")==0) return SmbRunoffrefEnum;
+              else if (strcmp(name,"SmbSealev")==0) return SmbSealevEnum;
          else stage=4;
    }
    if(stage==4){
-              if (strcmp(name,"SmbSealev")==0) return SmbSealevEnum;
-              else if (strcmp(name,"SmbStepsPerStep")==0) return SmbStepsPerStepEnum;
+              if (strcmp(name,"SmbStepsPerStep")==0) return SmbStepsPerStepEnum;
               else if (strcmp(name,"SmbSwIdx")==0) return SmbSwIdxEnum;
               else if (strcmp(name,"SmbT0dry")==0) return SmbT0dryEnum;
@@ -481 +480 @@
               else if (strcmp(name,"BasalforcingsPicoBasinId")==0) return BasalforcingsPicoBasinIdEnum;
               else if (strcmp(name,"BasalforcingsPicoBoxId")==0) return BasalforcingsPicoBoxIdEnum;
+              else if (strcmp(name,"BasalforcingsPicoOverturningCoeff")==0) return BasalforcingsPicoOverturningCoeffEnum;
               else if (strcmp(name,"BasalforcingsPicoSubShelfOceanOverturning")==0) return BasalforcingsPicoSubShelfOceanOverturningEnum;
               else if (strcmp(name,"BasalforcingsPicoSubShelfOceanSalinity")==0) return BasalforcingsPicoSubShelfOceanSalinityEnum;