Ignore:
Timestamp:
08/05/16 10:24:49 (9 years ago)
Author:
Mathieu Morlighem
Message:

CHG: removed some Enums

File:
1 edited

Legend:

Unmodified
Added
Removed

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

    r21088 r21096  
    2020              else if (strcmp(name,"ParametersSTART")==0) return ParametersSTARTEnum;
    2121              else if (strcmp(name,"FSSolver")==0) return FSSolverEnum;
    22               else if (strcmp(name,"IsRestart")==0) return IsRestartEnum;
    2322              else if (strcmp(name,"FemModelComm")==0) return FemModelCommEnum;
    2423              else if (strcmp(name,"WorldComm")==0) return WorldCommEnum;
    … …  
    4039              else if (strcmp(name,"AutodiffIsautodiff")==0) return AutodiffIsautodiffEnum;
    4140              else if (strcmp(name,"AutodiffNumDependents")==0) return AutodiffNumDependentsEnum;
    42               else if (strcmp(name,"AutodiffNumDependentObjects")==0) return AutodiffNumDependentObjectsEnum;
    43               else if (strcmp(name,"AutodiffDependentObjectNames")==0) return AutodiffDependentObjectNamesEnum;
    44               else if (strcmp(name,"AutodiffDependentObjectTypes")==0) return AutodiffDependentObjectTypesEnum;
    45               else if (strcmp(name,"AutodiffDependentObjectIndices")==0) return AutodiffDependentObjectIndicesEnum;
    4641              else if (strcmp(name,"AutodiffDependentObjects")==0) return AutodiffDependentObjectsEnum;
    4742              else if (strcmp(name,"AutodiffNumIndependents")==0) return AutodiffNumIndependentsEnum;
    48               else if (strcmp(name,"AutodiffNumIndependentObjects")==0) return AutodiffNumIndependentObjectsEnum;
    49               else if (strcmp(name,"AutodiffIndependentObjectNames")==0) return AutodiffIndependentObjectNamesEnum;
    50               else if (strcmp(name,"AutodiffIndependentObjectTypes")==0) return AutodiffIndependentObjectTypesEnum;
    51               else if (strcmp(name,"AutodiffIndependentObjects")==0) return AutodiffIndependentObjectsEnum;
    5243              else if (strcmp(name,"AutodiffJacobian")==0) return AutodiffJacobianEnum;
    5344              else if (strcmp(name,"AutodiffXp")==0) return AutodiffXpEnum;
    … …  
    5647              else if (strcmp(name,"AutodiffFovForwardIndices")==0) return AutodiffFovForwardIndicesEnum;
    5748              else if (strcmp(name,"AutodiffFosReverseIndex")==0) return AutodiffFosReverseIndexEnum;
    58               else if (strcmp(name,"AutodiffMassFluxSegmentsPresent")==0) return AutodiffMassFluxSegmentsPresentEnum;
    5949              else if (strcmp(name,"AutodiffKeep")==0) return AutodiffKeepEnum;
    6050              else if (strcmp(name,"AutodiffObufsize")==0) return AutodiffObufsizeEnum;
    … …  
    6454              else if (strcmp(name,"AutodiffGcTriggerRatio")==0) return AutodiffGcTriggerRatioEnum;
    6555              else if (strcmp(name,"AutodiffGcTriggerMaxSize")==0) return AutodiffGcTriggerMaxSizeEnum;
    66               else if (strcmp(name,"BalancethicknessSpcthickness")==0) return BalancethicknessSpcthicknessEnum;
    6756              else if (strcmp(name,"BalancethicknessStabilization")==0) return BalancethicknessStabilizationEnum;
    6857              else if (strcmp(name,"BalancethicknessThickeningRate")==0) return BalancethicknessThickeningRateEnum;
    … …  
    10493              else if (strcmp(name,"StressbalanceMaxiter")==0) return StressbalanceMaxiterEnum;
    10594              else if (strcmp(name,"StressbalancePenaltyFactor")==0) return StressbalancePenaltyFactorEnum;
    106               else if (strcmp(name,"StressbalanceReferential")==0) return StressbalanceReferentialEnum;
    10795              else if (strcmp(name,"StressbalanceReltol")==0) return StressbalanceReltolEnum;
    10896              else if (strcmp(name,"StressbalanceNumRequestedOutputs")==0) return StressbalanceNumRequestedOutputsEnum;
    10997              else if (strcmp(name,"StressbalanceRequestedOutputs")==0) return StressbalanceRequestedOutputsEnum;
    11098              else if (strcmp(name,"StressbalanceRestol")==0) return StressbalanceRestolEnum;
    111               else if (strcmp(name,"StressbalanceRiftPenaltyLock")==0) return StressbalanceRiftPenaltyLockEnum;
    11299              else if (strcmp(name,"StressbalanceRiftPenaltyThreshold")==0) return StressbalanceRiftPenaltyThresholdEnum;
    113100              else if (strcmp(name,"StressbalanceShelfDampening")==0) return StressbalanceShelfDampeningEnum;
    114               else if (strcmp(name,"StressbalanceSpcvx")==0) return StressbalanceSpcvxEnum;
    115               else if (strcmp(name,"StressbalanceSpcvy")==0) return StressbalanceSpcvyEnum;
    116               else if (strcmp(name,"StressbalanceSpcvz")==0) return StressbalanceSpcvzEnum;
    117101              else if (strcmp(name,"StressbalanceFSreconditioning")==0) return StressbalanceFSreconditioningEnum;
    118               else if (strcmp(name,"StressbalanceVertexPairing")==0) return StressbalanceVertexPairingEnum;
    119102              else if (strcmp(name,"StressbalanceViscosityOvershoot")==0) return StressbalanceViscosityOvershootEnum;
    120103              else if (strcmp(name,"LoadingforceX")==0) return LoadingforceXEnum;
    121104              else if (strcmp(name,"LoadingforceY")==0) return LoadingforceYEnum;
    122105              else if (strcmp(name,"LoadingforceZ")==0) return LoadingforceZEnum;
    123               else if (strcmp(name,"FlowequationBorderSSA")==0) return FlowequationBorderSSAEnum;
    124               else if (strcmp(name,"FlowequationBorderHO")==0) return FlowequationBorderHOEnum;
    125               else if (strcmp(name,"FlowequationBorderFS")==0) return FlowequationBorderFSEnum;
    126               else if (strcmp(name,"FlowequationElementEquation")==0) return FlowequationElementEquationEnum;
    127106              else if (strcmp(name,"FlowequationIsSIA")==0) return FlowequationIsSIAEnum;
    128107              else if (strcmp(name,"FlowequationIsSSA")==0) return FlowequationIsSSAEnum;
    … …  
    130109              else if (strcmp(name,"FlowequationIsHO")==0) return FlowequationIsHOEnum;
    131110              else if (strcmp(name,"FlowequationIsFS")==0) return FlowequationIsFSEnum;
    132               else if (strcmp(name,"FlowequationFeSSA")==0) return FlowequationFeSSAEnum;
    133               else if (strcmp(name,"FlowequationFeHO")==0) return FlowequationFeHOEnum;
    134111              else if (strcmp(name,"FlowequationFeFS")==0) return FlowequationFeFSEnum;
    135               else if (strcmp(name,"FlowequationVertexEquation")==0) return FlowequationVertexEquationEnum;
     112              else if (strcmp(name,"FlowequationBorderFS")==0) return FlowequationBorderFSEnum;
    136113              else if (strcmp(name,"FrictionAs")==0) return FrictionAsEnum;
    137114              else if (strcmp(name,"FrictionCoefficient")==0) return FrictionCoefficientEnum;
    138115              else if (strcmp(name,"FrictionCoefficientcoulomb")==0) return FrictionCoefficientcoulombEnum;
    139          else stage=2;
    140    }
    141    if(stage==2){
    142               if (strcmp(name,"FrictionP")==0) return FrictionPEnum;
     116              else if (strcmp(name,"FrictionP")==0) return FrictionPEnum;
    143117              else if (strcmp(name,"FrictionQ")==0) return FrictionQEnum;
    144118              else if (strcmp(name,"FrictionM")==0) return FrictionMEnum;
    … …  
    153127              else if (strcmp(name,"HydrologyModel")==0) return HydrologyModelEnum;
    154128              else if (strcmp(name,"Hydrologyshreve")==0) return HydrologyshreveEnum;
    155               else if (strcmp(name,"HydrologyshreveSpcwatercolumn")==0) return HydrologyshreveSpcwatercolumnEnum;
    156129              else if (strcmp(name,"HydrologyshreveStabilization")==0) return HydrologyshreveStabilizationEnum;
    157130              else if (strcmp(name,"Hydrologydc")==0) return HydrologydcEnum;
    … …  
    164137              else if (strcmp(name,"EplHeadSlopeX")==0) return EplHeadSlopeXEnum;
    165138              else if (strcmp(name,"EplHeadSlopeY")==0) return EplHeadSlopeYEnum;
    166               else if (strcmp(name,"EplZigZagCounter")==0) return EplZigZagCounterEnum;
     139         else stage=2;
     140   }
     141   if(stage==2){
     142              if (strcmp(name,"EplZigZagCounter")==0) return EplZigZagCounterEnum;
    167143              else if (strcmp(name,"HydrologydcMaxIter")==0) return HydrologydcMaxIterEnum;
    168144              else if (strcmp(name,"HydrologydcRelTol")==0) return HydrologydcRelTolEnum;
    169               else if (strcmp(name,"HydrologydcSpcsedimentHead")==0) return HydrologydcSpcsedimentHeadEnum;
    170145              else if (strcmp(name,"HydrologydcSedimentCompressibility")==0) return HydrologydcSedimentCompressibilityEnum;
    171146              else if (strcmp(name,"HydrologydcSedimentPorosity")==0) return HydrologydcSedimentPorosityEnum;
    … …  
    173148              else if (strcmp(name,"HydrologydcSedimentTransmitivity")==0) return HydrologydcSedimentTransmitivityEnum;
    174149              else if (strcmp(name,"HydrologydcWaterCompressibility")==0) return HydrologydcWaterCompressibilityEnum;
    175               else if (strcmp(name,"HydrologydcSpceplHead")==0) return HydrologydcSpceplHeadEnum;
    176150              else if (strcmp(name,"HydrologydcMaskEplactiveNode")==0) return HydrologydcMaskEplactiveNodeEnum;
    177151              else if (strcmp(name,"HydrologydcMaskEplactiveElt")==0) return HydrologydcMaskEplactiveEltEnum;
    … …  
    207181              else if (strcmp(name,"HydrologyReynolds")==0) return HydrologyReynoldsEnum;
    208182              else if (strcmp(name,"HydrologyNeumannflux")==0) return HydrologyNeumannfluxEnum;
    209               else if (strcmp(name,"HydrologySpchead")==0) return HydrologySpcheadEnum;
    210               else if (strcmp(name,"HydrologyConductivity")==0) return HydrologyConductivityEnum;
    211183              else if (strcmp(name,"InversionControlParameters")==0) return InversionControlParametersEnum;
    212184              else if (strcmp(name,"InversionControlScalingFactors")==0) return InversionControlScalingFactorsEnum;
    … …  
    218190              else if (strcmp(name,"InversionType")==0) return InversionTypeEnum;
    219191              else if (strcmp(name,"InversionIncompleteAdjoint")==0) return InversionIncompleteAdjointEnum;
    220               else if (strcmp(name,"InversionMaxParameters")==0) return InversionMaxParametersEnum;
    221192              else if (strcmp(name,"InversionMaxiterPerStep")==0) return InversionMaxiterPerStepEnum;
    222193              else if (strcmp(name,"InversionMaxiter")==0) return InversionMaxiterEnum;
    … …  
    228199              else if (strcmp(name,"InversionGttol")==0) return InversionGttolEnum;
    229200              else if (strcmp(name,"InversionAlgorithm")==0) return InversionAlgorithmEnum;
    230               else if (strcmp(name,"InversionMinParameters")==0) return InversionMinParametersEnum;
    231201              else if (strcmp(name,"InversionNsteps")==0) return InversionNstepsEnum;
    232202              else if (strcmp(name,"InversionDxmin")==0) return InversionDxminEnum;
    … …  
    257227              else if (strcmp(name,"MaterialsRheologyEs")==0) return MaterialsRheologyEsEnum;
    258228              else if (strcmp(name,"MaterialsRheologyEsbar")==0) return MaterialsRheologyEsbarEnum;
    259               else if (strcmp(name,"DamageIsdamage")==0) return DamageIsdamageEnum;
    260229              else if (strcmp(name,"DamageD")==0) return DamageDEnum;
    261230              else if (strcmp(name,"DamageF")==0) return DamageFEnum;
    262          else stage=3;
    263    }
    264    if(stage==3){
    265               if (strcmp(name,"DamageDbar")==0) return DamageDbarEnum;
     231              else if (strcmp(name,"DamageDbar")==0) return DamageDbarEnum;
    266232              else if (strcmp(name,"DamageLaw")==0) return DamageLawEnum;
    267233              else if (strcmp(name,"DamageC1")==0) return DamageC1Enum;
    … …  
    275241              else if (strcmp(name,"DamageStabilization")==0) return DamageStabilizationEnum;
    276242              else if (strcmp(name,"DamageMaxiter")==0) return DamageMaxiterEnum;
    277               else if (strcmp(name,"DamageSpcdamage")==0) return DamageSpcdamageEnum;
    278243              else if (strcmp(name,"DamageMaxDamage")==0) return DamageMaxDamageEnum;
    279244              else if (strcmp(name,"DamageEquivStress")==0) return DamageEquivStressEnum;
    … …  
    290255              else if (strcmp(name,"CalvingMinthickness")==0) return CalvingMinthicknessEnum;
    291256              else if (strcmp(name,"DefaultCalving")==0) return DefaultCalvingEnum;
    292               else if (strcmp(name,"CalvingRequestedOutputs")==0) return CalvingRequestedOutputsEnum;
    293257              else if (strcmp(name,"CalvinglevermannCoeff")==0) return CalvinglevermannCoeffEnum;
    294258              else if (strcmp(name,"CalvinglevermannMeltingrate")==0) return CalvinglevermannMeltingrateEnum;
    … …  
    296260              else if (strcmp(name,"Calvingratex")==0) return CalvingratexEnum;
    297261              else if (strcmp(name,"Calvingratey")==0) return CalvingrateyEnum;
    298               else if (strcmp(name,"CalvingratexAverage")==0) return CalvingratexAverageEnum;
     262         else stage=3;
     263   }
     264   if(stage==3){
     265              if (strcmp(name,"CalvingratexAverage")==0) return CalvingratexAverageEnum;
    299266              else if (strcmp(name,"CalvingrateyAverage")==0) return CalvingrateyAverageEnum;
    300267              else if (strcmp(name,"StrainRateparallel")==0) return StrainRateparallelEnum;
    … …  
    314281              else if (strcmp(name,"MaterialsEarthDensity")==0) return MaterialsEarthDensityEnum;
    315282              else if (strcmp(name,"MeshAverageVertexConnectivity")==0) return MeshAverageVertexConnectivityEnum;
    316               else if (strcmp(name,"MeshElements2d")==0) return MeshElements2dEnum;
    317283              else if (strcmp(name,"MeshElements")==0) return MeshElementsEnum;
    318               else if (strcmp(name,"MeshLowerelements")==0) return MeshLowerelementsEnum;
    319               else if (strcmp(name,"MeshNumberofelements2d")==0) return MeshNumberofelements2dEnum;
    320284              else if (strcmp(name,"MeshNumberofelements")==0) return MeshNumberofelementsEnum;
    321285              else if (strcmp(name,"MeshNumberoflayers")==0) return MeshNumberoflayersEnum;
    322               else if (strcmp(name,"MeshNumberofvertices2d")==0) return MeshNumberofvertices2dEnum;
    323286              else if (strcmp(name,"MeshNumberofvertices")==0) return MeshNumberofverticesEnum;
    324               else if (strcmp(name,"MeshUpperelements")==0) return MeshUpperelementsEnum;
    325287              else if (strcmp(name,"MeshVertexonbase")==0) return MeshVertexonbaseEnum;
    326288              else if (strcmp(name,"MeshVertexonsurface")==0) return MeshVertexonsurfaceEnum;
    327289              else if (strcmp(name,"MeshVertexonboundary")==0) return MeshVertexonboundaryEnum;
    328               else if (strcmp(name,"MeshX")==0) return MeshXEnum;
    329               else if (strcmp(name,"MeshY")==0) return MeshYEnum;
    330               else if (strcmp(name,"MeshZ")==0) return MeshZEnum;
    331               else if (strcmp(name,"MeshLat")==0) return MeshLatEnum;
    332               else if (strcmp(name,"MeshLong")==0) return MeshLongEnum;
    333               else if (strcmp(name,"MeshR")==0) return MeshREnum;
    334290              else if (strcmp(name,"MeshElementtype")==0) return MeshElementtypeEnum;
    335               else if (strcmp(name,"MeshSegments")==0) return MeshSegmentsEnum;
    336291              else if (strcmp(name,"DomainType")==0) return DomainTypeEnum;
    337292              else if (strcmp(name,"DomainDimension")==0) return DomainDimensionEnum;
    … …  
    340295              else if (strcmp(name,"Domain3D")==0) return Domain3DEnum;
    341296              else if (strcmp(name,"Domain3Dsurface")==0) return Domain3DsurfaceEnum;
    342               else if (strcmp(name,"MiscellaneousName")==0) return MiscellaneousNameEnum;
    343297              else if (strcmp(name,"MasstransportHydrostaticAdjustment")==0) return MasstransportHydrostaticAdjustmentEnum;
    344298              else if (strcmp(name,"MasstransportIsfreesurface")==0) return MasstransportIsfreesurfaceEnum;
    … …  
    347301              else if (strcmp(name,"MasstransportSpcthickness")==0) return MasstransportSpcthicknessEnum;
    348302              else if (strcmp(name,"MasstransportStabilization")==0) return MasstransportStabilizationEnum;
    349               else if (strcmp(name,"MasstransportVertexPairing")==0) return MasstransportVertexPairingEnum;
    350303              else if (strcmp(name,"MasstransportNumRequestedOutputs")==0) return MasstransportNumRequestedOutputsEnum;
    351304              else if (strcmp(name,"MasstransportRequestedOutputs")==0) return MasstransportRequestedOutputsEnum;
    … …  
    353306              else if (strcmp(name,"MassFluxSegments")==0) return MassFluxSegmentsEnum;
    354307              else if (strcmp(name,"MassFluxSegmentsPresent")==0) return MassFluxSegmentsPresentEnum;
    355               else if (strcmp(name,"QmuMassFluxSegmentsPresent")==0) return QmuMassFluxSegmentsPresentEnum;
    356308              else if (strcmp(name,"QmuNumberofpartitions")==0) return QmuNumberofpartitionsEnum;
    357309              else if (strcmp(name,"QmuNumberofresponses")==0) return QmuNumberofresponsesEnum;
    … …  
    359311              else if (strcmp(name,"QmuResponsedescriptors")==0) return QmuResponsedescriptorsEnum;
    360312              else if (strcmp(name,"QmuVariabledescriptors")==0) return QmuVariabledescriptorsEnum;
    361               else if (strcmp(name,"RiftsNumrifts")==0) return RiftsNumriftsEnum;
    362               else if (strcmp(name,"RiftsRiftstruct")==0) return RiftsRiftstructEnum;
    363313              else if (strcmp(name,"SettingsResultsOnNodes")==0) return SettingsResultsOnNodesEnum;
    364314              else if (strcmp(name,"SettingsIoGather")==0) return SettingsIoGatherEnum;
    … …  
    383333              else if (strcmp(name,"ThermalPenaltyLock")==0) return ThermalPenaltyLockEnum;
    384334              else if (strcmp(name,"ThermalPenaltyThreshold")==0) return ThermalPenaltyThresholdEnum;
    385          else stage=4;
    386    }
    387    if(stage==4){
    388               if (strcmp(name,"ThermalSpctemperature")==0) return ThermalSpctemperatureEnum;
     335              else if (strcmp(name,"ThermalSpctemperature")==0) return ThermalSpctemperatureEnum;
    389336              else if (strcmp(name,"ThermalStabilization")==0) return ThermalStabilizationEnum;
    390337              else if (strcmp(name,"ThermalNumRequestedOutputs")==0) return ThermalNumRequestedOutputsEnum;
    … …  
    412359              else if (strcmp(name,"TransientNumRequestedOutputs")==0) return TransientNumRequestedOutputsEnum;
    413360              else if (strcmp(name,"TransientRequestedOutputs")==0) return TransientRequestedOutputsEnum;
    414               else if (strcmp(name,"Potential")==0) return PotentialEnum;
    415               else if (strcmp(name,"BalancethicknessSpcpotential")==0) return BalancethicknessSpcpotentialEnum;
    416361              else if (strcmp(name,"BalancethicknessApparentMassbalance")==0) return BalancethicknessApparentMassbalanceEnum;
    417               else if (strcmp(name,"Balancethickness2Misfit")==0) return Balancethickness2MisfitEnum;
    418362              else if (strcmp(name,"BalancethicknessDiffusionCoefficient")==0) return BalancethicknessDiffusionCoefficientEnum;
    419               else if (strcmp(name,"BalancethicknessCmu")==0) return BalancethicknessCmuEnum;
    420363              else if (strcmp(name,"BalancethicknessOmega")==0) return BalancethicknessOmegaEnum;
    421364              else if (strcmp(name,"BalancethicknessD0")==0) return BalancethicknessD0Enum;
    … …  
    435378              else if (strcmp(name,"SmbDlwrf")==0) return SmbDlwrfEnum;
    436379              else if (strcmp(name,"SmbP")==0) return SmbPEnum;
    437               else if (strcmp(name,"SmbSwf")==0) return SmbSwfEnum;
    438380              else if (strcmp(name,"SmbEAir")==0) return SmbEAirEnum;
    439381              else if (strcmp(name,"SmbPAir")==0) return SmbPAirEnum;
    … …  
    441383              else if (strcmp(name,"SmbC")==0) return SmbCEnum;
    442384              else if (strcmp(name,"SmbTz")==0) return SmbTzEnum;
    443               else if (strcmp(name,"SmbVz")==0) return SmbVzEnum;
     385         else stage=4;
     386   }
     387   if(stage==4){
     388              if (strcmp(name,"SmbVz")==0) return SmbVzEnum;
    444389              else if (strcmp(name,"SmbDt")==0) return SmbDtEnum;
    445390              else if (strcmp(name,"SmbDz")==0) return SmbDzEnum;
    … …  
    506451              else if (strcmp(name,"SMBhenning")==0) return SMBhenningEnum;
    507452              else if (strcmp(name,"SMBcomponents")==0) return SMBcomponentsEnum;
    508          else stage=5;
    509    }
    510    if(stage==5){
    511               if (strcmp(name,"SmbAccumulation")==0) return SmbAccumulationEnum;
     453              else if (strcmp(name,"SmbAccumulation")==0) return SmbAccumulationEnum;
    512454              else if (strcmp(name,"SmbEvaporation")==0) return SmbEvaporationEnum;
    513455              else if (strcmp(name,"SmbRunoff")==0) return SmbRunoffEnum;
    … …  
    516458              else if (strcmp(name,"SmbRefreeze")==0) return SmbRefreezeEnum;
    517459              else if (strcmp(name,"SMBgcm")==0) return SMBgcmEnum;
    518               else if (strcmp(name,"SmbIspdd")==0) return SmbIspddEnum;
    519               else if (strcmp(name,"SmbIssmbgradients")==0) return SmbIssmbgradientsEnum;
    520460              else if (strcmp(name,"Adjointp")==0) return AdjointpEnum;
    521461              else if (strcmp(name,"Adjointx")==0) return AdjointxEnum;
    … …  
    527467              else if (strcmp(name,"Boundary")==0) return BoundaryEnum;
    528468              else if (strcmp(name,"Converged")==0) return ConvergedEnum;
    529               else if (strcmp(name,"Fill")==0) return FillEnum;
    530               else if (strcmp(name,"FractionIncrement")==0) return FractionIncrementEnum;
    531               else if (strcmp(name,"Friction")==0) return FrictionEnum;
    532469              else if (strcmp(name,"Internal")==0) return InternalEnum;
    533470              else if (strcmp(name,"MassFlux")==0) return MassFluxEnum;
    … …  
    538475              else if (strcmp(name,"AndroidFrictionCoefficient")==0) return AndroidFrictionCoefficientEnum;
    539476              else if (strcmp(name,"ResetPenalties")==0) return ResetPenaltiesEnum;
    540               else if (strcmp(name,"SegmentOnIceShelf")==0) return SegmentOnIceShelfEnum;
    541477              else if (strcmp(name,"SurfaceAbsVelMisfit")==0) return SurfaceAbsVelMisfitEnum;
    542478              else if (strcmp(name,"SurfaceArea")==0) return SurfaceAreaEnum;
    … …  
    570506              else if (strcmp(name,"Enthalpy")==0) return EnthalpyEnum;
    571507              else if (strcmp(name,"EnthalpyPicard")==0) return EnthalpyPicardEnum;
    572               else if (strcmp(name,"ThicknessAbsGradient")==0) return ThicknessAbsGradientEnum;
     508         else stage=5;
     509   }
     510   if(stage==5){
     511              if (strcmp(name,"ThicknessAbsGradient")==0) return ThicknessAbsGradientEnum;
    573512              else if (strcmp(name,"ThicknessAlongGradient")==0) return ThicknessAlongGradientEnum;
    574513              else if (strcmp(name,"ThicknessAcrossGradient")==0) return ThicknessAcrossGradientEnum;
    … …  
    581520              else if (strcmp(name,"Waterfraction")==0) return WaterfractionEnum;
    582521              else if (strcmp(name,"Watercolumn")==0) return WatercolumnEnum;
    583               else if (strcmp(name,"BasalFriction")==0) return BasalFrictionEnum;
    584522              else if (strcmp(name,"ViscousHeating")==0) return ViscousHeatingEnum;
    585523              else if (strcmp(name,"HydrologyWaterVx")==0) return HydrologyWaterVxEnum;
    … …  
    629567              else if (strcmp(name,"Outputdefinition")==0) return OutputdefinitionEnum;
    630568              else if (strcmp(name,"Outputdefinition1")==0) return Outputdefinition1Enum;
    631          else stage=6;
    632    }
    633    if(stage==6){
    634               if (strcmp(name,"Outputdefinition2")==0) return Outputdefinition2Enum;
     569              else if (strcmp(name,"Outputdefinition2")==0) return Outputdefinition2Enum;
    635570              else if (strcmp(name,"Outputdefinition3")==0) return Outputdefinition3Enum;
    636571              else if (strcmp(name,"Outputdefinition4")==0) return Outputdefinition4Enum;
    … …  
    694629              else if (strcmp(name,"Outputdefinition62")==0) return Outputdefinition62Enum;
    695630              else if (strcmp(name,"Outputdefinition63")==0) return Outputdefinition63Enum;
    696               else if (strcmp(name,"Outputdefinition64")==0) return Outputdefinition64Enum;
     631         else stage=6;
     632   }
     633   if(stage==6){
     634              if (strcmp(name,"Outputdefinition64")==0) return Outputdefinition64Enum;
    697635              else if (strcmp(name,"Outputdefinition65")==0) return Outputdefinition65Enum;
    698636              else if (strcmp(name,"Outputdefinition66")==0) return Outputdefinition66Enum;
    … …  
    733671              else if (strcmp(name,"OutputdefinitionList")==0) return OutputdefinitionListEnum;
    734672              else if (strcmp(name,"Massfluxatgate")==0) return MassfluxatgateEnum;
    735               else if (strcmp(name,"MassfluxatgateName")==0) return MassfluxatgateNameEnum;
    736               else if (strcmp(name,"MassfluxatgateDefinitionenum")==0) return MassfluxatgateDefinitionenumEnum;
    737               else if (strcmp(name,"MassfluxatgateSegments")==0) return MassfluxatgateSegmentsEnum;
    738673              else if (strcmp(name,"Nodalvalue")==0) return NodalvalueEnum;
    739               else if (strcmp(name,"NodalvalueName")==0) return NodalvalueNameEnum;
    740               else if (strcmp(name,"NodalvalueDefinitionenum")==0) return NodalvalueDefinitionenumEnum;
    741               else if (strcmp(name,"NodalvalueModelEnum")==0) return NodalvalueModelEnumEnum;
    742               else if (strcmp(name,"NodalvalueNode")==0) return NodalvalueNodeEnum;
    743               else if (strcmp(name,"MisfitName")==0) return MisfitNameEnum;
    744               else if (strcmp(name,"MisfitDefinitionenum")==0) return MisfitDefinitionenumEnum;
    745               else if (strcmp(name,"MisfitModelEnum")==0) return MisfitModelEnumEnum;
    746               else if (strcmp(name,"MisfitObservation")==0) return MisfitObservationEnum;
    747               else if (strcmp(name,"MisfitObservationEnum")==0) return MisfitObservationEnumEnum;
    748               else if (strcmp(name,"MisfitLocal")==0) return MisfitLocalEnum;
    749               else if (strcmp(name,"MisfitTimeinterpolation")==0) return MisfitTimeinterpolationEnum;
    750               else if (strcmp(name,"MisfitWeights")==0) return MisfitWeightsEnum;
    751               else if (strcmp(name,"MisfitWeightsEnum")==0) return MisfitWeightsEnumEnum;
    752               else if (strcmp(name,"SurfaceObservation")==0) return SurfaceObservationEnum;
    753               else if (strcmp(name,"WeightsSurfaceObservation")==0) return WeightsSurfaceObservationEnum;
    754          else stage=7;
    755    }
    756    if(stage==7){
    757               if (strcmp(name,"VxObs")==0) return VxObsEnum;
    758               else if (strcmp(name,"WeightsVxObs")==0) return WeightsVxObsEnum;
     674              else if (strcmp(name,"VxObs")==0) return VxObsEnum;
    759675              else if (strcmp(name,"VyObs")==0) return VyObsEnum;
    760               else if (strcmp(name,"WeightsVyObs")==0) return WeightsVyObsEnum;
    761676              else if (strcmp(name,"Absolute")==0) return AbsoluteEnum;
    762677              else if (strcmp(name,"Incremental")==0) return IncrementalEnum;
    … …  
    807722              else if (strcmp(name,"Separate")==0) return SeparateEnum;
    808723              else if (strcmp(name,"Sset")==0) return SsetEnum;
    809               else if (strcmp(name,"Verbose")==0) return VerboseEnum;
    810724              else if (strcmp(name,"XY")==0) return XYEnum;
    811725              else if (strcmp(name,"XYZ")==0) return XYZEnum;
    … …  
    823737              else if (strcmp(name,"Arrhenius")==0) return ArrheniusEnum;
    824738              else if (strcmp(name,"LliboutryDuval")==0) return LliboutryDuvalEnum;
    825               else if (strcmp(name,"Spclevelset")==0) return SpclevelsetEnum;
    826739              else if (strcmp(name,"ExtrapolationVariable")==0) return ExtrapolationVariableEnum;
    827740              else if (strcmp(name,"IceMaskNodeActivation")==0) return IceMaskNodeActivationEnum;
    … …  
    839752              else if (strcmp(name,"SealevelriseMaxiter")==0) return SealevelriseMaxiterEnum;
    840753              else if (strcmp(name,"SealevelriseReltol")==0) return SealevelriseReltolEnum;
    841               else if (strcmp(name,"SealevelriseAbstol")==0) return SealevelriseAbstolEnum;
    842               else if (strcmp(name,"SealevelriseLoveH")==0) return SealevelriseLoveHEnum;
    843               else if (strcmp(name,"SealevelriseLoveK")==0) return SealevelriseLoveKEnum;
    844               else if (strcmp(name,"SealevelriseTideLoveH")==0) return SealevelriseTideLoveHEnum;
    845               else if (strcmp(name,"SealevelriseTideLoveK")==0) return SealevelriseTideLoveKEnum;
     754         else stage=7;
     755   }
     756   if(stage==7){
     757              if (strcmp(name,"SealevelriseAbstol")==0) return SealevelriseAbstolEnum;
    846758              else if (strcmp(name,"SealevelriseRigid")==0) return SealevelriseRigidEnum;
    847759              else if (strcmp(name,"SealevelriseElastic")==0) return SealevelriseElasticEnum;
    848               else if (strcmp(name,"SealevelriseRotation")==0) return SealevelriseRotationEnum;
    849760              else if (strcmp(name,"SealevelriseGElastic")==0) return SealevelriseGElasticEnum;
    850761              else if (strcmp(name,"SealevelriseUElastic")==0) return SealevelriseUElasticEnum;
    851762              else if (strcmp(name,"SealevelriseHElastic")==0) return SealevelriseHElasticEnum;
    852               else if (strcmp(name,"SealevelriseDegacc")==0) return SealevelriseDegaccEnum;
    853763              else if (strcmp(name,"SealevelriseTransitions")==0) return SealevelriseTransitionsEnum;
    854764              else if (strcmp(name,"SealevelriseRequestedOutputs")==0) return SealevelriseRequestedOutputsEnum;
    … …  
    875785              else if (strcmp(name,"FileParam")==0) return FileParamEnum;
    876786              else if (strcmp(name,"Input")==0) return InputEnum;
    877          else stage=8;
    878    }
    879    if(stage==8){
    880               if (strcmp(name,"IntInput")==0) return IntInputEnum;
     787              else if (strcmp(name,"IntInput")==0) return IntInputEnum;
    881788              else if (strcmp(name,"IntParam")==0) return IntParamEnum;
    882789              else if (strcmp(name,"IntVecParam")==0) return IntVecParamEnum;
    … …  
    888795              else if (strcmp(name,"Node")==0) return NodeEnum;
    889796              else if (strcmp(name,"Numericalflux")==0) return NumericalfluxEnum;
    890               else if (strcmp(name,"NumericalfluxType")==0) return NumericalfluxTypeEnum;
    891797              else if (strcmp(name,"Neumannflux")==0) return NeumannfluxEnum;
    892798              else if (strcmp(name,"Param")==0) return ParamEnum;
    … …  
    897803              else if (strcmp(name,"MatrixParam")==0) return MatrixParamEnum;
    898804              else if (strcmp(name,"Masscon")==0) return MassconEnum;
    899               else if (strcmp(name,"MassconName")==0) return MassconNameEnum;
    900               else if (strcmp(name,"MassconDefinitionenum")==0) return MassconDefinitionenumEnum;
    901               else if (strcmp(name,"MassconLevelset")==0) return MassconLevelsetEnum;
    902805              else if (strcmp(name,"Massconaxpby")==0) return MassconaxpbyEnum;
    903               else if (strcmp(name,"MassconaxpbyName")==0) return MassconaxpbyNameEnum;
    904               else if (strcmp(name,"MassconaxpbyDefinitionenum")==0) return MassconaxpbyDefinitionenumEnum;
    905               else if (strcmp(name,"MassconaxpbyNamex")==0) return MassconaxpbyNamexEnum;
    906               else if (strcmp(name,"MassconaxpbyNamey")==0) return MassconaxpbyNameyEnum;
    907               else if (strcmp(name,"MassconaxpbyAlpha")==0) return MassconaxpbyAlphaEnum;
    908               else if (strcmp(name,"MassconaxpbyBeta")==0) return MassconaxpbyBetaEnum;
    909806              else if (strcmp(name,"NodeSId")==0) return NodeSIdEnum;
    910807              else if (strcmp(name,"VectorParam")==0) return VectorParamEnum;
    911808              else if (strcmp(name,"Riftfront")==0) return RiftfrontEnum;
    912               else if (strcmp(name,"RiftfrontType")==0) return RiftfrontTypeEnum;
    913809              else if (strcmp(name,"Segment")==0) return SegmentEnum;
    914810              else if (strcmp(name,"SegmentRiftfront")==0) return SegmentRiftfrontEnum;
    … …  
    955851              else if (strcmp(name,"StressbalanceVerticalAnalysis")==0) return StressbalanceVerticalAnalysisEnum;
    956852              else if (strcmp(name,"EnthalpyAnalysis")==0) return EnthalpyAnalysisEnum;
    957               else if (strcmp(name,"FlaimAnalysis")==0) return FlaimAnalysisEnum;
    958               else if (strcmp(name,"FlaimSolution")==0) return FlaimSolutionEnum;
    959853              else if (strcmp(name,"HydrologyShreveAnalysis")==0) return HydrologyShreveAnalysisEnum;
    960854              else if (strcmp(name,"HydrologyDCInefficientAnalysis")==0) return HydrologyDCInefficientAnalysisEnum;
    … …  
    967861              else if (strcmp(name,"FreeSurfaceBaseAnalysis")==0) return FreeSurfaceBaseAnalysisEnum;
    968862              else if (strcmp(name,"FreeSurfaceTopAnalysis")==0) return FreeSurfaceTopAnalysisEnum;
    969               else if (strcmp(name,"SurfaceNormalVelocity")==0) return SurfaceNormalVelocityEnum;
    970863              else if (strcmp(name,"ExtrudeFromBaseAnalysis")==0) return ExtrudeFromBaseAnalysisEnum;
    971864              else if (strcmp(name,"ExtrudeFromTopAnalysis")==0) return ExtrudeFromTopAnalysisEnum;
    … …  
    982875              else if (strcmp(name,"GiaSolution")==0) return GiaSolutionEnum;
    983876              else if (strcmp(name,"GiaAnalysis")==0) return GiaAnalysisEnum;
    984               else if (strcmp(name,"MeshdeformationSolution")==0) return MeshdeformationSolutionEnum;
    985               else if (strcmp(name,"MeshdeformationAnalysis")==0) return MeshdeformationAnalysisEnum;
     877         else stage=8;
     878   }
     879   if(stage==8){
     880              if (strcmp(name,"MeshdeformationAnalysis")==0) return MeshdeformationAnalysisEnum;
    986881              else if (strcmp(name,"LevelsetAnalysis")==0) return LevelsetAnalysisEnum;
    987882              else if (strcmp(name,"ExtrapolationAnalysis")==0) return ExtrapolationAnalysisEnum;
    … …  
    998893              else if (strcmp(name,"FSvelocity")==0) return FSvelocityEnum;
    999894              else if (strcmp(name,"FSpressure")==0) return FSpressureEnum;
    1000          else stage=9;
    1001    }
    1002    if(stage==9){
    1003               if (strcmp(name,"GaussSeg")==0) return GaussSegEnum;
     895              else if (strcmp(name,"GaussSeg")==0) return GaussSegEnum;
    1004896              else if (strcmp(name,"GaussTria")==0) return GaussTriaEnum;
    1005897              else if (strcmp(name,"GaussTetra")==0) return GaussTetraEnum;
    … …  
    1067959              else if (strcmp(name,"Results")==0) return ResultsEnum;
    1068960              else if (strcmp(name,"MaximumNumberOfDefinitions")==0) return MaximumNumberOfDefinitionsEnum;
    1069          else stage=10;
     961         else stage=9;
    1070962   }
    1071963        /*If we reach this point, the string provided has not been found*/
Note: See TracChangeset for help on using the changeset viewer.