Changeset 21385


Ignore:
Timestamp:
11/17/16 09:28:53 (8 years ago)
Author:
Mathieu Morlighem
Message:

CHG: fixing enums

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

Legend:

Unmodified
Added
Removed

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

    r21344 r21385  
    220220                case MaterialsRheologyLawEnum : return "MaterialsRheologyLaw";
    221221                case MaterialsRheologyNEnum : return "MaterialsRheologyN";
    222                 case MaterialsRheologyKoEnum : return "MaterialsRheologyKo";
    223                 case MaterialsRheologyKobarEnum : return "MaterialsRheologyKobar";
    224222                case MaterialsRheologyEcEnum : return "MaterialsRheologyEc";
    225223                case MaterialsRheologyEcbarEnum : return "MaterialsRheologyEcbar";

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

    r21344 r21385  
    223223              else if (strcmp(name,"MaterialsRheologyLaw")==0) return MaterialsRheologyLawEnum;
    224224              else if (strcmp(name,"MaterialsRheologyN")==0) return MaterialsRheologyNEnum;
    225               else if (strcmp(name,"MaterialsRheologyKo")==0) return MaterialsRheologyKoEnum;
    226               else if (strcmp(name,"MaterialsRheologyKobar")==0) return MaterialsRheologyKobarEnum;
    227225              else if (strcmp(name,"MaterialsRheologyEc")==0) return MaterialsRheologyEcEnum;
    228226              else if (strcmp(name,"MaterialsRheologyEcbar")==0) return MaterialsRheologyEcbarEnum;
    … …  
    260258              else if (strcmp(name,"CalvinglevermannMeltingrate")==0) return CalvinglevermannMeltingrateEnum;
    261259              else if (strcmp(name,"CalvingdevCoeff")==0) return CalvingdevCoeffEnum;
     260              else if (strcmp(name,"Calvingratex")==0) return CalvingratexEnum;
     261              else if (strcmp(name,"Calvingratey")==0) return CalvingrateyEnum;
    262262         else stage=3;
    263263   }
    264264   if(stage==3){
    265               if (strcmp(name,"Calvingratex")==0) return CalvingratexEnum;
    266               else if (strcmp(name,"Calvingratey")==0) return CalvingrateyEnum;
    267               else if (strcmp(name,"CalvingratexAverage")==0) return CalvingratexAverageEnum;
     265              if (strcmp(name,"CalvingratexAverage")==0) return CalvingratexAverageEnum;
    268266              else if (strcmp(name,"CalvingrateyAverage")==0) return CalvingrateyAverageEnum;
    269267              else if (strcmp(name,"StrainRateparallel")==0) return StrainRateparallelEnum;
    … …  
    383381              else if (strcmp(name,"SmbSizeini")==0) return SmbSizeiniEnum;
    384382              else if (strcmp(name,"SMBforcing")==0) return SMBforcingEnum;
     383              else if (strcmp(name,"SmbMassBalance")==0) return SmbMassBalanceEnum;
     384              else if (strcmp(name,"SMBgemb")==0) return SMBgembEnum;
    385385         else stage=4;
    386386   }
    387387   if(stage==4){
    388               if (strcmp(name,"SmbMassBalance")==0) return SmbMassBalanceEnum;
    389               else if (strcmp(name,"SMBgemb")==0) return SMBgembEnum;
    390               else if (strcmp(name,"SmbInitDensityScaling")==0) return SmbInitDensityScalingEnum;
     388              if (strcmp(name,"SmbInitDensityScaling")==0) return SmbInitDensityScalingEnum;
    391389              else if (strcmp(name,"SmbTa")==0) return SmbTaEnum;
    392390              else if (strcmp(name,"SmbV")==0) return SmbVEnum;
    … …  
    506504              else if (strcmp(name,"VxAverage")==0) return VxAverageEnum;
    507505              else if (strcmp(name,"Vx")==0) return VxEnum;
     506              else if (strcmp(name,"VxPicard")==0) return VxPicardEnum;
     507              else if (strcmp(name,"VyAverage")==0) return VyAverageEnum;
    508508         else stage=5;
    509509   }
    510510   if(stage==5){
    511               if (strcmp(name,"VxPicard")==0) return VxPicardEnum;
    512               else if (strcmp(name,"VyAverage")==0) return VyAverageEnum;
    513               else if (strcmp(name,"Vy")==0) return VyEnum;
     511              if (strcmp(name,"Vy")==0) return VyEnum;
    514512              else if (strcmp(name,"VyPicard")==0) return VyPicardEnum;
    515513              else if (strcmp(name,"Vz")==0) return VzEnum;
    … …  
    629627              else if (strcmp(name,"Outputdefinition46")==0) return Outputdefinition46Enum;
    630628              else if (strcmp(name,"Outputdefinition47")==0) return Outputdefinition47Enum;
     629              else if (strcmp(name,"Outputdefinition48")==0) return Outputdefinition48Enum;
     630              else if (strcmp(name,"Outputdefinition49")==0) return Outputdefinition49Enum;
    631631         else stage=6;
    632632   }
    633633   if(stage==6){
    634               if (strcmp(name,"Outputdefinition48")==0) return Outputdefinition48Enum;
    635               else if (strcmp(name,"Outputdefinition49")==0) return Outputdefinition49Enum;
    636               else if (strcmp(name,"Outputdefinition50")==0) return Outputdefinition50Enum;
     634              if (strcmp(name,"Outputdefinition50")==0) return Outputdefinition50Enum;
    637635              else if (strcmp(name,"Outputdefinition51")==0) return Outputdefinition51Enum;
    638636              else if (strcmp(name,"Outputdefinition52")==0) return Outputdefinition52Enum;
    … …  
    752750              else if (strcmp(name,"LliboutryDuval")==0) return LliboutryDuvalEnum;
    753751              else if (strcmp(name,"ExtrapolationVariable")==0) return ExtrapolationVariableEnum;
     752              else if (strcmp(name,"IceMaskNodeActivation")==0) return IceMaskNodeActivationEnum;
     753              else if (strcmp(name,"LevelsetfunctionSlopeX")==0) return LevelsetfunctionSlopeXEnum;
    754754         else stage=7;
    755755   }
    756756   if(stage==7){
    757               if (strcmp(name,"IceMaskNodeActivation")==0) return IceMaskNodeActivationEnum;
    758               else if (strcmp(name,"LevelsetfunctionSlopeX")==0) return LevelsetfunctionSlopeXEnum;
    759               else if (strcmp(name,"LevelsetfunctionSlopeY")==0) return LevelsetfunctionSlopeYEnum;
     757              if (strcmp(name,"LevelsetfunctionSlopeY")==0) return LevelsetfunctionSlopeYEnum;
    760758              else if (strcmp(name,"LevelsetfunctionPicard")==0) return LevelsetfunctionPicardEnum;
    761759              else if (strcmp(name,"LevelsetReinitFrequency")==0) return LevelsetReinitFrequencyEnum;
    … …  
    875873              else if (strcmp(name,"L2ProjectionEPLAnalysis")==0) return L2ProjectionEPLAnalysisEnum;
    876874              else if (strcmp(name,"L2ProjectionBaseAnalysis")==0) return L2ProjectionBaseAnalysisEnum;
     875              else if (strcmp(name,"BedSlopeSolution")==0) return BedSlopeSolutionEnum;
     876              else if (strcmp(name,"DamageEvolutionSolution")==0) return DamageEvolutionSolutionEnum;
    877877         else stage=8;
    878878   }
    879879   if(stage==8){
    880               if (strcmp(name,"BedSlopeSolution")==0) return BedSlopeSolutionEnum;
    881               else if (strcmp(name,"DamageEvolutionSolution")==0) return DamageEvolutionSolutionEnum;
    882               else if (strcmp(name,"DamageEvolutionAnalysis")==0) return DamageEvolutionAnalysisEnum;
     880              if (strcmp(name,"DamageEvolutionAnalysis")==0) return DamageEvolutionAnalysisEnum;
    883881              else if (strcmp(name,"StressbalanceAnalysis")==0) return StressbalanceAnalysisEnum;
    884882              else if (strcmp(name,"StressbalanceSIAAnalysis")==0) return StressbalanceSIAAnalysisEnum;
Note: See TracChangeset for help on using the changeset viewer.