Changeset 23872


Ignore:
Timestamp:
04/19/19 09:43:24 (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

    r23871 r23872  
    282282        SaveResultsEnum,
    283283        SealevelEustaticEnum,
    284         SealevelEustaticOceanMaskEnum,
    285284        SealevelriseAbstolEnum,
    286285        SealevelriseAngularVelocityEnum,
    … …  
    622621        SealevelNGiaRateEnum,
    623622        SealevelUGiaRateEnum,
     623        SealevelEustaticOceanMaskEnum,
    624624        SedimentHeadStackedEnum,
    625625        SedimentHeadEnum,

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

    r23871 r23872  
    290290                case SaveResultsEnum : return "SaveResults";
    291291                case SealevelEustaticEnum : return "SealevelEustatic";
    292                 case SealevelEustaticOceanMaskEnum : return "SealevelEustaticOceanMask";
    293292                case SealevelriseAbstolEnum : return "SealevelriseAbstol";
    294293                case SealevelriseAngularVelocityEnum : return "SealevelriseAngularVelocity";
    … …  
    628627                case SealevelNGiaRateEnum : return "SealevelNGiaRate";
    629628                case SealevelUGiaRateEnum : return "SealevelUGiaRate";
     629                case SealevelEustaticOceanMaskEnum : return "SealevelEustaticOceanMask";
    630630                case SedimentHeadStackedEnum : return "SedimentHeadStacked";
    631631                case SedimentHeadEnum : return "SedimentHead";

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

    r23871 r23872  
    296296              else if (strcmp(name,"SaveResults")==0) return SaveResultsEnum;
    297297              else if (strcmp(name,"SealevelEustatic")==0) return SealevelEustaticEnum;
    298               else if (strcmp(name,"SealevelEustaticOceanMask")==0) return SealevelEustaticOceanMaskEnum;
    299298              else if (strcmp(name,"SealevelriseAbstol")==0) return SealevelriseAbstolEnum;
    300299              else if (strcmp(name,"SealevelriseAngularVelocity")==0) return SealevelriseAngularVelocityEnum;
    … …  
    383382              else if (strcmp(name,"SteadystateNumRequestedOutputs")==0) return SteadystateNumRequestedOutputsEnum;
    384383              else if (strcmp(name,"SteadystateReltol")==0) return SteadystateReltolEnum;
     384              else if (strcmp(name,"SteadystateRequestedOutputs")==0) return SteadystateRequestedOutputsEnum;
    385385         else stage=4;
    386386   }
    387387   if(stage==4){
    388               if (strcmp(name,"SteadystateRequestedOutputs")==0) return SteadystateRequestedOutputsEnum;
    389               else if (strcmp(name,"Step")==0) return StepEnum;
     388              if (strcmp(name,"Step")==0) return StepEnum;
    390389              else if (strcmp(name,"StressbalanceAbstol")==0) return StressbalanceAbstolEnum;
    391390              else if (strcmp(name,"StressbalanceFSreconditioning")==0) return StressbalanceFSreconditioningEnum;
    … …  
    506505              else if (strcmp(name,"EffectivePressureHydrostep")==0) return EffectivePressureHydrostepEnum;
    507506              else if (strcmp(name,"EffectivePressureStacked")==0) return EffectivePressureStackedEnum;
     507              else if (strcmp(name,"EffectivePressure")==0) return EffectivePressureEnum;
    508508         else stage=5;
    509509   }
    510510   if(stage==5){
    511               if (strcmp(name,"EffectivePressure")==0) return EffectivePressureEnum;
    512               else if (strcmp(name,"Enthalpy")==0) return EnthalpyEnum;
     511              if (strcmp(name,"Enthalpy")==0) return EnthalpyEnum;
    513512              else if (strcmp(name,"EnthalpyPicard")==0) return EnthalpyPicardEnum;
    514513              else if (strcmp(name,"EplHeadStacked")==0) return EplHeadStackedEnum;
    … …  
    629628              else if (strcmp(name,"SealevelUEsa")==0) return SealevelUEsaEnum;
    630629              else if (strcmp(name,"SealevelRSLEustaticRate")==0) return SealevelRSLEustaticRateEnum;
     630              else if (strcmp(name,"SealevelriseSpcthickness")==0) return SealevelriseSpcthicknessEnum;
    631631         else stage=6;
    632632   }
    633633   if(stage==6){
    634               if (strcmp(name,"SealevelriseSpcthickness")==0) return SealevelriseSpcthicknessEnum;
    635               else if (strcmp(name,"SealevelriseStericRate")==0) return SealevelriseStericRateEnum;
     634              if (strcmp(name,"SealevelriseStericRate")==0) return SealevelriseStericRateEnum;
    636635              else if (strcmp(name,"SealevelNEsa")==0) return SealevelNEsaEnum;
    637636              else if (strcmp(name,"SealevelUGia")==0) return SealevelUGiaEnum;
    … …  
    643642              else if (strcmp(name,"SealevelNGiaRate")==0) return SealevelNGiaRateEnum;
    644643              else if (strcmp(name,"SealevelUGiaRate")==0) return SealevelUGiaRateEnum;
     644              else if (strcmp(name,"SealevelEustaticOceanMask")==0) return SealevelEustaticOceanMaskEnum;
    645645              else if (strcmp(name,"SedimentHeadStacked")==0) return SedimentHeadStackedEnum;
    646646              else if (strcmp(name,"SedimentHead")==0) return SedimentHeadEnum;
Note: See TracChangeset for help on using the changeset viewer.