Changeset 23857


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

    r23856 r23857  
    529529        GradientEnum,
    530530        GroundinglineHeightEnum,
     531        HydrologyBasalFluxEnum,
    531532        HydrologyBumpHeightEnum,
    532533        HydrologyBumpSpacingEnum,
    … …  
    606607        SealevelNGiaRateEnum,
    607608        SealevelUGiaRateEnum,
     609        SedimentHeadStackedEnum,
     610        SedimentHeadEnum,
    608611        SedimentHeadHydrostepEnum,
    609612        SedimentHeadOldEnum,
    … …  
    718721        SurfaceAreaEnum,
    719722        SurfaceAverageVelMisfitEnum,
     723        SurfaceCrevasseEnum,
    720724        SurfaceEnum,
    721725        SurfaceLogVelMisfitEnum,
    … …  
    887891        HOFSApproximationEnum,
    888892        HookEnum,
    889         HydrologyBasalFluxEnum,
    890893        HydrologyDCEfficientAnalysisEnum,
    891894        HydrologydcEnum,
    … …  
    11311134        SealevelriseStericRateEnum,
    11321135        SealevelUmotionEnum,
    1133         SedimentHeadStackedEnum,
    1134         SedimentHeadEnum,
    11351136        SegEnum,
    11361137        SegInputEnum,
    … …  
    11791180        SubelementMelt1Enum,
    11801181        SubelementMelt2Enum,
    1181         SurfaceCrevasseEnum,
    11821182        SurfaceSlopeSolutionEnum,
    11831183        TaylorHoodEnum,

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

    r23856 r23857  
    535535                case GradientEnum : return "Gradient";
    536536                case GroundinglineHeightEnum : return "GroundinglineHeight";
     537                case HydrologyBasalFluxEnum : return "HydrologyBasalFlux";
    537538                case HydrologyBumpHeightEnum : return "HydrologyBumpHeight";
    538539                case HydrologyBumpSpacingEnum : return "HydrologyBumpSpacing";
    … …  
    612613                case SealevelNGiaRateEnum : return "SealevelNGiaRate";
    613614                case SealevelUGiaRateEnum : return "SealevelUGiaRate";
     615                case SedimentHeadStackedEnum : return "SedimentHeadStacked";
     616                case SedimentHeadEnum : return "SedimentHead";
    614617                case SedimentHeadHydrostepEnum : return "SedimentHeadHydrostep";
    615618                case SedimentHeadOldEnum : return "SedimentHeadOld";
    … …  
    724727                case SurfaceAreaEnum : return "SurfaceArea";
    725728                case SurfaceAverageVelMisfitEnum : return "SurfaceAverageVelMisfit";
     729                case SurfaceCrevasseEnum : return "SurfaceCrevasse";
    726730                case SurfaceEnum : return "Surface";
    727731                case SurfaceLogVelMisfitEnum : return "SurfaceLogVelMisfit";
    … …  
    891895                case HOFSApproximationEnum : return "HOFSApproximation";
    892896                case HookEnum : return "Hook";
    893                 case HydrologyBasalFluxEnum : return "HydrologyBasalFlux";
    894897                case HydrologyDCEfficientAnalysisEnum : return "HydrologyDCEfficientAnalysis";
    895898                case HydrologydcEnum : return "Hydrologydc";
    … …  
    11351138                case SealevelriseStericRateEnum : return "SealevelriseStericRate";
    11361139                case SealevelUmotionEnum : return "SealevelUmotion";
    1137                 case SedimentHeadStackedEnum : return "SedimentHeadStacked";
    1138                 case SedimentHeadEnum : return "SedimentHead";
    11391140                case SegEnum : return "Seg";
    11401141                case SegInputEnum : return "SegInput";
    … …  
    11831184                case SubelementMelt1Enum : return "SubelementMelt1";
    11841185                case SubelementMelt2Enum : return "SubelementMelt2";
    1185                 case SurfaceCrevasseEnum : return "SurfaceCrevasse";
    11861186                case SurfaceSlopeSolutionEnum : return "SurfaceSlopeSolution";
    11871187                case TaylorHoodEnum : return "TaylorHood";

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

    r23856 r23857  
    547547              else if (strcmp(name,"Gradient")==0) return GradientEnum;
    548548              else if (strcmp(name,"GroundinglineHeight")==0) return GroundinglineHeightEnum;
     549              else if (strcmp(name,"HydrologyBasalFlux")==0) return HydrologyBasalFluxEnum;
    549550              else if (strcmp(name,"HydrologyBumpHeight")==0) return HydrologyBumpHeightEnum;
    550551              else if (strcmp(name,"HydrologyBumpSpacing")==0) return HydrologyBumpSpacingEnum;
    … …  
    624625              else if (strcmp(name,"SealevelNGiaRate")==0) return SealevelNGiaRateEnum;
    625626              else if (strcmp(name,"SealevelUGiaRate")==0) return SealevelUGiaRateEnum;
     627              else if (strcmp(name,"SedimentHeadStacked")==0) return SedimentHeadStackedEnum;
     628              else if (strcmp(name,"SedimentHead")==0) return SedimentHeadEnum;
    626629              else if (strcmp(name,"SedimentHeadHydrostep")==0) return SedimentHeadHydrostepEnum;
    627630              else if (strcmp(name,"SedimentHeadOld")==0) return SedimentHeadOldEnum;
    628               else if (strcmp(name,"SedimentHeadResidual")==0) return SedimentHeadResidualEnum;
    629               else if (strcmp(name,"SigmaNN")==0) return SigmaNNEnum;
    630               else if (strcmp(name,"SigmaVM")==0) return SigmaVMEnum;
    631631         else stage=6;
    632632   }
    633633   if(stage==6){
    634               if (strcmp(name,"SmbAccumulation")==0) return SmbAccumulationEnum;
     634              if (strcmp(name,"SedimentHeadResidual")==0) return SedimentHeadResidualEnum;
     635              else if (strcmp(name,"SigmaNN")==0) return SigmaNNEnum;
     636              else if (strcmp(name,"SigmaVM")==0) return SigmaVMEnum;
     637              else if (strcmp(name,"SmbAccumulation")==0) return SmbAccumulationEnum;
    635638              else if (strcmp(name,"SmbA")==0) return SmbAEnum;
    636639              else if (strcmp(name,"SmbAini")==0) return SmbAiniEnum;
    … …  
    739742              else if (strcmp(name,"SurfaceArea")==0) return SurfaceAreaEnum;
    740743              else if (strcmp(name,"SurfaceAverageVelMisfit")==0) return SurfaceAverageVelMisfitEnum;
     744              else if (strcmp(name,"SurfaceCrevasse")==0) return SurfaceCrevasseEnum;
    741745              else if (strcmp(name,"Surface")==0) return SurfaceEnum;
    742746              else if (strcmp(name,"SurfaceLogVelMisfit")==0) return SurfaceLogVelMisfitEnum;
    … …  
    748752              else if (strcmp(name,"Temperature")==0) return TemperatureEnum;
    749753              else if (strcmp(name,"TemperaturePicard")==0) return TemperaturePicardEnum;
    750               else if (strcmp(name,"TemperaturePDD")==0) return TemperaturePDDEnum;
     754         else stage=7;
     755   }
     756   if(stage==7){
     757              if (strcmp(name,"TemperaturePDD")==0) return TemperaturePDDEnum;
    751758              else if (strcmp(name,"TemperatureSEMIC")==0) return TemperatureSEMICEnum;
    752759              else if (strcmp(name,"ThermalSpctemperature")==0) return ThermalSpctemperatureEnum;
    753760              else if (strcmp(name,"ThicknessAbsGradient")==0) return ThicknessAbsGradientEnum;
    754          else stage=7;
    755    }
    756    if(stage==7){
    757               if (strcmp(name,"ThicknessAbsMisfit")==0) return ThicknessAbsMisfitEnum;
     761              else if (strcmp(name,"ThicknessAbsMisfit")==0) return ThicknessAbsMisfitEnum;
    758762              else if (strcmp(name,"ThicknessAcrossGradient")==0) return ThicknessAcrossGradientEnum;
    759763              else if (strcmp(name,"ThicknessAlongGradient")==0) return ThicknessAlongGradientEnum;
    … …  
    871875              else if (strcmp(name,"ExtrapolationAnalysis")==0) return ExtrapolationAnalysisEnum;
    872876              else if (strcmp(name,"ExtrudeFromBaseAnalysis")==0) return ExtrudeFromBaseAnalysisEnum;
    873               else if (strcmp(name,"ExtrudeFromTopAnalysis")==0) return ExtrudeFromTopAnalysisEnum;
     877         else stage=8;
     878   }
     879   if(stage==8){
     880              if (strcmp(name,"ExtrudeFromTopAnalysis")==0) return ExtrudeFromTopAnalysisEnum;
    874881              else if (strcmp(name,"FemModel")==0) return FemModelEnum;
    875882              else if (strcmp(name,"FileParam")==0) return FileParamEnum;
    876883              else if (strcmp(name,"FixedTimestepping")==0) return FixedTimesteppingEnum;
    877          else stage=8;
    878    }
    879    if(stage==8){
    880               if (strcmp(name,"FloatingArea")==0) return FloatingAreaEnum;
     884              else if (strcmp(name,"FloatingArea")==0) return FloatingAreaEnum;
    881885              else if (strcmp(name,"FloatingAreaScaled")==0) return FloatingAreaScaledEnum;
    882886              else if (strcmp(name,"FloatingMeltRate")==0) return FloatingMeltRateEnum;
    … …  
    912916              else if (strcmp(name,"HOFSApproximation")==0) return HOFSApproximationEnum;
    913917              else if (strcmp(name,"Hook")==0) return HookEnum;
    914               else if (strcmp(name,"HydrologyBasalFlux")==0) return HydrologyBasalFluxEnum;
    915918              else if (strcmp(name,"HydrologyDCEfficientAnalysis")==0) return HydrologyDCEfficientAnalysisEnum;
    916919              else if (strcmp(name,"Hydrologydc")==0) return HydrologydcEnum;
    … …  
    995998              else if (strcmp(name,"MeshY")==0) return MeshYEnum;
    996999              else if (strcmp(name,"MINIcondensed")==0) return MINIcondensedEnum;
    997               else if (strcmp(name,"MINI")==0) return MINIEnum;
    998               else if (strcmp(name,"MinVel")==0) return MinVelEnum;
    999               else if (strcmp(name,"MinVx")==0) return MinVxEnum;
    10001000         else stage=9;
    10011001   }
    10021002   if(stage==9){
    1003               if (strcmp(name,"MinVy")==0) return MinVyEnum;
     1003              if (strcmp(name,"MINI")==0) return MINIEnum;
     1004              else if (strcmp(name,"MinVel")==0) return MinVelEnum;
     1005              else if (strcmp(name,"MinVx")==0) return MinVxEnum;
     1006              else if (strcmp(name,"MinVy")==0) return MinVyEnum;
    10041007              else if (strcmp(name,"MinVz")==0) return MinVzEnum;
    10051008              else if (strcmp(name,"MismipFloatingMeltRate")==0) return MismipFloatingMeltRateEnum;
    … …  
    11181121              else if (strcmp(name,"Outputdefinition96")==0) return Outputdefinition96Enum;
    11191122              else if (strcmp(name,"Outputdefinition97")==0) return Outputdefinition97Enum;
    1120               else if (strcmp(name,"Outputdefinition98")==0) return Outputdefinition98Enum;
    1121               else if (strcmp(name,"Outputdefinition99")==0) return Outputdefinition99Enum;
    1122               else if (strcmp(name,"Outputdefinition9")==0) return Outputdefinition9Enum;
    11231123         else stage=10;
    11241124   }
    11251125   if(stage==10){
    1126               if (strcmp(name,"Outputdefinition100")==0) return Outputdefinition100Enum;
     1126              if (strcmp(name,"Outputdefinition98")==0) return Outputdefinition98Enum;
     1127              else if (strcmp(name,"Outputdefinition99")==0) return Outputdefinition99Enum;
     1128              else if (strcmp(name,"Outputdefinition9")==0) return Outputdefinition9Enum;
     1129              else if (strcmp(name,"Outputdefinition100")==0) return Outputdefinition100Enum;
    11271130              else if (strcmp(name,"P0Array")==0) return P0ArrayEnum;
    11281131              else if (strcmp(name,"P1bubblecondensed")==0) return P1bubblecondensedEnum;
    … …  
    11621165              else if (strcmp(name,"SealevelriseStericRate")==0) return SealevelriseStericRateEnum;
    11631166              else if (strcmp(name,"SealevelUmotion")==0) return SealevelUmotionEnum;
    1164               else if (strcmp(name,"SedimentHeadStacked")==0) return SedimentHeadStackedEnum;
    1165               else if (strcmp(name,"SedimentHead")==0) return SedimentHeadEnum;
    11661167              else if (strcmp(name,"Seg")==0) return SegEnum;
    11671168              else if (strcmp(name,"SegInput")==0) return SegInputEnum;
    … …  
    12101211              else if (strcmp(name,"SubelementMelt1")==0) return SubelementMelt1Enum;
    12111212              else if (strcmp(name,"SubelementMelt2")==0) return SubelementMelt2Enum;
    1212               else if (strcmp(name,"SurfaceCrevasse")==0) return SurfaceCrevasseEnum;
    12131213              else if (strcmp(name,"SurfaceSlopeSolution")==0) return SurfaceSlopeSolutionEnum;
    12141214              else if (strcmp(name,"TaylorHood")==0) return TaylorHoodEnum;
Note: See TracChangeset for help on using the changeset viewer.