Changeset 23958


Ignore:
Timestamp:
05/29/19 20:47:22 (6 years ago)
Author:
Mathieu Morlighem
Message:

CHG: minor

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

Legend:

Unmodified
Added
Removed

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

    r23957 r23958  
    6464        BasalforcingsEnum,
    6565        BasalforcingsIsmp6AverageTfEnum,
     66        BasalforcingsIsmp6BasinAreaEnum,
     67        BasalforcingsIsmp6DeltaTEnum,
     68        BasalforcingsIsmp6Gamma0Enum,
    6669        BasalforcingsIsmp6IsLocalEnum,
     70        BasalforcingsIsmp6NumBasinsEnum,
     71        BasalforcingsIsmp6TfDepthsEnum,
    6772        BasalforcingsLowercrustheatEnum,
    6873        BasalforcingsMantleconductivityEnum,
    … …  
    426431        VelocityEnum,
    427432        WorldCommEnum,
    428    BasalforcingsIsmp6BasinAreaEnum,
    429    BasalforcingsIsmp6DeltaTEnum,
    430    BasalforcingsIsmp6Gamma0Enum,
    431    BasalforcingsIsmp6NumBasinsEnum,
    432    BasalforcingsIsmp6TfDepthsEnum,
    433433        /*}}}*/
    434434        ParametersENDEnum,

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

    r23957 r23958  
    7272                case BasalforcingsEnum : return "Basalforcings";
    7373                case BasalforcingsIsmp6AverageTfEnum : return "BasalforcingsIsmp6AverageTf";
     74                case BasalforcingsIsmp6BasinAreaEnum : return "BasalforcingsIsmp6BasinArea";
     75                case BasalforcingsIsmp6DeltaTEnum : return "BasalforcingsIsmp6DeltaT";
     76                case BasalforcingsIsmp6Gamma0Enum : return "BasalforcingsIsmp6Gamma0";
    7477                case BasalforcingsIsmp6IsLocalEnum : return "BasalforcingsIsmp6IsLocal";
     78                case BasalforcingsIsmp6NumBasinsEnum : return "BasalforcingsIsmp6NumBasins";
     79                case BasalforcingsIsmp6TfDepthsEnum : return "BasalforcingsIsmp6TfDepths";
    7580                case BasalforcingsLowercrustheatEnum : return "BasalforcingsLowercrustheat";
    7681                case BasalforcingsMantleconductivityEnum : return "BasalforcingsMantleconductivity";
    … …  
    434439                case VelocityEnum : return "Velocity";
    435440                case WorldCommEnum : return "WorldComm";
    436                 case BasalforcingsIsmp6BasinAreaEnum : return "BasalforcingsIsmp6BasinArea";
    437                 case BasalforcingsIsmp6DeltaTEnum : return "BasalforcingsIsmp6DeltaT";
    438                 case BasalforcingsIsmp6Gamma0Enum : return "BasalforcingsIsmp6Gamma0";
    439                 case BasalforcingsIsmp6NumBasinsEnum : return "BasalforcingsIsmp6NumBasins";
    440                 case BasalforcingsIsmp6TfDepthsEnum : return "BasalforcingsIsmp6TfDepths";
    441441                case ParametersENDEnum : return "ParametersEND";
    442442                case InputsSTARTEnum : return "InputsSTART";

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

    r23957 r23958  
    7272              else if (strcmp(name,"Basalforcings")==0) return BasalforcingsEnum;
    7373              else if (strcmp(name,"BasalforcingsIsmp6AverageTf")==0) return BasalforcingsIsmp6AverageTfEnum;
     74              else if (strcmp(name,"BasalforcingsIsmp6BasinArea")==0) return BasalforcingsIsmp6BasinAreaEnum;
     75              else if (strcmp(name,"BasalforcingsIsmp6DeltaT")==0) return BasalforcingsIsmp6DeltaTEnum;
     76              else if (strcmp(name,"BasalforcingsIsmp6Gamma0")==0) return BasalforcingsIsmp6Gamma0Enum;
    7477              else if (strcmp(name,"BasalforcingsIsmp6IsLocal")==0) return BasalforcingsIsmp6IsLocalEnum;
     78              else if (strcmp(name,"BasalforcingsIsmp6NumBasins")==0) return BasalforcingsIsmp6NumBasinsEnum;
     79              else if (strcmp(name,"BasalforcingsIsmp6TfDepths")==0) return BasalforcingsIsmp6TfDepthsEnum;
    7580              else if (strcmp(name,"BasalforcingsLowercrustheat")==0) return BasalforcingsLowercrustheatEnum;
    7681              else if (strcmp(name,"BasalforcingsMantleconductivity")==0) return BasalforcingsMantleconductivityEnum;
    … …  
    132137              else if (strcmp(name,"EsaUElastic")==0) return EsaUElasticEnum;
    133138              else if (strcmp(name,"ExtrapolationVariable")==0) return ExtrapolationVariableEnum;
    134               else if (strcmp(name,"FemModelComm")==0) return FemModelCommEnum;
     139         else stage=2;
     140   }
     141   if(stage==2){
     142              if (strcmp(name,"FemModelComm")==0) return FemModelCommEnum;
    135143              else if (strcmp(name,"FlowequationFeFS")==0) return FlowequationFeFSEnum;
    136144              else if (strcmp(name,"FlowequationIsFS")==0) return FlowequationIsFSEnum;
    137145              else if (strcmp(name,"FlowequationIsHO")==0) return FlowequationIsHOEnum;
    138146              else if (strcmp(name,"FlowequationIsL1L2")==0) return FlowequationIsL1L2Enum;
    139          else stage=2;
    140    }
    141    if(stage==2){
    142               if (strcmp(name,"FlowequationIsSIA")==0) return FlowequationIsSIAEnum;
     147              else if (strcmp(name,"FlowequationIsSIA")==0) return FlowequationIsSIAEnum;
    143148              else if (strcmp(name,"FlowequationIsSSA")==0) return FlowequationIsSSAEnum;
    144149              else if (strcmp(name,"FrictionCoupling")==0) return FrictionCouplingEnum;
    … …  
    255260              else if (strcmp(name,"MaterialsMeltingpoint")==0) return MaterialsMeltingpointEnum;
    256261              else if (strcmp(name,"MaterialsMixedLayerCapacity")==0) return MaterialsMixedLayerCapacityEnum;
    257               else if (strcmp(name,"MaterialsMuWater")==0) return MaterialsMuWaterEnum;
     262         else stage=3;
     263   }
     264   if(stage==3){
     265              if (strcmp(name,"MaterialsMuWater")==0) return MaterialsMuWaterEnum;
    258266              else if (strcmp(name,"MaterialsRheologyLaw")==0) return MaterialsRheologyLawEnum;
    259267              else if (strcmp(name,"MaterialsRhoFreshwater")==0) return MaterialsRhoFreshwaterEnum;
    260268              else if (strcmp(name,"MaterialsRhoIce")==0) return MaterialsRhoIceEnum;
    261269              else if (strcmp(name,"MaterialsRhoSeawater")==0) return MaterialsRhoSeawaterEnum;
    262          else stage=3;
    263    }
    264    if(stage==3){
    265               if (strcmp(name,"MaterialsTemperateiceconductivity")==0) return MaterialsTemperateiceconductivityEnum;
     270              else if (strcmp(name,"MaterialsTemperateiceconductivity")==0) return MaterialsTemperateiceconductivityEnum;
    266271              else if (strcmp(name,"MaterialsThermalExchangeVelocity")==0) return MaterialsThermalExchangeVelocityEnum;
    267272              else if (strcmp(name,"MaterialsThermalconductivity")==0) return MaterialsThermalconductivityEnum;
    … …  
    378383              else if (strcmp(name,"SmbT0wet")==0) return SmbT0wetEnum;
    379384              else if (strcmp(name,"SmbTdiff")==0) return SmbTdiffEnum;
    380               else if (strcmp(name,"SmbThermoDeltaTScaling")==0) return SmbThermoDeltaTScalingEnum;
     385         else stage=4;
     386   }
     387   if(stage==4){
     388              if (strcmp(name,"SmbThermoDeltaTScaling")==0) return SmbThermoDeltaTScalingEnum;
    381389              else if (strcmp(name,"SmoothThicknessMultiplier")==0) return SmoothThicknessMultiplierEnum;
    382390              else if (strcmp(name,"SolutionType")==0) return SolutionTypeEnum;
    383391              else if (strcmp(name,"SteadystateMaxiter")==0) return SteadystateMaxiterEnum;
    384392              else if (strcmp(name,"SteadystateNumRequestedOutputs")==0) return SteadystateNumRequestedOutputsEnum;
    385          else stage=4;
    386    }
    387    if(stage==4){
    388               if (strcmp(name,"SteadystateReltol")==0) return SteadystateReltolEnum;
     393              else if (strcmp(name,"SteadystateReltol")==0) return SteadystateReltolEnum;
    389394              else if (strcmp(name,"SteadystateRequestedOutputs")==0) return SteadystateRequestedOutputsEnum;
    390395              else if (strcmp(name,"Step")==0) return StepEnum;
    … …  
    443448              else if (strcmp(name,"Velocity")==0) return VelocityEnum;
    444449              else if (strcmp(name,"WorldComm")==0) return WorldCommEnum;
    445               else if (strcmp(name,"BasalforcingsIsmp6BasinArea")==0) return BasalforcingsIsmp6BasinAreaEnum;
    446               else if (strcmp(name,"BasalforcingsIsmp6DeltaT")==0) return BasalforcingsIsmp6DeltaTEnum;
    447               else if (strcmp(name,"BasalforcingsIsmp6Gamma0")==0) return BasalforcingsIsmp6Gamma0Enum;
    448               else if (strcmp(name,"BasalforcingsIsmp6NumBasins")==0) return BasalforcingsIsmp6NumBasinsEnum;
    449               else if (strcmp(name,"BasalforcingsIsmp6TfDepths")==0) return BasalforcingsIsmp6TfDepthsEnum;
    450450              else if (strcmp(name,"ParametersEND")==0) return ParametersENDEnum;
    451451              else if (strcmp(name,"InputsSTART")==0) return InputsSTARTEnum;
Note: See TracChangeset for help on using the changeset viewer.