Ignore:
Timestamp:
07/19/16 09:51:00 (9 years ago)
Author:
Mathieu Morlighem
Message:

CHG: simplifying ProcessArguments

File:
1 edited

Legend:

Unmodified
Added
Removed

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

    r20718 r20939  
    1919              if (strcmp(name,"ParametersSTART")==0) return ParametersSTARTEnum;
    2020              else if (strcmp(name,"FemModel")==0) return FemModelEnum;
     21              else if (strcmp(name,"IsRestart")==0) return IsRestartEnum;
    2122              else if (strcmp(name,"FemModelComm")==0) return FemModelCommEnum;
    2223              else if (strcmp(name,"WorldComm")==0) return WorldCommEnum;
    … …  
    136137              else if (strcmp(name,"GeometryHydrostaticRatio")==0) return GeometryHydrostaticRatioEnum;
    137138              else if (strcmp(name,"HydrologyModel")==0) return HydrologyModelEnum;
    138               else if (strcmp(name,"Hydrologyshreve")==0) return HydrologyshreveEnum;
    139139         else stage=2;
    140140   }
    141141   if(stage==2){
    142               if (strcmp(name,"HydrologyshreveSpcwatercolumn")==0) return HydrologyshreveSpcwatercolumnEnum;
     142              if (strcmp(name,"Hydrologyshreve")==0) return HydrologyshreveEnum;
     143              else if (strcmp(name,"HydrologyshreveSpcwatercolumn")==0) return HydrologyshreveSpcwatercolumnEnum;
    143144              else if (strcmp(name,"HydrologyshreveStabilization")==0) return HydrologyshreveStabilizationEnum;
    144145              else if (strcmp(name,"Hydrologydc")==0) return HydrologydcEnum;
    … …  
    259260              else if (strcmp(name,"DamageStabilization")==0) return DamageStabilizationEnum;
    260261              else if (strcmp(name,"DamageMaxiter")==0) return DamageMaxiterEnum;
    261               else if (strcmp(name,"DamageSpcdamage")==0) return DamageSpcdamageEnum;
    262262         else stage=3;
    263263   }
    264264   if(stage==3){
    265               if (strcmp(name,"DamageMaxDamage")==0) return DamageMaxDamageEnum;
     265              if (strcmp(name,"DamageSpcdamage")==0) return DamageSpcdamageEnum;
     266              else if (strcmp(name,"DamageMaxDamage")==0) return DamageMaxDamageEnum;
    266267              else if (strcmp(name,"DamageEquivStress")==0) return DamageEquivStressEnum;
    267268              else if (strcmp(name,"DamageEvolutionNumRequestedOutputs")==0) return DamageEvolutionNumRequestedOutputsEnum;
    … …  
    382383              else if (strcmp(name,"TimesteppingTimeAdapt")==0) return TimesteppingTimeAdaptEnum;
    383384              else if (strcmp(name,"TimesteppingTimeStep")==0) return TimesteppingTimeStepEnum;
    384               else if (strcmp(name,"TimesteppingInterpForcings")==0) return TimesteppingInterpForcingsEnum;
    385385         else stage=4;
    386386   }
    387387   if(stage==4){
    388               if (strcmp(name,"TransientIssmb")==0) return TransientIssmbEnum;
     388              if (strcmp(name,"TimesteppingInterpForcings")==0) return TimesteppingInterpForcingsEnum;
     389              else if (strcmp(name,"TransientIssmb")==0) return TransientIssmbEnum;
    389390              else if (strcmp(name,"TransientIscoupler")==0) return TransientIscouplerEnum;
    390391              else if (strcmp(name,"TransientIsstressbalance")==0) return TransientIsstressbalanceEnum;
    … …  
    505506              else if (strcmp(name,"AnalysisType")==0) return AnalysisTypeEnum;
    506507              else if (strcmp(name,"ConfigurationType")==0) return ConfigurationTypeEnum;
    507               else if (strcmp(name,"AdjointBalancethicknessAnalysis")==0) return AdjointBalancethicknessAnalysisEnum;
    508508         else stage=5;
    509509   }
    510510   if(stage==5){
    511               if (strcmp(name,"AdjointBalancethickness2Analysis")==0) return AdjointBalancethickness2AnalysisEnum;
     511              if (strcmp(name,"AdjointBalancethicknessAnalysis")==0) return AdjointBalancethicknessAnalysisEnum;
     512              else if (strcmp(name,"AdjointBalancethickness2Analysis")==0) return AdjointBalancethickness2AnalysisEnum;
    512513              else if (strcmp(name,"AdjointHorizAnalysis")==0) return AdjointHorizAnalysisEnum;
    513514              else if (strcmp(name,"AnalysisCounter")==0) return AnalysisCounterEnum;
    … …  
    628629              else if (strcmp(name,"Masscon")==0) return MassconEnum;
    629630              else if (strcmp(name,"MassconName")==0) return MassconNameEnum;
    630               else if (strcmp(name,"MassconDefinitionenum")==0) return MassconDefinitionenumEnum;
    631631         else stage=6;
    632632   }
    633633   if(stage==6){
    634               if (strcmp(name,"MassconLevelset")==0) return MassconLevelsetEnum;
     634              if (strcmp(name,"MassconDefinitionenum")==0) return MassconDefinitionenumEnum;
     635              else if (strcmp(name,"MassconLevelset")==0) return MassconLevelsetEnum;
    635636              else if (strcmp(name,"Massconaxpby")==0) return MassconaxpbyEnum;
    636637              else if (strcmp(name,"MassconaxpbyName")==0) return MassconaxpbyNameEnum;
    … …  
    751752              else if (strcmp(name,"DeviatoricStressxy")==0) return DeviatoricStressxyEnum;
    752753              else if (strcmp(name,"DeviatoricStressxz")==0) return DeviatoricStressxzEnum;
    753               else if (strcmp(name,"DeviatoricStressyy")==0) return DeviatoricStressyyEnum;
    754754         else stage=7;
    755755   }
    756756   if(stage==7){
    757               if (strcmp(name,"DeviatoricStressyz")==0) return DeviatoricStressyzEnum;
     757              if (strcmp(name,"DeviatoricStressyy")==0) return DeviatoricStressyyEnum;
     758              else if (strcmp(name,"DeviatoricStressyz")==0) return DeviatoricStressyzEnum;
    758759              else if (strcmp(name,"DeviatoricStresszz")==0) return DeviatoricStresszzEnum;
    759760              else if (strcmp(name,"DeviatoricStresseffective")==0) return DeviatoricStresseffectiveEnum;
    … …  
    874875              else if (strcmp(name,"Outputdefinition68")==0) return Outputdefinition68Enum;
    875876              else if (strcmp(name,"Outputdefinition69")==0) return Outputdefinition69Enum;
    876               else if (strcmp(name,"Outputdefinition70")==0) return Outputdefinition70Enum;
    877877         else stage=8;
    878878   }
    879879   if(stage==8){
    880               if (strcmp(name,"Outputdefinition71")==0) return Outputdefinition71Enum;
     880              if (strcmp(name,"Outputdefinition70")==0) return Outputdefinition70Enum;
     881              else if (strcmp(name,"Outputdefinition71")==0) return Outputdefinition71Enum;
    881882              else if (strcmp(name,"Outputdefinition72")==0) return Outputdefinition72Enum;
    882883              else if (strcmp(name,"Outputdefinition73")==0) return Outputdefinition73Enum;
    … …  
    997998              else if (strcmp(name,"RestartFileName")==0) return RestartFileNameEnum;
    998999              else if (strcmp(name,"ToolkitsOptionsAnalyses")==0) return ToolkitsOptionsAnalysesEnum;
    999               else if (strcmp(name,"ToolkitsOptionsStrings")==0) return ToolkitsOptionsStringsEnum;
    10001000         else stage=9;
    10011001   }
    10021002   if(stage==9){
    1003               if (strcmp(name,"QmuErrName")==0) return QmuErrNameEnum;
     1003              if (strcmp(name,"ToolkitsOptionsStrings")==0) return ToolkitsOptionsStringsEnum;
     1004              else if (strcmp(name,"QmuErrName")==0) return QmuErrNameEnum;
    10041005              else if (strcmp(name,"QmuInName")==0) return QmuInNameEnum;
    10051006              else if (strcmp(name,"QmuOutName")==0) return QmuOutNameEnum;
Note: See TracChangeset for help on using the changeset viewer.