Changeset 23864


Ignore:
Timestamp:
04/18/19 09:12:16 (6 years ago)
Author:
Mathieu Morlighem
Message:

CHG: moving Enums around

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

Legend:

Unmodified
Added
Removed

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

    r23863 r23864  
    304304        SealevelriseRunCountEnum,
    305305        SealevelriseTidalLoveHEnum,
    306         SealevelriseSpcthicknessEnum,
    307306        SealevelriseTidalLoveKEnum,
    308307        SealevelriseTransitionsEnum,
    … …  
    506505        EsaNmotionEnum,
    507506        EsaUmotionEnum,
     507        EsaRotationrateEnum,
    508508        EsaStrainratexxEnum,
    509509        EsaStrainratexyEnum,
    … …  
    609609        SealevelUEsaEnum,
    610610        SealevelRSLEustaticRateEnum,
     611        SealevelriseSpcthicknessEnum,
    611612        SealevelNEsaEnum,
    612613        SealevelUGiaEnum,
    … …  
    951952        EnthalpyAnalysisEnum,
    952953        EsaAnalysisEnum,
    953         EsaRotationrateEnum,
    954954        EsaSolutionEnum,
    955955        EsaTransitionsEnum,

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

    r23863 r23864  
    312312                case SealevelriseRunCountEnum : return "SealevelriseRunCount";
    313313                case SealevelriseTidalLoveHEnum : return "SealevelriseTidalLoveH";
    314                 case SealevelriseSpcthicknessEnum : return "SealevelriseSpcthickness";
    315314                case SealevelriseTidalLoveKEnum : return "SealevelriseTidalLoveK";
    316315                case SealevelriseTransitionsEnum : return "SealevelriseTransitions";
    … …  
    512511                case EsaNmotionEnum : return "EsaNmotion";
    513512                case EsaUmotionEnum : return "EsaUmotion";
     513                case EsaRotationrateEnum : return "EsaRotationrate";
    514514                case EsaStrainratexxEnum : return "EsaStrainratexx";
    515515                case EsaStrainratexyEnum : return "EsaStrainratexy";
    … …  
    615615                case SealevelUEsaEnum : return "SealevelUEsa";
    616616                case SealevelRSLEustaticRateEnum : return "SealevelRSLEustaticRate";
     617                case SealevelriseSpcthicknessEnum : return "SealevelriseSpcthickness";
    617618                case SealevelNEsaEnum : return "SealevelNEsa";
    618619                case SealevelUGiaEnum : return "SealevelUGia";
    … …  
    955956                case EnthalpyAnalysisEnum : return "EnthalpyAnalysis";
    956957                case EsaAnalysisEnum : return "EsaAnalysis";
    957                 case EsaRotationrateEnum : return "EsaRotationrate";
    958958                case EsaSolutionEnum : return "EsaSolution";
    959959                case EsaTransitionsEnum : return "EsaTransitions";

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

    r23863 r23864  
    318318              else if (strcmp(name,"SealevelriseRunCount")==0) return SealevelriseRunCountEnum;
    319319              else if (strcmp(name,"SealevelriseTidalLoveH")==0) return SealevelriseTidalLoveHEnum;
    320               else if (strcmp(name,"SealevelriseSpcthickness")==0) return SealevelriseSpcthicknessEnum;
    321320              else if (strcmp(name,"SealevelriseTidalLoveK")==0) return SealevelriseTidalLoveKEnum;
    322321              else if (strcmp(name,"SealevelriseTransitions")==0) return SealevelriseTransitionsEnum;
    … …  
    383382              else if (strcmp(name,"SolutionType")==0) return SolutionTypeEnum;
    384383              else if (strcmp(name,"SteadystateMaxiter")==0) return SteadystateMaxiterEnum;
     384              else if (strcmp(name,"SteadystateNumRequestedOutputs")==0) return SteadystateNumRequestedOutputsEnum;
    385385         else stage=4;
    386386   }
    387387   if(stage==4){
    388               if (strcmp(name,"SteadystateNumRequestedOutputs")==0) return SteadystateNumRequestedOutputsEnum;
    389               else if (strcmp(name,"SteadystateReltol")==0) return SteadystateReltolEnum;
     388              if (strcmp(name,"SteadystateReltol")==0) return SteadystateReltolEnum;
    390389              else if (strcmp(name,"SteadystateRequestedOutputs")==0) return SteadystateRequestedOutputsEnum;
    391390              else if (strcmp(name,"Step")==0) return StepEnum;
    … …  
    506505              else if (strcmp(name,"DrivingStressX")==0) return DrivingStressXEnum;
    507506              else if (strcmp(name,"DrivingStressY")==0) return DrivingStressYEnum;
     507              else if (strcmp(name,"EffectivePressureHydrostep")==0) return EffectivePressureHydrostepEnum;
    508508         else stage=5;
    509509   }
    510510   if(stage==5){
    511               if (strcmp(name,"EffectivePressureHydrostep")==0) return EffectivePressureHydrostepEnum;
    512               else if (strcmp(name,"EffectivePressureStacked")==0) return EffectivePressureStackedEnum;
     511              if (strcmp(name,"EffectivePressureStacked")==0) return EffectivePressureStackedEnum;
    513512              else if (strcmp(name,"EffectivePressure")==0) return EffectivePressureEnum;
    514513              else if (strcmp(name,"Enthalpy")==0) return EnthalpyEnum;
    … …  
    524523              else if (strcmp(name,"EsaNmotion")==0) return EsaNmotionEnum;
    525524              else if (strcmp(name,"EsaUmotion")==0) return EsaUmotionEnum;
     525              else if (strcmp(name,"EsaRotationrate")==0) return EsaRotationrateEnum;
    526526              else if (strcmp(name,"EsaStrainratexx")==0) return EsaStrainratexxEnum;
    527527              else if (strcmp(name,"EsaStrainratexy")==0) return EsaStrainratexyEnum;
    … …  
    627627              else if (strcmp(name,"SealevelUEsa")==0) return SealevelUEsaEnum;
    628628              else if (strcmp(name,"SealevelRSLEustaticRate")==0) return SealevelRSLEustaticRateEnum;
     629              else if (strcmp(name,"SealevelriseSpcthickness")==0) return SealevelriseSpcthicknessEnum;
    629630              else if (strcmp(name,"SealevelNEsa")==0) return SealevelNEsaEnum;
    630               else if (strcmp(name,"SealevelUGia")==0) return SealevelUGiaEnum;
    631631         else stage=6;
    632632   }
    633633   if(stage==6){
    634               if (strcmp(name,"SealevelNGia")==0) return SealevelNGiaEnum;
     634              if (strcmp(name,"SealevelUGia")==0) return SealevelUGiaEnum;
     635              else if (strcmp(name,"SealevelNGia")==0) return SealevelNGiaEnum;
    635636              else if (strcmp(name,"SealevelRSL")==0) return SealevelRSLEnum;
    636637              else if (strcmp(name,"SealevelRSLEustatic")==0) return SealevelRSLEustaticEnum;
    … …  
    751752              else if (strcmp(name,"SurfaceAbsMisfit")==0) return SurfaceAbsMisfitEnum;
    752753              else if (strcmp(name,"SurfaceAbsVelMisfit")==0) return SurfaceAbsVelMisfitEnum;
    753               else if (strcmp(name,"SurfaceArea")==0) return SurfaceAreaEnum;
    754754         else stage=7;
    755755   }
    756756   if(stage==7){
    757               if (strcmp(name,"SurfaceAverageVelMisfit")==0) return SurfaceAverageVelMisfitEnum;
     757              if (strcmp(name,"SurfaceArea")==0) return SurfaceAreaEnum;
     758              else if (strcmp(name,"SurfaceAverageVelMisfit")==0) return SurfaceAverageVelMisfitEnum;
    758759              else if (strcmp(name,"SurfaceCrevasse")==0) return SurfaceCrevasseEnum;
    759760              else if (strcmp(name,"Surface")==0) return SurfaceEnum;
    … …  
    874875              else if (strcmp(name,"Outputdefinition7")==0) return Outputdefinition7Enum;
    875876              else if (strcmp(name,"Outputdefinition80")==0) return Outputdefinition80Enum;
    876               else if (strcmp(name,"Outputdefinition81")==0) return Outputdefinition81Enum;
    877877         else stage=8;
    878878   }
    879879   if(stage==8){
    880               if (strcmp(name,"Outputdefinition82")==0) return Outputdefinition82Enum;
     880              if (strcmp(name,"Outputdefinition81")==0) return Outputdefinition81Enum;
     881              else if (strcmp(name,"Outputdefinition82")==0) return Outputdefinition82Enum;
    881882              else if (strcmp(name,"Outputdefinition83")==0) return Outputdefinition83Enum;
    882883              else if (strcmp(name,"Outputdefinition84")==0) return Outputdefinition84Enum;
    … …  
    976977              else if (strcmp(name,"EnthalpyAnalysis")==0) return EnthalpyAnalysisEnum;
    977978              else if (strcmp(name,"EsaAnalysis")==0) return EsaAnalysisEnum;
    978               else if (strcmp(name,"EsaRotationrate")==0) return EsaRotationrateEnum;
    979979              else if (strcmp(name,"EsaSolution")==0) return EsaSolutionEnum;
    980980              else if (strcmp(name,"EsaTransitions")==0) return EsaTransitionsEnum;
Note: See TracChangeset for help on using the changeset viewer.