Changeset 23866


Ignore:
Timestamp:
04/18/19 14:37:14 (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

    r23864 r23866  
    610610        SealevelRSLEustaticRateEnum,
    611611        SealevelriseSpcthicknessEnum,
     612        SealevelriseStericRateEnum,
    612613        SealevelNEsaEnum,
    613614        SealevelUGiaEnum,
    … …  
    11321133        SealevelriseAnalysisEnum,
    11331134        SealevelriseSolutionEnum,
    1134         SealevelriseStericRateEnum,
    11351135        SealevelUmotionEnum,
    11361136        SegEnum,

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

    r23864 r23866  
    616616                case SealevelRSLEustaticRateEnum : return "SealevelRSLEustaticRate";
    617617                case SealevelriseSpcthicknessEnum : return "SealevelriseSpcthickness";
     618                case SealevelriseStericRateEnum : return "SealevelriseStericRate";
    618619                case SealevelNEsaEnum : return "SealevelNEsa";
    619620                case SealevelUGiaEnum : return "SealevelUGia";
    … …  
    11361137                case SealevelriseAnalysisEnum : return "SealevelriseAnalysis";
    11371138                case SealevelriseSolutionEnum : return "SealevelriseSolution";
    1138                 case SealevelriseStericRateEnum : return "SealevelriseStericRate";
    11391139                case SealevelUmotionEnum : return "SealevelUmotion";
    11401140                case SegEnum : return "Seg";

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

    r23864 r23866  
    628628              else if (strcmp(name,"SealevelRSLEustaticRate")==0) return SealevelRSLEustaticRateEnum;
    629629              else if (strcmp(name,"SealevelriseSpcthickness")==0) return SealevelriseSpcthicknessEnum;
    630               else if (strcmp(name,"SealevelNEsa")==0) return SealevelNEsaEnum;
     630              else if (strcmp(name,"SealevelriseStericRate")==0) return SealevelriseStericRateEnum;
    631631         else stage=6;
    632632   }
    633633   if(stage==6){
    634               if (strcmp(name,"SealevelUGia")==0) return SealevelUGiaEnum;
     634              if (strcmp(name,"SealevelNEsa")==0) return SealevelNEsaEnum;
     635              else if (strcmp(name,"SealevelUGia")==0) return SealevelUGiaEnum;
    635636              else if (strcmp(name,"SealevelNGia")==0) return SealevelNGiaEnum;
    636637              else if (strcmp(name,"SealevelRSL")==0) return SealevelRSLEnum;
    … …  
    751752              else if (strcmp(name,"StressTensorzz")==0) return StressTensorzzEnum;
    752753              else if (strcmp(name,"SurfaceAbsMisfit")==0) return SurfaceAbsMisfitEnum;
    753               else if (strcmp(name,"SurfaceAbsVelMisfit")==0) return SurfaceAbsVelMisfitEnum;
    754754         else stage=7;
    755755   }
    756756   if(stage==7){
    757               if (strcmp(name,"SurfaceArea")==0) return SurfaceAreaEnum;
     757              if (strcmp(name,"SurfaceAbsVelMisfit")==0) return SurfaceAbsVelMisfitEnum;
     758              else if (strcmp(name,"SurfaceArea")==0) return SurfaceAreaEnum;
    758759              else if (strcmp(name,"SurfaceAverageVelMisfit")==0) return SurfaceAverageVelMisfitEnum;
    759760              else if (strcmp(name,"SurfaceCrevasse")==0) return SurfaceCrevasseEnum;
    … …  
    874875              else if (strcmp(name,"Outputdefinition79")==0) return Outputdefinition79Enum;
    875876              else if (strcmp(name,"Outputdefinition7")==0) return Outputdefinition7Enum;
    876               else if (strcmp(name,"Outputdefinition80")==0) return Outputdefinition80Enum;
    877877         else stage=8;
    878878   }
    879879   if(stage==8){
    880               if (strcmp(name,"Outputdefinition81")==0) return Outputdefinition81Enum;
     880              if (strcmp(name,"Outputdefinition80")==0) return Outputdefinition80Enum;
     881              else if (strcmp(name,"Outputdefinition81")==0) return Outputdefinition81Enum;
    881882              else if (strcmp(name,"Outputdefinition82")==0) return Outputdefinition82Enum;
    882883              else if (strcmp(name,"Outputdefinition83")==0) return Outputdefinition83Enum;
    … …  
    997998              else if (strcmp(name,"Fset")==0) return FsetEnum;
    998999              else if (strcmp(name,"FSpressure")==0) return FSpressureEnum;
    999               else if (strcmp(name,"FSSolver")==0) return FSSolverEnum;
    10001000         else stage=9;
    10011001   }
    10021002   if(stage==9){
    1003               if (strcmp(name,"FSvelocity")==0) return FSvelocityEnum;
     1003              if (strcmp(name,"FSSolver")==0) return FSSolverEnum;
     1004              else if (strcmp(name,"FSvelocity")==0) return FSvelocityEnum;
    10041005              else if (strcmp(name,"FullMeltOnPartiallyFloating")==0) return FullMeltOnPartiallyFloatingEnum;
    10051006              else if (strcmp(name,"GaussPenta")==0) return GaussPentaEnum;
    … …  
    11201121              else if (strcmp(name,"None")==0) return NoneEnum;
    11211122              else if (strcmp(name,"Numberedcostfunction")==0) return NumberedcostfunctionEnum;
    1122               else if (strcmp(name,"Numericalflux")==0) return NumericalfluxEnum;
    11231123         else stage=10;
    11241124   }
    11251125   if(stage==10){
    1126               if (strcmp(name,"OldGradient")==0) return OldGradientEnum;
     1126              if (strcmp(name,"Numericalflux")==0) return NumericalfluxEnum;
     1127              else if (strcmp(name,"OldGradient")==0) return OldGradientEnum;
    11271128              else if (strcmp(name,"OneLayerP4z")==0) return OneLayerP4zEnum;
    11281129              else if (strcmp(name,"Open")==0) return OpenEnum;
    … …  
    11631164              else if (strcmp(name,"SealevelriseAnalysis")==0) return SealevelriseAnalysisEnum;
    11641165              else if (strcmp(name,"SealevelriseSolution")==0) return SealevelriseSolutionEnum;
    1165               else if (strcmp(name,"SealevelriseStericRate")==0) return SealevelriseStericRateEnum;
    11661166              else if (strcmp(name,"SealevelUmotion")==0) return SealevelUmotionEnum;
    11671167              else if (strcmp(name,"Seg")==0) return SegEnum;
Note: See TracChangeset for help on using the changeset viewer.