Changeset 21464


Ignore:
Timestamp:
01/04/17 10:36:45 (8 years ago)
Author:
Mathieu Morlighem
Message:

CHG: syncing 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

    r21389 r21464  
    180180                case HydrologyReynoldsEnum : return "HydrologyReynolds";
    181181                case HydrologyNeumannfluxEnum : return "HydrologyNeumannflux";
     182                case HydrologyRelaxationEnum : return "HydrologyRelaxation";
     183                case HydrologyBasalFluxEnum : return "HydrologyBasalFlux";
    182184                case InversionControlParametersEnum : return "InversionControlParameters";
    183185                case InversionControlScalingFactorsEnum : return "InversionControlScalingFactors";

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

    r21389 r21464  
    183183              else if (strcmp(name,"HydrologyReynolds")==0) return HydrologyReynoldsEnum;
    184184              else if (strcmp(name,"HydrologyNeumannflux")==0) return HydrologyNeumannfluxEnum;
     185              else if (strcmp(name,"HydrologyRelaxation")==0) return HydrologyRelaxationEnum;
     186              else if (strcmp(name,"HydrologyBasalFlux")==0) return HydrologyBasalFluxEnum;
    185187              else if (strcmp(name,"InversionControlParameters")==0) return InversionControlParametersEnum;
    186188              else if (strcmp(name,"InversionControlScalingFactors")==0) return InversionControlScalingFactorsEnum;
    … …  
    258260              else if (strcmp(name,"DefaultCalving")==0) return DefaultCalvingEnum;
    259261              else if (strcmp(name,"CalvinglevermannCoeff")==0) return CalvinglevermannCoeffEnum;
    260               else if (strcmp(name,"CalvinglevermannMeltingrate")==0) return CalvinglevermannMeltingrateEnum;
    261               else if (strcmp(name,"CalvingdevCoeff")==0) return CalvingdevCoeffEnum;
    262262         else stage=3;
    263263   }
    264264   if(stage==3){
    265               if (strcmp(name,"Calvingratex")==0) return CalvingratexEnum;
     265              if (strcmp(name,"CalvinglevermannMeltingrate")==0) return CalvinglevermannMeltingrateEnum;
     266              else if (strcmp(name,"CalvingdevCoeff")==0) return CalvingdevCoeffEnum;
     267              else if (strcmp(name,"Calvingratex")==0) return CalvingratexEnum;
    266268              else if (strcmp(name,"Calvingratey")==0) return CalvingrateyEnum;
    267269              else if (strcmp(name,"CalvingratexAverage")==0) return CalvingratexAverageEnum;
    … …  
    381383              else if (strcmp(name,"SmbAini")==0) return SmbAiniEnum;
    382384              else if (strcmp(name,"SmbTini")==0) return SmbTiniEnum;
    383               else if (strcmp(name,"SmbSizeini")==0) return SmbSizeiniEnum;
    384               else if (strcmp(name,"SMBforcing")==0) return SMBforcingEnum;
    385385         else stage=4;
    386386   }
    387387   if(stage==4){
    388               if (strcmp(name,"SmbMassBalance")==0) return SmbMassBalanceEnum;
     388              if (strcmp(name,"SmbSizeini")==0) return SmbSizeiniEnum;
     389              else if (strcmp(name,"SMBforcing")==0) return SMBforcingEnum;
     390              else if (strcmp(name,"SmbMassBalance")==0) return SmbMassBalanceEnum;
    389391              else if (strcmp(name,"SMBgemb")==0) return SMBgembEnum;
    390392              else if (strcmp(name,"SmbInitDensityScaling")==0) return SmbInitDensityScalingEnum;
    … …  
    504506              else if (strcmp(name,"Vel")==0) return VelEnum;
    505507              else if (strcmp(name,"Velocity")==0) return VelocityEnum;
    506               else if (strcmp(name,"VxAverage")==0) return VxAverageEnum;
    507               else if (strcmp(name,"Vx")==0) return VxEnum;
    508508         else stage=5;
    509509   }
    510510   if(stage==5){
    511               if (strcmp(name,"VxPicard")==0) return VxPicardEnum;
     511              if (strcmp(name,"VxAverage")==0) return VxAverageEnum;
     512              else if (strcmp(name,"Vx")==0) return VxEnum;
     513              else if (strcmp(name,"VxPicard")==0) return VxPicardEnum;
    512514              else if (strcmp(name,"VyAverage")==0) return VyAverageEnum;
    513515              else if (strcmp(name,"Vy")==0) return VyEnum;
    … …  
    627629              else if (strcmp(name,"Outputdefinition44")==0) return Outputdefinition44Enum;
    628630              else if (strcmp(name,"Outputdefinition45")==0) return Outputdefinition45Enum;
    629               else if (strcmp(name,"Outputdefinition46")==0) return Outputdefinition46Enum;
    630               else if (strcmp(name,"Outputdefinition47")==0) return Outputdefinition47Enum;
    631631         else stage=6;
    632632   }
    633633   if(stage==6){
    634               if (strcmp(name,"Outputdefinition48")==0) return Outputdefinition48Enum;
     634              if (strcmp(name,"Outputdefinition46")==0) return Outputdefinition46Enum;
     635              else if (strcmp(name,"Outputdefinition47")==0) return Outputdefinition47Enum;
     636              else if (strcmp(name,"Outputdefinition48")==0) return Outputdefinition48Enum;
    635637              else if (strcmp(name,"Outputdefinition49")==0) return Outputdefinition49Enum;
    636638              else if (strcmp(name,"Outputdefinition50")==0) return Outputdefinition50Enum;
    … …  
    750752              else if (strcmp(name,"Paterson")==0) return PatersonEnum;
    751753              else if (strcmp(name,"Arrhenius")==0) return ArrheniusEnum;
    752               else if (strcmp(name,"LliboutryDuval")==0) return LliboutryDuvalEnum;
    753               else if (strcmp(name,"ExtrapolationVariable")==0) return ExtrapolationVariableEnum;
    754754         else stage=7;
    755755   }
    756756   if(stage==7){
    757               if (strcmp(name,"IceMaskNodeActivation")==0) return IceMaskNodeActivationEnum;
     757              if (strcmp(name,"LliboutryDuval")==0) return LliboutryDuvalEnum;
     758              else if (strcmp(name,"ExtrapolationVariable")==0) return ExtrapolationVariableEnum;
     759              else if (strcmp(name,"IceMaskNodeActivation")==0) return IceMaskNodeActivationEnum;
    758760              else if (strcmp(name,"LevelsetfunctionSlopeX")==0) return LevelsetfunctionSlopeXEnum;
    759761              else if (strcmp(name,"LevelsetfunctionSlopeY")==0) return LevelsetfunctionSlopeYEnum;
    … …  
    873875              else if (strcmp(name,"BalancethicknessSoftSolution")==0) return BalancethicknessSoftSolutionEnum;
    874876              else if (strcmp(name,"BalancevelocityAnalysis")==0) return BalancevelocityAnalysisEnum;
    875               else if (strcmp(name,"BalancevelocitySolution")==0) return BalancevelocitySolutionEnum;
    876               else if (strcmp(name,"L2ProjectionEPLAnalysis")==0) return L2ProjectionEPLAnalysisEnum;
    877877         else stage=8;
    878878   }
    879879   if(stage==8){
    880               if (strcmp(name,"L2ProjectionBaseAnalysis")==0) return L2ProjectionBaseAnalysisEnum;
     880              if (strcmp(name,"BalancevelocitySolution")==0) return BalancevelocitySolutionEnum;
     881              else if (strcmp(name,"L2ProjectionEPLAnalysis")==0) return L2ProjectionEPLAnalysisEnum;
     882              else if (strcmp(name,"L2ProjectionBaseAnalysis")==0) return L2ProjectionBaseAnalysisEnum;
    881883              else if (strcmp(name,"BedSlopeSolution")==0) return BedSlopeSolutionEnum;
    882884              else if (strcmp(name,"DamageEvolutionSolution")==0) return DamageEvolutionSolutionEnum;
Note: See TracChangeset for help on using the changeset viewer.