Changeset 23062


Ignore:
Timestamp:
08/06/18 15:07:18 (7 years ago)
Author:
Mathieu Morlighem
Message:

CHG: moved some enums to inputs

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

Legend:

Unmodified
Added
Removed

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

    r23061 r23062  
    242242        SealevelEustaticOceanMaskEnum,
    243243        SealevelEustaticMaskEnum,
    244         SealevelUEsaRateEnum,
    245         SealevelNEsaRateEnum,
    246         SealevelRSLRateEnum,
    247         SealevelUEsaEnum,
    248         SealevelRSLEustaticRateEnum,
    249         SealevelNEsaEnum,
    250         SealevelUGiaEnum,
    251         SealevelNGiaEnum,
    252         SealevelRSLEnum,
    253         SealevelRSLEustaticEnum,
    254         SealevelUNorthEsaEnum,
    255         SealevelUEastEsaEnum,
    256         SealevelNGiaRateEnum,
    257         SealevelUGiaRateEnum,
    258244        SealevelriseAbstolEnum,
    259245        SealevelriseAngularVelocityEnum,
    … …  
    536522        SealevelriseCumDeltathicknessEnum,
    537523        SealevelriseDeltathicknessEnum,
     524        SealevelUEsaRateEnum,
     525        SealevelNEsaRateEnum,
     526        SealevelRSLRateEnum,
     527        SealevelUEsaEnum,
     528        SealevelRSLEustaticRateEnum,
     529        SealevelNEsaEnum,
     530        SealevelUGiaEnum,
     531        SealevelNGiaEnum,
     532        SealevelRSLEnum,
     533        SealevelRSLEustaticEnum,
     534        SealevelUNorthEsaEnum,
     535        SealevelUEastEsaEnum,
     536        SealevelNGiaRateEnum,
     537        SealevelUGiaRateEnum,
    538538        SedimentHeadHydrostepEnum,
    539539        SedimentHeadOldEnum,

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

    r23061 r23062  
    250250                case SealevelEustaticOceanMaskEnum : return "SealevelEustaticOceanMask";
    251251                case SealevelEustaticMaskEnum : return "SealevelEustaticMask";
    252                 case SealevelUEsaRateEnum : return "SealevelUEsaRate";
    253                 case SealevelNEsaRateEnum : return "SealevelNEsaRate";
    254                 case SealevelRSLRateEnum : return "SealevelRSLRate";
    255                 case SealevelUEsaEnum : return "SealevelUEsa";
    256                 case SealevelRSLEustaticRateEnum : return "SealevelRSLEustaticRate";
    257                 case SealevelNEsaEnum : return "SealevelNEsa";
    258                 case SealevelUGiaEnum : return "SealevelUGia";
    259                 case SealevelNGiaEnum : return "SealevelNGia";
    260                 case SealevelRSLEnum : return "SealevelRSL";
    261                 case SealevelRSLEustaticEnum : return "SealevelRSLEustatic";
    262                 case SealevelUNorthEsaEnum : return "SealevelUNorthEsa";
    263                 case SealevelUEastEsaEnum : return "SealevelUEastEsa";
    264                 case SealevelNGiaRateEnum : return "SealevelNGiaRate";
    265                 case SealevelUGiaRateEnum : return "SealevelUGiaRate";
    266252                case SealevelriseAbstolEnum : return "SealevelriseAbstol";
    267253                case SealevelriseAngularVelocityEnum : return "SealevelriseAngularVelocity";
    … …  
    542528                case SealevelriseCumDeltathicknessEnum : return "SealevelriseCumDeltathickness";
    543529                case SealevelriseDeltathicknessEnum : return "SealevelriseDeltathickness";
     530                case SealevelUEsaRateEnum : return "SealevelUEsaRate";
     531                case SealevelNEsaRateEnum : return "SealevelNEsaRate";
     532                case SealevelRSLRateEnum : return "SealevelRSLRate";
     533                case SealevelUEsaEnum : return "SealevelUEsa";
     534                case SealevelRSLEustaticRateEnum : return "SealevelRSLEustaticRate";
     535                case SealevelNEsaEnum : return "SealevelNEsa";
     536                case SealevelUGiaEnum : return "SealevelUGia";
     537                case SealevelNGiaEnum : return "SealevelNGia";
     538                case SealevelRSLEnum : return "SealevelRSL";
     539                case SealevelRSLEustaticEnum : return "SealevelRSLEustatic";
     540                case SealevelUNorthEsaEnum : return "SealevelUNorthEsa";
     541                case SealevelUEastEsaEnum : return "SealevelUEastEsa";
     542                case SealevelNGiaRateEnum : return "SealevelNGiaRate";
     543                case SealevelUGiaRateEnum : return "SealevelUGiaRate";
    544544                case SedimentHeadHydrostepEnum : return "SedimentHeadHydrostep";
    545545                case SedimentHeadOldEnum : return "SedimentHeadOld";

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

    r23061 r23062  
    253253              else if (strcmp(name,"SealevelEustaticOceanMask")==0) return SealevelEustaticOceanMaskEnum;
    254254              else if (strcmp(name,"SealevelEustaticMask")==0) return SealevelEustaticMaskEnum;
    255               else if (strcmp(name,"SealevelUEsaRate")==0) return SealevelUEsaRateEnum;
    256               else if (strcmp(name,"SealevelNEsaRate")==0) return SealevelNEsaRateEnum;
    257               else if (strcmp(name,"SealevelRSLRate")==0) return SealevelRSLRateEnum;
    258               else if (strcmp(name,"SealevelUEsa")==0) return SealevelUEsaEnum;
    259               else if (strcmp(name,"SealevelRSLEustaticRate")==0) return SealevelRSLEustaticRateEnum;
    260               else if (strcmp(name,"SealevelNEsa")==0) return SealevelNEsaEnum;
    261               else if (strcmp(name,"SealevelUGia")==0) return SealevelUGiaEnum;
    262          else stage=3;
    263    }
    264    if(stage==3){
    265               if (strcmp(name,"SealevelNGia")==0) return SealevelNGiaEnum;
    266               else if (strcmp(name,"SealevelRSL")==0) return SealevelRSLEnum;
    267               else if (strcmp(name,"SealevelRSLEustatic")==0) return SealevelRSLEustaticEnum;
    268               else if (strcmp(name,"SealevelUNorthEsa")==0) return SealevelUNorthEsaEnum;
    269               else if (strcmp(name,"SealevelUEastEsa")==0) return SealevelUEastEsaEnum;
    270               else if (strcmp(name,"SealevelNGiaRate")==0) return SealevelNGiaRateEnum;
    271               else if (strcmp(name,"SealevelUGiaRate")==0) return SealevelUGiaRateEnum;
    272255              else if (strcmp(name,"SealevelriseAbstol")==0) return SealevelriseAbstolEnum;
    273256              else if (strcmp(name,"SealevelriseAngularVelocity")==0) return SealevelriseAngularVelocityEnum;
    … …  
    277260              else if (strcmp(name,"SealevelriseGElastic")==0) return SealevelriseGElasticEnum;
    278261              else if (strcmp(name,"SealevelriseGeodetic")==0) return SealevelriseGeodeticEnum;
    279               else if (strcmp(name,"SealevelriseGeodeticRunFrequency")==0) return SealevelriseGeodeticRunFrequencyEnum;
     262         else stage=3;
     263   }
     264   if(stage==3){
     265              if (strcmp(name,"SealevelriseGeodeticRunFrequency")==0) return SealevelriseGeodeticRunFrequencyEnum;
    280266              else if (strcmp(name,"SealevelriseHElastic")==0) return SealevelriseHElasticEnum;
    281267              else if (strcmp(name,"SealevelriseHoriz")==0) return SealevelriseHorizEnum;
    … …  
    383369              else if (strcmp(name,"TransientIsdamageevolution")==0) return TransientIsdamageevolutionEnum;
    384370              else if (strcmp(name,"TransientIsesa")==0) return TransientIsesaEnum;
    385          else stage=4;
    386    }
    387    if(stage==4){
    388               if (strcmp(name,"TransientIsgia")==0) return TransientIsgiaEnum;
     371              else if (strcmp(name,"TransientIsgia")==0) return TransientIsgiaEnum;
    389372              else if (strcmp(name,"TransientIsgroundingline")==0) return TransientIsgroundinglineEnum;
    390373              else if (strcmp(name,"TransientIshydrology")==0) return TransientIshydrologyEnum;
    … …  
    400383              else if (strcmp(name,"Velocity")==0) return VelocityEnum;
    401384              else if (strcmp(name,"WorldComm")==0) return WorldCommEnum;
    402               else if (strcmp(name,"ParametersEND")==0) return ParametersENDEnum;
     385         else stage=4;
     386   }
     387   if(stage==4){
     388              if (strcmp(name,"ParametersEND")==0) return ParametersENDEnum;
    403389              else if (strcmp(name,"InputsSTART")==0) return InputsSTARTEnum;
    404390              else if (strcmp(name,"Adjoint")==0) return AdjointEnum;
    … …  
    506492              else if (strcmp(name,"HydrologyNeumannflux")==0) return HydrologyNeumannfluxEnum;
    507493              else if (strcmp(name,"HydrologyReynolds")==0) return HydrologyReynoldsEnum;
    508          else stage=5;
    509    }
    510    if(stage==5){
    511               if (strcmp(name,"HydrologyWaterVx")==0) return HydrologyWaterVxEnum;
     494              else if (strcmp(name,"HydrologyWaterVx")==0) return HydrologyWaterVxEnum;
    512495              else if (strcmp(name,"HydrologyWaterVy")==0) return HydrologyWaterVyEnum;
    513496              else if (strcmp(name,"HydrologyDrainageRate")==0) return HydrologyDrainageRateEnum;
    … …  
    523506              else if (strcmp(name,"LevelsetfunctionSlopeX")==0) return LevelsetfunctionSlopeXEnum;
    524507              else if (strcmp(name,"LevelsetfunctionSlopeY")==0) return LevelsetfunctionSlopeYEnum;
    525               else if (strcmp(name,"LoadingforceX")==0) return LoadingforceXEnum;
     508         else stage=5;
     509   }
     510   if(stage==5){
     511              if (strcmp(name,"LoadingforceX")==0) return LoadingforceXEnum;
    526512              else if (strcmp(name,"LoadingforceY")==0) return LoadingforceYEnum;
    527513              else if (strcmp(name,"LoadingforceZ")==0) return LoadingforceZEnum;
    … …  
    554540              else if (strcmp(name,"SealevelriseCumDeltathickness")==0) return SealevelriseCumDeltathicknessEnum;
    555541              else if (strcmp(name,"SealevelriseDeltathickness")==0) return SealevelriseDeltathicknessEnum;
     542              else if (strcmp(name,"SealevelUEsaRate")==0) return SealevelUEsaRateEnum;
     543              else if (strcmp(name,"SealevelNEsaRate")==0) return SealevelNEsaRateEnum;
     544              else if (strcmp(name,"SealevelRSLRate")==0) return SealevelRSLRateEnum;
     545              else if (strcmp(name,"SealevelUEsa")==0) return SealevelUEsaEnum;
     546              else if (strcmp(name,"SealevelRSLEustaticRate")==0) return SealevelRSLEustaticRateEnum;
     547              else if (strcmp(name,"SealevelNEsa")==0) return SealevelNEsaEnum;
     548              else if (strcmp(name,"SealevelUGia")==0) return SealevelUGiaEnum;
     549              else if (strcmp(name,"SealevelNGia")==0) return SealevelNGiaEnum;
     550              else if (strcmp(name,"SealevelRSL")==0) return SealevelRSLEnum;
     551              else if (strcmp(name,"SealevelRSLEustatic")==0) return SealevelRSLEustaticEnum;
     552              else if (strcmp(name,"SealevelUNorthEsa")==0) return SealevelUNorthEsaEnum;
     553              else if (strcmp(name,"SealevelUEastEsa")==0) return SealevelUEastEsaEnum;
     554              else if (strcmp(name,"SealevelNGiaRate")==0) return SealevelNGiaRateEnum;
     555              else if (strcmp(name,"SealevelUGiaRate")==0) return SealevelUGiaRateEnum;
    556556              else if (strcmp(name,"SedimentHeadHydrostep")==0) return SedimentHeadHydrostepEnum;
    557557              else if (strcmp(name,"SedimentHeadOld")==0) return SedimentHeadOldEnum;
Note: See TracChangeset for help on using the changeset viewer.