Changeset 26791


Ignore:
Timestamp:
01/19/22 06:27:50 (3 years ago)
Author:
Mathieu Morlighem
Message:

CHG: updated Enums

Location:
issm/trunk-jpl/src/c/shared/Enum
Files:
2 edited

Legend:

Unmodified
Added
Removed

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

    r26784 r26791  
    584584                case BasalforcingsGroundediceMeltingRateEnum : return "BasalforcingsGroundediceMeltingRate";
    585585                case BasalforcingsPerturbationMeltingRateEnum : return "BasalforcingsPerturbationMeltingRate";
     586                case BasalforcingsSpatialDeepwaterElevationEnum : return "BasalforcingsSpatialDeepwaterElevation";
     587                case BasalforcingsSpatialDeepwaterMeltingRateEnum : return "BasalforcingsSpatialDeepwaterMeltingRate";
     588                case BasalforcingsSpatialUpperwaterElevationEnum : return "BasalforcingsSpatialUpperwaterElevation";
     589                case BasalforcingsSpatialUpperwaterMeltingRateEnum : return "BasalforcingsSpatialUpperwaterMeltingRate";
    586590                case BasalforcingsIsmip6BasinIdEnum : return "BasalforcingsIsmip6BasinId";
    587591                case BasalforcingsIsmip6TfEnum : return "BasalforcingsIsmip6Tf";

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

    r26789 r26791  
    107107              else if (strcmp(name,"CalvingLaw")==0) return CalvingLawEnum;
    108108              else if (strcmp(name,"CalvingMinthickness")==0) return CalvingMinthicknessEnum;
     109              else if (strcmp(name,"CalvingTestSpeedfactor")==0) return CalvingTestSpeedfactorEnum;
    109110              else if (strcmp(name,"ConfigurationType")==0) return ConfigurationTypeEnum;
    110111              else if (strcmp(name,"ConstantsG")==0) return ConstantsGEnum;
    … …  
    136137              else if (strcmp(name,"DamageLaw")==0) return DamageLawEnum;
    137138              else if (strcmp(name,"DamageMaxDamage")==0) return DamageMaxDamageEnum;
    138               else if (strcmp(name,"DamageStabilization")==0) return DamageStabilizationEnum;
    139139         else stage=2;
    140140   }
    141141   if(stage==2){
    142               if (strcmp(name,"DamageStressThreshold")==0) return DamageStressThresholdEnum;
     142              if (strcmp(name,"DamageStabilization")==0) return DamageStabilizationEnum;
     143              else if (strcmp(name,"DamageStressThreshold")==0) return DamageStressThresholdEnum;
    143144              else if (strcmp(name,"DamageStressUBound")==0) return DamageStressUBoundEnum;
    144145              else if (strcmp(name,"DebugProfiling")==0) return DebugProfilingEnum;
    … …  
    259260              else if (strcmp(name,"InversionNumControlParameters")==0) return InversionNumControlParametersEnum;
    260261              else if (strcmp(name,"InversionNumCostFunctions")==0) return InversionNumCostFunctionsEnum;
    261               else if (strcmp(name,"InversionStepThreshold")==0) return InversionStepThresholdEnum;
    262262         else stage=3;
    263263   }
    264264   if(stage==3){
    265               if (strcmp(name,"InversionType")==0) return InversionTypeEnum;
     265              if (strcmp(name,"InversionStepThreshold")==0) return InversionStepThresholdEnum;
     266              else if (strcmp(name,"InversionType")==0) return InversionTypeEnum;
    266267              else if (strcmp(name,"Ivins")==0) return IvinsEnum;
    267268              else if (strcmp(name,"IsSlcCoupling")==0) return IsSlcCouplingEnum;
    … …  
    382383              else if (strcmp(name,"SealevelchangeViscousTimes")==0) return SealevelchangeViscousTimesEnum;
    383384              else if (strcmp(name,"SealevelchangeViscousIndex")==0) return SealevelchangeViscousIndexEnum;
    384               else if (strcmp(name,"RotationalEquatorialMoi")==0) return RotationalEquatorialMoiEnum;
    385385         else stage=4;
    386386   }
    387387   if(stage==4){
    388               if (strcmp(name,"TidalLoveH")==0) return TidalLoveHEnum;
     388              if (strcmp(name,"RotationalEquatorialMoi")==0) return RotationalEquatorialMoiEnum;
     389              else if (strcmp(name,"TidalLoveH")==0) return TidalLoveHEnum;
    389390              else if (strcmp(name,"TidalLoveK")==0) return TidalLoveKEnum;
    390391              else if (strcmp(name,"TidalLoveL")==0) return TidalLoveLEnum;
    … …  
    505506              else if (strcmp(name,"Steps")==0) return StepsEnum;
    506507              else if (strcmp(name,"StressbalanceAbstol")==0) return StressbalanceAbstolEnum;
    507               else if (strcmp(name,"StressbalanceFSreconditioning")==0) return StressbalanceFSreconditioningEnum;
    508508         else stage=5;
    509509   }
    510510   if(stage==5){
    511               if (strcmp(name,"StressbalanceIsnewton")==0) return StressbalanceIsnewtonEnum;
     511              if (strcmp(name,"StressbalanceFSreconditioning")==0) return StressbalanceFSreconditioningEnum;
     512              else if (strcmp(name,"StressbalanceIsnewton")==0) return StressbalanceIsnewtonEnum;
    512513              else if (strcmp(name,"StressbalanceMaxiter")==0) return StressbalanceMaxiterEnum;
    513514              else if (strcmp(name,"StressbalanceNumRequestedOutputs")==0) return StressbalanceNumRequestedOutputsEnum;
    … …  
    628629              else if (strcmp(name,"BedEastGRD")==0) return BedEastGRDEnum;
    629630              else if (strcmp(name,"BedNorth")==0) return BedNorthEnum;
    630               else if (strcmp(name,"BedNorthGRD")==0) return BedNorthGRDEnum;
    631631         else stage=6;
    632632   }
    633633   if(stage==6){
    634               if (strcmp(name,"BedSlopeX")==0) return BedSlopeXEnum;
     634              if (strcmp(name,"BedNorthGRD")==0) return BedNorthGRDEnum;
     635              else if (strcmp(name,"BedSlopeX")==0) return BedSlopeXEnum;
    635636              else if (strcmp(name,"BedSlopeY")==0) return BedSlopeYEnum;
    636637              else if (strcmp(name,"BottomPressure")==0) return BottomPressureEnum;
    … …  
    751752              else if (strcmp(name,"HydrologyGapHeightXX")==0) return HydrologyGapHeightXXEnum;
    752753              else if (strcmp(name,"HydrologyGapHeightY")==0) return HydrologyGapHeightYEnum;
    753               else if (strcmp(name,"HydrologyGapHeightYY")==0) return HydrologyGapHeightYYEnum;
    754754         else stage=7;
    755755   }
    756756   if(stage==7){
    757               if (strcmp(name,"HydrologyHead")==0) return HydrologyHeadEnum;
     757              if (strcmp(name,"HydrologyGapHeightYY")==0) return HydrologyGapHeightYYEnum;
     758              else if (strcmp(name,"HydrologyHead")==0) return HydrologyHeadEnum;
    758759              else if (strcmp(name,"HydrologyHeadOld")==0) return HydrologyHeadOldEnum;
    759760              else if (strcmp(name,"HydrologyMoulinInput")==0) return HydrologyMoulinInputEnum;
    … …  
    874875              else if (strcmp(name,"SealevelGNrotm1")==0) return SealevelGNrotm1Enum;
    875876              else if (strcmp(name,"SealevelGNrotm2")==0) return SealevelGNrotm2Enum;
    876               else if (strcmp(name,"SealevelGNrotm3")==0) return SealevelGNrotm3Enum;
    877877         else stage=8;
    878878   }
    879879   if(stage==8){
    880               if (strcmp(name,"SealevelGErotm1")==0) return SealevelGErotm1Enum;
     880              if (strcmp(name,"SealevelGNrotm3")==0) return SealevelGNrotm3Enum;
     881              else if (strcmp(name,"SealevelGErotm1")==0) return SealevelGErotm1Enum;
    881882              else if (strcmp(name,"SealevelGErotm2")==0) return SealevelGErotm2Enum;
    882883              else if (strcmp(name,"SealevelGErotm3")==0) return SealevelGErotm3Enum;
    … …  
    997998              else if (strcmp(name,"SmbRefreeze")==0) return SmbRefreezeEnum;
    998999              else if (strcmp(name,"SmbReini")==0) return SmbReiniEnum;
    999               else if (strcmp(name,"SmbRunoff")==0) return SmbRunoffEnum;
    10001000         else stage=9;
    10011001   }
    10021002   if(stage==9){
    1003               if (strcmp(name,"SmbRunoffSubstep")==0) return SmbRunoffSubstepEnum;
     1003              if (strcmp(name,"SmbRunoff")==0) return SmbRunoffEnum;
     1004              else if (strcmp(name,"SmbRunoffSubstep")==0) return SmbRunoffSubstepEnum;
    10041005              else if (strcmp(name,"SmbRunoffTransient")==0) return SmbRunoffTransientEnum;
    10051006              else if (strcmp(name,"SmbS0gcm")==0) return SmbS0gcmEnum;
    … …  
    11201121              else if (strcmp(name,"Outputdefinition11")==0) return Outputdefinition11Enum;
    11211122              else if (strcmp(name,"Outputdefinition12")==0) return Outputdefinition12Enum;
    1122               else if (strcmp(name,"Outputdefinition13")==0) return Outputdefinition13Enum;
    11231123         else stage=10;
    11241124   }
    11251125   if(stage==10){
    1126               if (strcmp(name,"Outputdefinition14")==0) return Outputdefinition14Enum;
     1126              if (strcmp(name,"Outputdefinition13")==0) return Outputdefinition13Enum;
     1127              else if (strcmp(name,"Outputdefinition14")==0) return Outputdefinition14Enum;
    11271128              else if (strcmp(name,"Outputdefinition15")==0) return Outputdefinition15Enum;
    11281129              else if (strcmp(name,"Outputdefinition16")==0) return Outputdefinition16Enum;
    … …  
    12431244              else if (strcmp(name,"BasalforcingsPico")==0) return BasalforcingsPicoEnum;
    12441245              else if (strcmp(name,"BeckmannGoosseFloatingMeltRate")==0) return BeckmannGoosseFloatingMeltRateEnum;
    1245               else if (strcmp(name,"BedSlopeSolution")==0) return BedSlopeSolutionEnum;
    12461246         else stage=11;
    12471247   }
    12481248   if(stage==11){
    1249               if (strcmp(name,"BoolExternalResult")==0) return BoolExternalResultEnum;
     1249              if (strcmp(name,"BedSlopeSolution")==0) return BedSlopeSolutionEnum;
     1250              else if (strcmp(name,"BoolExternalResult")==0) return BoolExternalResultEnum;
    12501251              else if (strcmp(name,"BoolInput")==0) return BoolInputEnum;
    12511252              else if (strcmp(name,"IntInput")==0) return IntInputEnum;
    … …  
    12571258              else if (strcmp(name,"CalvingHab")==0) return CalvingHabEnum;
    12581259              else if (strcmp(name,"CalvingLevermann")==0) return CalvingLevermannEnum;
     1260              else if (strcmp(name,"CalvingTest")==0) return CalvingTestEnum;
    12591261              else if (strcmp(name,"CalvingVonmises")==0) return CalvingVonmisesEnum;
    12601262              else if (strcmp(name,"Cfdragcoeffabsgrad")==0) return CfdragcoeffabsgradEnum;
    … …  
    13651367              else if (strcmp(name,"IceMass")==0) return IceMassEnum;
    13661368              else if (strcmp(name,"IceMassScaled")==0) return IceMassScaledEnum;
    1367               else if (strcmp(name,"IceVolumeAboveFloatation")==0) return IceVolumeAboveFloatationEnum;
    1368               else if (strcmp(name,"IceVolumeAboveFloatationScaled")==0) return IceVolumeAboveFloatationScaledEnum;
    13691369         else stage=12;
    13701370   }
    13711371   if(stage==12){
    1372               if (strcmp(name,"IceVolume")==0) return IceVolumeEnum;
     1372              if (strcmp(name,"IceVolumeAboveFloatation")==0) return IceVolumeAboveFloatationEnum;
     1373              else if (strcmp(name,"IceVolumeAboveFloatationScaled")==0) return IceVolumeAboveFloatationScaledEnum;
     1374              else if (strcmp(name,"IceVolume")==0) return IceVolumeEnum;
    13731375              else if (strcmp(name,"IceVolumeScaled")==0) return IceVolumeScaledEnum;
    13741376              else if (strcmp(name,"IcefrontMassFlux")==0) return IcefrontMassFluxEnum;
    … …  
    14881490              else if (strcmp(name,"Penta")==0) return PentaEnum;
    14891491              else if (strcmp(name,"PentaInput")==0) return PentaInputEnum;
    1490               else if (strcmp(name,"Profiler")==0) return ProfilerEnum;
    1491               else if (strcmp(name,"ProfilingCurrentFlops")==0) return ProfilingCurrentFlopsEnum;
    14921492         else stage=13;
    14931493   }
    14941494   if(stage==13){
    1495               if (strcmp(name,"ProfilingCurrentMem")==0) return ProfilingCurrentMemEnum;
     1495              if (strcmp(name,"Profiler")==0) return ProfilerEnum;
     1496              else if (strcmp(name,"ProfilingCurrentFlops")==0) return ProfilingCurrentFlopsEnum;
     1497              else if (strcmp(name,"ProfilingCurrentMem")==0) return ProfilingCurrentMemEnum;
    14961498              else if (strcmp(name,"ProfilingSolutionTime")==0) return ProfilingSolutionTimeEnum;
    14971499              else if (strcmp(name,"Regionaloutput")==0) return RegionaloutputEnum;
Note: See TracChangeset for help on using the changeset viewer.