Changeset 23859


Ignore:
Timestamp:
04/17/19 12:57:50 (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

    r23857 r23859  
    442442        BalancethicknessOmegaEnum,
    443443        BalancethicknessThickeningRateEnum,
     444        BasalCrevasseEnum,
    444445        BasalforcingsFloatingiceMeltingRateEnum,
    445446        BasalforcingsGeothermalfluxEnum,
    … …  
    474475        DamageDEnum,
    475476        DamageFEnum,
     477        DegreeOfChannelizationEnum,
    476478        DeviatoricStresseffectiveEnum,
    477479        DeviatoricStressxxEnum,
    … …  
    494496        EnthalpyEnum,
    495497        EnthalpyPicardEnum,
     498        EplHeadStackedEnum,
     499        EplHeadEnum,
    496500        EplHeadHydrostepEnum,
    497501        EplHeadOldEnum,
    … …  
    785789        BalancevelocityAnalysisEnum,
    786790        BalancevelocitySolutionEnum,
    787         BasalCrevasseEnum,
    788791        BasalforcingsIsmip6Enum,
    789792        BasalforcingsPicoEnum,
    … …  
    822825        DefaultAnalysisEnum,
    823826        DefaultCalvingEnum,
    824         DegreeOfChannelizationEnum,
    825827        DenseEnum,
    826828        DependentObjectEnum,
    … …  
    841843        ElementSIdEnum,
    842844        EnthalpyAnalysisEnum,
    843         EplHeadStackedEnum,
    844         EplHeadEnum,
    845845        EsaAnalysisEnum,
    846846        EsaRotationrateEnum,

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

    r23857 r23859  
    448448                case BalancethicknessOmegaEnum : return "BalancethicknessOmega";
    449449                case BalancethicknessThickeningRateEnum : return "BalancethicknessThickeningRate";
     450                case BasalCrevasseEnum : return "BasalCrevasse";
    450451                case BasalforcingsFloatingiceMeltingRateEnum : return "BasalforcingsFloatingiceMeltingRate";
    451452                case BasalforcingsGeothermalfluxEnum : return "BasalforcingsGeothermalflux";
    … …  
    480481                case DamageDEnum : return "DamageD";
    481482                case DamageFEnum : return "DamageF";
     483                case DegreeOfChannelizationEnum : return "DegreeOfChannelization";
    482484                case DeviatoricStresseffectiveEnum : return "DeviatoricStresseffective";
    483485                case DeviatoricStressxxEnum : return "DeviatoricStressxx";
    … …  
    500502                case EnthalpyEnum : return "Enthalpy";
    501503                case EnthalpyPicardEnum : return "EnthalpyPicard";
     504                case EplHeadStackedEnum : return "EplHeadStacked";
     505                case EplHeadEnum : return "EplHead";
    502506                case EplHeadHydrostepEnum : return "EplHeadHydrostep";
    503507                case EplHeadOldEnum : return "EplHeadOld";
    … …  
    789793                case BalancevelocityAnalysisEnum : return "BalancevelocityAnalysis";
    790794                case BalancevelocitySolutionEnum : return "BalancevelocitySolution";
    791                 case BasalCrevasseEnum : return "BasalCrevasse";
    792795                case BasalforcingsIsmip6Enum : return "BasalforcingsIsmip6";
    793796                case BasalforcingsPicoEnum : return "BasalforcingsPico";
    … …  
    826829                case DefaultAnalysisEnum : return "DefaultAnalysis";
    827830                case DefaultCalvingEnum : return "DefaultCalving";
    828                 case DegreeOfChannelizationEnum : return "DegreeOfChannelization";
    829831                case DenseEnum : return "Dense";
    830832                case DependentObjectEnum : return "DependentObject";
    … …  
    845847                case ElementSIdEnum : return "ElementSId";
    846848                case EnthalpyAnalysisEnum : return "EnthalpyAnalysis";
    847                 case EplHeadStackedEnum : return "EplHeadStacked";
    848                 case EplHeadEnum : return "EplHead";
    849849                case EsaAnalysisEnum : return "EsaAnalysis";
    850850                case EsaRotationrateEnum : return "EsaRotationrate";

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

    r23857 r23859  
    457457              else if (strcmp(name,"BalancethicknessOmega")==0) return BalancethicknessOmegaEnum;
    458458              else if (strcmp(name,"BalancethicknessThickeningRate")==0) return BalancethicknessThickeningRateEnum;
     459              else if (strcmp(name,"BasalCrevasse")==0) return BasalCrevasseEnum;
    459460              else if (strcmp(name,"BasalforcingsFloatingiceMeltingRate")==0) return BasalforcingsFloatingiceMeltingRateEnum;
    460461              else if (strcmp(name,"BasalforcingsGeothermalflux")==0) return BasalforcingsGeothermalfluxEnum;
    … …  
    489490              else if (strcmp(name,"DamageD")==0) return DamageDEnum;
    490491              else if (strcmp(name,"DamageF")==0) return DamageFEnum;
     492              else if (strcmp(name,"DegreeOfChannelization")==0) return DegreeOfChannelizationEnum;
    491493              else if (strcmp(name,"DeviatoricStresseffective")==0) return DeviatoricStresseffectiveEnum;
    492494              else if (strcmp(name,"DeviatoricStressxx")==0) return DeviatoricStressxxEnum;
    … …  
    504506              else if (strcmp(name,"DrivingStressX")==0) return DrivingStressXEnum;
    505507              else if (strcmp(name,"DrivingStressY")==0) return DrivingStressYEnum;
    506               else if (strcmp(name,"EffectivePressureHydrostep")==0) return EffectivePressureHydrostepEnum;
    507               else if (strcmp(name,"EffectivePressureStacked")==0) return EffectivePressureStackedEnum;
    508508         else stage=5;
    509509   }
    510510   if(stage==5){
    511               if (strcmp(name,"EffectivePressure")==0) return EffectivePressureEnum;
     511              if (strcmp(name,"EffectivePressureHydrostep")==0) return EffectivePressureHydrostepEnum;
     512              else if (strcmp(name,"EffectivePressureStacked")==0) return EffectivePressureStackedEnum;
     513              else if (strcmp(name,"EffectivePressure")==0) return EffectivePressureEnum;
    512514              else if (strcmp(name,"Enthalpy")==0) return EnthalpyEnum;
    513515              else if (strcmp(name,"EnthalpyPicard")==0) return EnthalpyPicardEnum;
     516              else if (strcmp(name,"EplHeadStacked")==0) return EplHeadStackedEnum;
     517              else if (strcmp(name,"EplHead")==0) return EplHeadEnum;
    514518              else if (strcmp(name,"EplHeadHydrostep")==0) return EplHeadHydrostepEnum;
    515519              else if (strcmp(name,"EplHeadOld")==0) return EplHeadOldEnum;
    … …  
    625629              else if (strcmp(name,"SealevelNGiaRate")==0) return SealevelNGiaRateEnum;
    626630              else if (strcmp(name,"SealevelUGiaRate")==0) return SealevelUGiaRateEnum;
    627               else if (strcmp(name,"SedimentHeadStacked")==0) return SedimentHeadStackedEnum;
     631         else stage=6;
     632   }
     633   if(stage==6){
     634              if (strcmp(name,"SedimentHeadStacked")==0) return SedimentHeadStackedEnum;
    628635              else if (strcmp(name,"SedimentHead")==0) return SedimentHeadEnum;
    629636              else if (strcmp(name,"SedimentHeadHydrostep")==0) return SedimentHeadHydrostepEnum;
    630637              else if (strcmp(name,"SedimentHeadOld")==0) return SedimentHeadOldEnum;
    631          else stage=6;
    632    }
    633    if(stage==6){
    634               if (strcmp(name,"SedimentHeadResidual")==0) return SedimentHeadResidualEnum;
     638              else if (strcmp(name,"SedimentHeadResidual")==0) return SedimentHeadResidualEnum;
    635639              else if (strcmp(name,"SigmaNN")==0) return SigmaNNEnum;
    636640              else if (strcmp(name,"SigmaVM")==0) return SigmaVMEnum;
    … …  
    748752              else if (strcmp(name,"SurfaceObservation")==0) return SurfaceObservationEnum;
    749753              else if (strcmp(name,"SurfaceRelVelMisfit")==0) return SurfaceRelVelMisfitEnum;
    750               else if (strcmp(name,"SurfaceSlopeX")==0) return SurfaceSlopeXEnum;
     754         else stage=7;
     755   }
     756   if(stage==7){
     757              if (strcmp(name,"SurfaceSlopeX")==0) return SurfaceSlopeXEnum;
    751758              else if (strcmp(name,"SurfaceSlopeY")==0) return SurfaceSlopeYEnum;
    752759              else if (strcmp(name,"Temperature")==0) return TemperatureEnum;
    753760              else if (strcmp(name,"TemperaturePicard")==0) return TemperaturePicardEnum;
    754          else stage=7;
    755    }
    756    if(stage==7){
    757               if (strcmp(name,"TemperaturePDD")==0) return TemperaturePDDEnum;
     761              else if (strcmp(name,"TemperaturePDD")==0) return TemperaturePDDEnum;
    758762              else if (strcmp(name,"TemperatureSEMIC")==0) return TemperatureSEMICEnum;
    759763              else if (strcmp(name,"ThermalSpctemperature")==0) return ThermalSpctemperatureEnum;
    … …  
    807811              else if (strcmp(name,"BalancevelocityAnalysis")==0) return BalancevelocityAnalysisEnum;
    808812              else if (strcmp(name,"BalancevelocitySolution")==0) return BalancevelocitySolutionEnum;
    809               else if (strcmp(name,"BasalCrevasse")==0) return BasalCrevasseEnum;
    810813              else if (strcmp(name,"BasalforcingsIsmip6")==0) return BasalforcingsIsmip6Enum;
    811814              else if (strcmp(name,"BasalforcingsPico")==0) return BasalforcingsPicoEnum;
    … …  
    844847              else if (strcmp(name,"DefaultAnalysis")==0) return DefaultAnalysisEnum;
    845848              else if (strcmp(name,"DefaultCalving")==0) return DefaultCalvingEnum;
    846               else if (strcmp(name,"DegreeOfChannelization")==0) return DegreeOfChannelizationEnum;
    847849              else if (strcmp(name,"Dense")==0) return DenseEnum;
    848850              else if (strcmp(name,"DependentObject")==0) return DependentObjectEnum;
    … …  
    863865              else if (strcmp(name,"ElementSId")==0) return ElementSIdEnum;
    864866              else if (strcmp(name,"EnthalpyAnalysis")==0) return EnthalpyAnalysisEnum;
    865               else if (strcmp(name,"EplHeadStacked")==0) return EplHeadStackedEnum;
    866               else if (strcmp(name,"EplHead")==0) return EplHeadEnum;
    867867              else if (strcmp(name,"EsaAnalysis")==0) return EsaAnalysisEnum;
    868868              else if (strcmp(name,"EsaRotationrate")==0) return EsaRotationrateEnum;
Note: See TracChangeset for help on using the changeset viewer.