Changeset 23861


Ignore:
Timestamp:
04/17/19 14:53:42 (6 years ago)
Author:
Mathieu Morlighem
Message:

BUG: fixgin enum order

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

Legend:

Unmodified
Added
Removed

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

    r23859 r23861  
    545545        HydrologydcSedimentTransmitivityEnum,
    546546        HydrologyEnglacialInputEnum,
     547        HydrologydcEplThicknessStackedEnum,
     548        HydrologydcEplThicknessEnum,
    547549        HydrologyGapHeightEnum,
    548550        HydrologyHeadEnum,
    … …  
    893895        HydrologyDCEfficientAnalysisEnum,
    894896        HydrologydcEnum,
    895         HydrologydcEplThicknessStackedEnum,
    896         HydrologydcEplThicknessEnum,
    897897        HydrologyDCInefficientAnalysisEnum,
    898898        HydrologyShreveAnalysisEnum,

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

    r23859 r23861  
    551551                case HydrologydcSedimentTransmitivityEnum : return "HydrologydcSedimentTransmitivity";
    552552                case HydrologyEnglacialInputEnum : return "HydrologyEnglacialInput";
     553                case HydrologydcEplThicknessStackedEnum : return "HydrologydcEplThicknessStacked";
     554                case HydrologydcEplThicknessEnum : return "HydrologydcEplThickness";
    553555                case HydrologyGapHeightEnum : return "HydrologyGapHeight";
    554556                case HydrologyHeadEnum : return "HydrologyHead";
    … …  
    897899                case HydrologyDCEfficientAnalysisEnum : return "HydrologyDCEfficientAnalysis";
    898900                case HydrologydcEnum : return "Hydrologydc";
    899                 case HydrologydcEplThicknessStackedEnum : return "HydrologydcEplThicknessStacked";
    900                 case HydrologydcEplThicknessEnum : return "HydrologydcEplThickness";
    901901                case HydrologyDCInefficientAnalysisEnum : return "HydrologyDCInefficientAnalysis";
    902902                case HydrologyShreveAnalysisEnum : return "HydrologyShreveAnalysis";

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

    r23859 r23861  
    563563              else if (strcmp(name,"HydrologydcSedimentTransmitivity")==0) return HydrologydcSedimentTransmitivityEnum;
    564564              else if (strcmp(name,"HydrologyEnglacialInput")==0) return HydrologyEnglacialInputEnum;
     565              else if (strcmp(name,"HydrologydcEplThicknessStacked")==0) return HydrologydcEplThicknessStackedEnum;
     566              else if (strcmp(name,"HydrologydcEplThickness")==0) return HydrologydcEplThicknessEnum;
    565567              else if (strcmp(name,"HydrologyGapHeight")==0) return HydrologyGapHeightEnum;
    566568              else if (strcmp(name,"HydrologyHead")==0) return HydrologyHeadEnum;
    … …  
    627629              else if (strcmp(name,"SealevelUNorthEsa")==0) return SealevelUNorthEsaEnum;
    628630              else if (strcmp(name,"SealevelUEastEsa")==0) return SealevelUEastEsaEnum;
    629               else if (strcmp(name,"SealevelNGiaRate")==0) return SealevelNGiaRateEnum;
    630               else if (strcmp(name,"SealevelUGiaRate")==0) return SealevelUGiaRateEnum;
    631631         else stage=6;
    632632   }
    633633   if(stage==6){
    634               if (strcmp(name,"SedimentHeadStacked")==0) return SedimentHeadStackedEnum;
     634              if (strcmp(name,"SealevelNGiaRate")==0) return SealevelNGiaRateEnum;
     635              else if (strcmp(name,"SealevelUGiaRate")==0) return SealevelUGiaRateEnum;
     636              else if (strcmp(name,"SedimentHeadStacked")==0) return SedimentHeadStackedEnum;
    635637              else if (strcmp(name,"SedimentHead")==0) return SedimentHeadEnum;
    636638              else if (strcmp(name,"SedimentHeadHydrostep")==0) return SedimentHeadHydrostepEnum;
    … …  
    750752              else if (strcmp(name,"SurfaceLogVelMisfit")==0) return SurfaceLogVelMisfitEnum;
    751753              else if (strcmp(name,"SurfaceLogVxVyMisfit")==0) return SurfaceLogVxVyMisfitEnum;
    752               else if (strcmp(name,"SurfaceObservation")==0) return SurfaceObservationEnum;
    753               else if (strcmp(name,"SurfaceRelVelMisfit")==0) return SurfaceRelVelMisfitEnum;
    754754         else stage=7;
    755755   }
    756756   if(stage==7){
    757               if (strcmp(name,"SurfaceSlopeX")==0) return SurfaceSlopeXEnum;
     757              if (strcmp(name,"SurfaceObservation")==0) return SurfaceObservationEnum;
     758              else if (strcmp(name,"SurfaceRelVelMisfit")==0) return SurfaceRelVelMisfitEnum;
     759              else if (strcmp(name,"SurfaceSlopeX")==0) return SurfaceSlopeXEnum;
    758760              else if (strcmp(name,"SurfaceSlopeY")==0) return SurfaceSlopeYEnum;
    759761              else if (strcmp(name,"Temperature")==0) return TemperatureEnum;
    … …  
    873875              else if (strcmp(name,"EsaTransitions")==0) return EsaTransitionsEnum;
    874876              else if (strcmp(name,"ExternalResult")==0) return ExternalResultEnum;
    875               else if (strcmp(name,"ExtrapolationAnalysis")==0) return ExtrapolationAnalysisEnum;
    876               else if (strcmp(name,"ExtrudeFromBaseAnalysis")==0) return ExtrudeFromBaseAnalysisEnum;
    877877         else stage=8;
    878878   }
    879879   if(stage==8){
    880               if (strcmp(name,"ExtrudeFromTopAnalysis")==0) return ExtrudeFromTopAnalysisEnum;
     880              if (strcmp(name,"ExtrapolationAnalysis")==0) return ExtrapolationAnalysisEnum;
     881              else if (strcmp(name,"ExtrudeFromBaseAnalysis")==0) return ExtrudeFromBaseAnalysisEnum;
     882              else if (strcmp(name,"ExtrudeFromTopAnalysis")==0) return ExtrudeFromTopAnalysisEnum;
    881883              else if (strcmp(name,"FemModel")==0) return FemModelEnum;
    882884              else if (strcmp(name,"FileParam")==0) return FileParamEnum;
    … …  
    918920              else if (strcmp(name,"HydrologyDCEfficientAnalysis")==0) return HydrologyDCEfficientAnalysisEnum;
    919921              else if (strcmp(name,"Hydrologydc")==0) return HydrologydcEnum;
    920               else if (strcmp(name,"HydrologydcEplThicknessStacked")==0) return HydrologydcEplThicknessStackedEnum;
    921               else if (strcmp(name,"HydrologydcEplThickness")==0) return HydrologydcEplThicknessEnum;
    922922              else if (strcmp(name,"HydrologyDCInefficientAnalysis")==0) return HydrologyDCInefficientAnalysisEnum;
    923923              else if (strcmp(name,"HydrologyShreveAnalysis")==0) return HydrologyShreveAnalysisEnum;
Note: See TracChangeset for help on using the changeset viewer.