Changeset 11418


Ignore:
Timestamp:
02/13/12 16:06:09 (13 years ago)
Author:
cborstad
Message:

enum updates after merging changes from trunk-jpl

Location:
issm/trunk-jpl-damage/src
Files:
4 deleted
1 edited

Legend:

Unmodified
Added
Removed

  • TabularUnified issm/trunk-jpl-damage/src/c/modules/StringToEnumx/StringToEnumx.cpp

    r11417 r11418  
    1414int  StringToEnumx(const char* name){
    1515
    16 <<<<<<< .working
    17         if (strcmp(name,"AutodiffForward")==0) return AutodiffForwardEnum;
    18         else if (strcmp(name,"AutodiffIsautodiff")==0) return AutodiffIsautodiffEnum;
    19         else if (strcmp(name,"AutodiffReverse")==0) return AutodiffReverseEnum;
    20         else if (strcmp(name,"BalancethicknessSpcthickness")==0) return BalancethicknessSpcthicknessEnum;
    21         else if (strcmp(name,"BalancethicknessStabilization")==0) return BalancethicknessStabilizationEnum;
    22         else if (strcmp(name,"BalancethicknessThickeningRate")==0) return BalancethicknessThickeningRateEnum;
    23         else if (strcmp(name,"BasalforcingsGeothermalflux")==0) return BasalforcingsGeothermalfluxEnum;
    24         else if (strcmp(name,"BasalforcingsMeltingRateCorrection")==0) return BasalforcingsMeltingRateCorrectionEnum;
    25         else if (strcmp(name,"BasalforcingsMeltingRate")==0) return BasalforcingsMeltingRateEnum;
    26         else if (strcmp(name,"Bathymetry")==0) return BathymetryEnum;
    27         else if (strcmp(name,"Bed")==0) return BedEnum;
    28         else if (strcmp(name,"ConstantsG")==0) return ConstantsGEnum;
    29         else if (strcmp(name,"ConstantsReferencetemperature")==0) return ConstantsReferencetemperatureEnum;
    30         else if (strcmp(name,"ConstantsYts")==0) return ConstantsYtsEnum;
    31         else if (strcmp(name,"DiagnosticAbstol")==0) return DiagnosticAbstolEnum;
    32         else if (strcmp(name,"DiagnosticIcefront")==0) return DiagnosticIcefrontEnum;
    33         else if (strcmp(name,"DiagnosticMaxiter")==0) return DiagnosticMaxiterEnum;
    34         else if (strcmp(name,"DiagnosticNumRequestedOutputs")==0) return DiagnosticNumRequestedOutputsEnum;
    35         else if (strcmp(name,"DiagnosticPenaltyFactor")==0) return DiagnosticPenaltyFactorEnum;
    36         else if (strcmp(name,"DiagnosticReferential")==0) return DiagnosticReferentialEnum;
    37         else if (strcmp(name,"DiagnosticReltol")==0) return DiagnosticReltolEnum;
    38         else if (strcmp(name,"DiagnosticRequestedOutputs")==0) return DiagnosticRequestedOutputsEnum;
    39         else if (strcmp(name,"DiagnosticRestol")==0) return DiagnosticRestolEnum;
    40         else if (strcmp(name,"DiagnosticRiftPenaltyLock")==0) return DiagnosticRiftPenaltyLockEnum;
    41         else if (strcmp(name,"DiagnosticRiftPenaltyThreshold")==0) return DiagnosticRiftPenaltyThresholdEnum;
    42         else if (strcmp(name,"DiagnosticShelfDampening")==0) return DiagnosticShelfDampeningEnum;
    43         else if (strcmp(name,"DiagnosticSpcvx")==0) return DiagnosticSpcvxEnum;
    44         else if (strcmp(name,"DiagnosticSpcvy")==0) return DiagnosticSpcvyEnum;
    45         else if (strcmp(name,"DiagnosticSpcvz")==0) return DiagnosticSpcvzEnum;
    46         else if (strcmp(name,"DiagnosticStokesreconditioning")==0) return DiagnosticStokesreconditioningEnum;
    47         else if (strcmp(name,"DiagnosticVertexPairing")==0) return DiagnosticVertexPairingEnum;
    48         else if (strcmp(name,"DiagnosticViscosityOvershoot")==0) return DiagnosticViscosityOvershootEnum;
    49         else if (strcmp(name,"FlowequationBordermacayeal")==0) return FlowequationBordermacayealEnum;
    50         else if (strcmp(name,"FlowequationBorderpattyn")==0) return FlowequationBorderpattynEnum;
    51         else if (strcmp(name,"FlowequationBorderstokes")==0) return FlowequationBorderstokesEnum;
    52         else if (strcmp(name,"FlowequationElementEquation")==0) return FlowequationElementEquationEnum;
    53         else if (strcmp(name,"FlowequationIshutter")==0) return FlowequationIshutterEnum;
    54         else if (strcmp(name,"FlowequationIsmacayealpattyn")==0) return FlowequationIsmacayealpattynEnum;
    55         else if (strcmp(name,"FlowequationIsstokes")==0) return FlowequationIsstokesEnum;
    56         else if (strcmp(name,"FlowequationVertexEquation")==0) return FlowequationVertexEquationEnum;
    57         else if (strcmp(name,"FrictionCoefficient")==0) return FrictionCoefficientEnum;
    58         else if (strcmp(name,"FrictionP")==0) return FrictionPEnum;
    59         else if (strcmp(name,"FrictionQ")==0) return FrictionQEnum;
    60         else if (strcmp(name,"GeometryHydrostaticRatio")==0) return GeometryHydrostaticRatioEnum;
    61         else if (strcmp(name,"HydrologyCR")==0) return HydrologyCREnum;
    62         else if (strcmp(name,"HydrologyKn")==0) return HydrologyKnEnum;
    63         else if (strcmp(name,"HydrologyN")==0) return HydrologyNEnum;
    64         else if (strcmp(name,"HydrologyP")==0) return HydrologyPEnum;
    65         else if (strcmp(name,"HydrologyQ")==0) return HydrologyQEnum;
    66         else if (strcmp(name,"HydrologySpcwatercolumn")==0) return HydrologySpcwatercolumnEnum;
    67         else if (strcmp(name,"HydrologyStabilization")==0) return HydrologyStabilizationEnum;
    68         else if (strcmp(name,"InversionControlParameters")==0) return InversionControlParametersEnum;
    69         else if (strcmp(name,"InversionCostFunction")==0) return InversionCostFunctionEnum;
    70         else if (strcmp(name,"InversionCostFunctionThreshold")==0) return InversionCostFunctionThresholdEnum;
    71         else if (strcmp(name,"InversionCostFunctionsCoefficients")==0) return InversionCostFunctionsCoefficientsEnum;
    72         else if (strcmp(name,"InversionCostFunctions")==0) return InversionCostFunctionsEnum;
    73         else if (strcmp(name,"InversionGradientOnly")==0) return InversionGradientOnlyEnum;
    74         else if (strcmp(name,"InversionGradientScaling")==0) return InversionGradientScalingEnum;
    75         else if (strcmp(name,"InversionIscontrol")==0) return InversionIscontrolEnum;
    76         else if (strcmp(name,"InversionTao")==0) return InversionTaoEnum;
    77         else if (strcmp(name,"InversionMaxParameters")==0) return InversionMaxParametersEnum;
    78         else if (strcmp(name,"InversionMaxiterPerStep")==0) return InversionMaxiterPerStepEnum;
    79         else if (strcmp(name,"InversionMinParameters")==0) return InversionMinParametersEnum;
    80         else if (strcmp(name,"InversionNsteps")==0) return InversionNstepsEnum;
    81         else if (strcmp(name,"InversionNumControlParameters")==0) return InversionNumControlParametersEnum;
    82         else if (strcmp(name,"InversionNumCostFunctions")==0) return InversionNumCostFunctionsEnum;
    83         else if (strcmp(name,"InversionStepThreshold")==0) return InversionStepThresholdEnum;
    84         else if (strcmp(name,"InversionThicknessObs")==0) return InversionThicknessObsEnum;
    85         else if (strcmp(name,"InversionVelObs")==0) return InversionVelObsEnum;
    86         else if (strcmp(name,"InversionVxObs")==0) return InversionVxObsEnum;
    87         else if (strcmp(name,"InversionVyObs")==0) return InversionVyObsEnum;
    88         else if (strcmp(name,"InversionVzObs")==0) return InversionVzObsEnum;
    89         else if (strcmp(name,"MaskElementonfloatingice")==0) return MaskElementonfloatingiceEnum;
    90         else if (strcmp(name,"MaskElementongroundedice")==0) return MaskElementongroundediceEnum;
    91         else if (strcmp(name,"MaskElementonwater")==0) return MaskElementonwaterEnum;
    92         else if (strcmp(name,"MaskVertexonfloatingice")==0) return MaskVertexonfloatingiceEnum;
    93         else if (strcmp(name,"MaskVertexongroundedice")==0) return MaskVertexongroundediceEnum;
    94         else if (strcmp(name,"MaskVertexonwater")==0) return MaskVertexonwaterEnum;
    95         else if (strcmp(name,"MaterialsBeta")==0) return MaterialsBetaEnum;
    96         else if (strcmp(name,"MaterialsHeatcapacity")==0) return MaterialsHeatcapacityEnum;
    97         else if (strcmp(name,"MaterialsLatentheat")==0) return MaterialsLatentheatEnum;
    98         else if (strcmp(name,"MaterialsMeltingpoint")==0) return MaterialsMeltingpointEnum;
    99         else if (strcmp(name,"MaterialsMixedLayerCapacity")==0) return MaterialsMixedLayerCapacityEnum;
    100         else if (strcmp(name,"MaterialsRheologyB")==0) return MaterialsRheologyBEnum;
    101         else if (strcmp(name,"MaterialsRheologyBbar")==0) return MaterialsRheologyBbarEnum;
    102         else if (strcmp(name,"MaterialsRheologyLaw")==0) return MaterialsRheologyLawEnum;
    103         else if (strcmp(name,"MaterialsRheologyN")==0) return MaterialsRheologyNEnum;
    104         else if (strcmp(name,"MaterialsRheologyZ")==0) return MaterialsRheologyZEnum;
    105         else if (strcmp(name,"MaterialsRheologyZbar")==0) return MaterialsRheologyZbarEnum;
    106         else if (strcmp(name,"MaterialsRhoIce")==0) return MaterialsRhoIceEnum;
    107         else if (strcmp(name,"MaterialsRhoWater")==0) return MaterialsRhoWaterEnum;
    108         else if (strcmp(name,"MaterialsMuWater")==0) return MaterialsMuWaterEnum;
    109         else if (strcmp(name,"MaterialsThermalExchangeVelocity")==0) return MaterialsThermalExchangeVelocityEnum;
    110         else if (strcmp(name,"MaterialsThermalconductivity")==0) return MaterialsThermalconductivityEnum;
    111         else if (strcmp(name,"MeshAverageVertexConnectivity")==0) return MeshAverageVertexConnectivityEnum;
    112         else if (strcmp(name,"MeshDimension")==0) return MeshDimensionEnum;
    113         else if (strcmp(name,"MeshEdges")==0) return MeshEdgesEnum;
    114         else if (strcmp(name,"MeshElementconnectivity")==0) return MeshElementconnectivityEnum;
    115         else if (strcmp(name,"MeshElementonbed")==0) return MeshElementonbedEnum;
    116         else if (strcmp(name,"MeshElementonsurface")==0) return MeshElementonsurfaceEnum;
    117         else if (strcmp(name,"MeshElements2d")==0) return MeshElements2dEnum;
    118         else if (strcmp(name,"MeshElements")==0) return MeshElementsEnum;
    119         else if (strcmp(name,"MeshLowerelements")==0) return MeshLowerelementsEnum;
    120         else if (strcmp(name,"MeshNumberofedges")==0) return MeshNumberofedgesEnum;
    121         else if (strcmp(name,"MeshNumberofelements2d")==0) return MeshNumberofelements2dEnum;
    122         else if (strcmp(name,"MeshNumberofelements")==0) return MeshNumberofelementsEnum;
    123         else if (strcmp(name,"MeshNumberoflayers")==0) return MeshNumberoflayersEnum;
    124         else if (strcmp(name,"MeshNumberofvertices2d")==0) return MeshNumberofvertices2dEnum;
    125         else if (strcmp(name,"MeshNumberofvertices")==0) return MeshNumberofverticesEnum;
    126         else if (strcmp(name,"MeshUpperelements")==0) return MeshUpperelementsEnum;
    127         else if (strcmp(name,"MeshVertexonbed")==0) return MeshVertexonbedEnum;
    128         else if (strcmp(name,"MeshVertexonsurface")==0) return MeshVertexonsurfaceEnum;
    129         else if (strcmp(name,"MeshX")==0) return MeshXEnum;
    130         else if (strcmp(name,"MeshY")==0) return MeshYEnum;
    131         else if (strcmp(name,"MeshZ")==0) return MeshZEnum;
    132         else if (strcmp(name,"MiscellaneousName")==0) return MiscellaneousNameEnum;
    133         else if (strcmp(name,"PrognosticHydrostaticAdjustment")==0) return PrognosticHydrostaticAdjustmentEnum;
    134         else if (strcmp(name,"PrognosticMinThickness")==0) return PrognosticMinThicknessEnum;
    135         else if (strcmp(name,"PrognosticPenaltyFactor")==0) return PrognosticPenaltyFactorEnum;
    136         else if (strcmp(name,"PrognosticSpcthickness")==0) return PrognosticSpcthicknessEnum;
    137         else if (strcmp(name,"PrognosticStabilization")==0) return PrognosticStabilizationEnum;
    138         else if (strcmp(name,"PrognosticVertexPairing")==0) return PrognosticVertexPairingEnum;
    139         else if (strcmp(name,"QmuIsdakota")==0) return QmuIsdakotaEnum;
    140         else if (strcmp(name,"QmuMassFluxSegments")==0) return QmuMassFluxSegmentsEnum;
    141         else if (strcmp(name,"QmuNumberofpartitions")==0) return QmuNumberofpartitionsEnum;
    142         else if (strcmp(name,"QmuNumberofresponses")==0) return QmuNumberofresponsesEnum;
    143         else if (strcmp(name,"QmuPartition")==0) return QmuPartitionEnum;
    144         else if (strcmp(name,"QmuResponsedescriptors")==0) return QmuResponsedescriptorsEnum;
    145         else if (strcmp(name,"QmuVariabledescriptors")==0) return QmuVariabledescriptorsEnum;
    146         else if (strcmp(name,"RiftsNumrifts")==0) return RiftsNumriftsEnum;
    147         else if (strcmp(name,"RiftsRiftstruct")==0) return RiftsRiftstructEnum;
    148         else if (strcmp(name,"SettingsIoGather")==0) return SettingsIoGatherEnum;
    149         else if (strcmp(name,"SettingsLowmem")==0) return SettingsLowmemEnum;
    150         else if (strcmp(name,"SettingsOutputFrequency")==0) return SettingsOutputFrequencyEnum;
    151         else if (strcmp(name,"SettingsResultsAsPatches")==0) return SettingsResultsAsPatchesEnum;
    152         else if (strcmp(name,"SettingsWaitonlock")==0) return SettingsWaitonlockEnum;
    153         else if (strcmp(name,"SteadystateMaxiter")==0) return SteadystateMaxiterEnum;
    154         else if (strcmp(name,"SteadystateNumRequestedOutputs")==0) return SteadystateNumRequestedOutputsEnum;
    155         else if (strcmp(name,"SteadystateReltol")==0) return SteadystateReltolEnum;
    156         else if (strcmp(name,"SteadystateRequestedOutputs")==0) return SteadystateRequestedOutputsEnum;
    157         else if (strcmp(name,"Surface")==0) return SurfaceEnum;
    158         else if (strcmp(name,"SurfaceforcingsAblationRate")==0) return SurfaceforcingsAblationRateEnum;
    159         else if (strcmp(name,"SurfaceforcingsAccumulationRate")==0) return SurfaceforcingsAccumulationRateEnum;
    160         else if (strcmp(name,"SurfaceforcingsMassBalance")==0) return SurfaceforcingsMassBalanceEnum;
    161         else if (strcmp(name,"ThermalMaxiter")==0) return ThermalMaxiterEnum;
    162         else if (strcmp(name,"ThermalPenaltyFactor")==0) return ThermalPenaltyFactorEnum;
    163         else if (strcmp(name,"ThermalPenaltyLock")==0) return ThermalPenaltyLockEnum;
    164         else if (strcmp(name,"ThermalPenaltyThreshold")==0) return ThermalPenaltyThresholdEnum;
    165         else if (strcmp(name,"ThermalSpctemperature")==0) return ThermalSpctemperatureEnum;
    166         else if (strcmp(name,"ThermalStabilization")==0) return ThermalStabilizationEnum;
    167         else if (strcmp(name,"Thickness")==0) return ThicknessEnum;
    168         else if (strcmp(name,"TimesteppingCflCoefficient")==0) return TimesteppingCflCoefficientEnum;
    169         else if (strcmp(name,"TimesteppingFinalTime")==0) return TimesteppingFinalTimeEnum;
    170         else if (strcmp(name,"TimesteppingTimeAdapt")==0) return TimesteppingTimeAdaptEnum;
    171         else if (strcmp(name,"TimesteppingTimeStep")==0) return TimesteppingTimeStepEnum;
    172         else if (strcmp(name,"TransientIsdiagnostic")==0) return TransientIsdiagnosticEnum;
    173         else if (strcmp(name,"TransientIsgroundingline")==0) return TransientIsgroundinglineEnum;
    174         else if (strcmp(name,"TransientIsprognostic")==0) return TransientIsprognosticEnum;
    175         else if (strcmp(name,"TransientIsthermal")==0) return TransientIsthermalEnum;
    176         else if (strcmp(name,"TransientNumRequestedOutputs")==0) return TransientNumRequestedOutputsEnum;
    177         else if (strcmp(name,"TransientRequestedOutputs")==0) return TransientRequestedOutputsEnum;
    178         else if (strcmp(name,"SolutionType")==0) return SolutionTypeEnum;
    179         else if (strcmp(name,"AnalysisType")==0) return AnalysisTypeEnum;
    180         else if (strcmp(name,"ConfigurationType")==0) return ConfigurationTypeEnum;
    181         else if (strcmp(name,"AdjointBalancethicknessAnalysis")==0) return AdjointBalancethicknessAnalysisEnum;
    182         else if (strcmp(name,"AdjointHorizAnalysis")==0) return AdjointHorizAnalysisEnum;
    183         else if (strcmp(name,"AdjointSolution")==0) return AdjointSolutionEnum;
    184         else if (strcmp(name,"AnalysisCounter")==0) return AnalysisCounterEnum;
    185         else if (strcmp(name,"BalancethicknessAnalysis")==0) return BalancethicknessAnalysisEnum;
    186         else if (strcmp(name,"BalancethicknessSolution")==0) return BalancethicknessSolutionEnum;
    187         else if (strcmp(name,"BedSlopeAnalysis")==0) return BedSlopeAnalysisEnum;
    188         else if (strcmp(name,"BedSlopeSolution")==0) return BedSlopeSolutionEnum;
    189         else if (strcmp(name,"BedSlopeXAnalysis")==0) return BedSlopeXAnalysisEnum;
    190         else if (strcmp(name,"BedSlopeYAnalysis")==0) return BedSlopeYAnalysisEnum;
    191         else if (strcmp(name,"DiagnosticHorizAnalysis")==0) return DiagnosticHorizAnalysisEnum;
    192         else if (strcmp(name,"DiagnosticHutterAnalysis")==0) return DiagnosticHutterAnalysisEnum;
    193         else if (strcmp(name,"DiagnosticSolution")==0) return DiagnosticSolutionEnum;
    194         else if (strcmp(name,"DiagnosticVertAnalysis")==0) return DiagnosticVertAnalysisEnum;
    195         else if (strcmp(name,"EnthalpyAnalysis")==0) return EnthalpyAnalysisEnum;
    196         else if (strcmp(name,"EnthalpySolution")==0) return EnthalpySolutionEnum;
    197         else if (strcmp(name,"FlaimAnalysis")==0) return FlaimAnalysisEnum;
    198         else if (strcmp(name,"FlaimSolution")==0) return FlaimSolutionEnum;
    199         else if (strcmp(name,"HydrologyAnalysis")==0) return HydrologyAnalysisEnum;
    200         else if (strcmp(name,"HydrologySolution")==0) return HydrologySolutionEnum;
    201         else if (strcmp(name,"MeltingAnalysis")==0) return MeltingAnalysisEnum;
    202         else if (strcmp(name,"NoneAnalysis")==0) return NoneAnalysisEnum;
    203         else if (strcmp(name,"PrognosticAnalysis")==0) return PrognosticAnalysisEnum;
    204         else if (strcmp(name,"PrognosticSolution")==0) return PrognosticSolutionEnum;
    205         else if (strcmp(name,"SteadystateSolution")==0) return SteadystateSolutionEnum;
    206         else if (strcmp(name,"SurfaceSlopeAnalysis")==0) return SurfaceSlopeAnalysisEnum;
    207         else if (strcmp(name,"SurfaceSlopeSolution")==0) return SurfaceSlopeSolutionEnum;
    208         else if (strcmp(name,"SurfaceSlopeXAnalysis")==0) return SurfaceSlopeXAnalysisEnum;
    209         else if (strcmp(name,"SurfaceSlopeYAnalysis")==0) return SurfaceSlopeYAnalysisEnum;
    210         else if (strcmp(name,"ThermalAnalysis")==0) return ThermalAnalysisEnum;
    211         else if (strcmp(name,"ThermalSolution")==0) return ThermalSolutionEnum;
    212         else if (strcmp(name,"TransientSolution")==0) return TransientSolutionEnum;
    213         else if (strcmp(name,"Approximation")==0) return ApproximationEnum;
    214         else if (strcmp(name,"HutterApproximation")==0) return HutterApproximationEnum;
    215         else if (strcmp(name,"MacAyealApproximation")==0) return MacAyealApproximationEnum;
    216         else if (strcmp(name,"MacAyealPattynApproximation")==0) return MacAyealPattynApproximationEnum;
    217         else if (strcmp(name,"MacAyealStokesApproximation")==0) return MacAyealStokesApproximationEnum;
    218         else if (strcmp(name,"NoneApproximation")==0) return NoneApproximationEnum;
    219         else if (strcmp(name,"PattynApproximation")==0) return PattynApproximationEnum;
    220         else if (strcmp(name,"PattynStokesApproximation")==0) return PattynStokesApproximationEnum;
    221         else if (strcmp(name,"StokesApproximation")==0) return StokesApproximationEnum;
    222         else if (strcmp(name,"Constraints")==0) return ConstraintsEnum;
    223         else if (strcmp(name,"Loads")==0) return LoadsEnum;
    224         else if (strcmp(name,"Materials")==0) return MaterialsEnum;
    225         else if (strcmp(name,"Nodes")==0) return NodesEnum;
    226         else if (strcmp(name,"Parameters")==0) return ParametersEnum;
    227         else if (strcmp(name,"Vertices")==0) return VerticesEnum;
    228         else if (strcmp(name,"Results")==0) return ResultsEnum;
    229         else if (strcmp(name,"BoolInput")==0) return BoolInputEnum;
    230         else if (strcmp(name,"BoolParam")==0) return BoolParamEnum;
    231         else if (strcmp(name,"ControlInput")==0) return ControlInputEnum;
    232         else if (strcmp(name,"DatasetInput")==0) return DatasetInputEnum;
    233         else if (strcmp(name,"DofIndexing")==0) return DofIndexingEnum;
    234         else if (strcmp(name,"DoubleInput")==0) return DoubleInputEnum;
    235         else if (strcmp(name,"DoubleMatArrayParam")==0) return DoubleMatArrayParamEnum;
    236         else if (strcmp(name,"DoubleMatParam")==0) return DoubleMatParamEnum;
    237         else if (strcmp(name,"DoubleParam")==0) return DoubleParamEnum;
    238         else if (strcmp(name,"DoubleVecParam")==0) return DoubleVecParamEnum;
    239         else if (strcmp(name,"Element")==0) return ElementEnum;
    240         else if (strcmp(name,"ElementResult")==0) return ElementResultEnum;
    241         else if (strcmp(name,"ExternalResult")==0) return ExternalResultEnum;
    242         else if (strcmp(name,"FileParam")==0) return FileParamEnum;
    243         else if (strcmp(name,"Hook")==0) return HookEnum;
    244         else if (strcmp(name,"Icefront")==0) return IcefrontEnum;
    245         else if (strcmp(name,"Input")==0) return InputEnum;
    246         else if (strcmp(name,"IntInput")==0) return IntInputEnum;
    247         else if (strcmp(name,"IntParam")==0) return IntParamEnum;
    248         else if (strcmp(name,"IntVecParam")==0) return IntVecParamEnum;
    249         else if (strcmp(name,"MacAyeal2dIceFront")==0) return MacAyeal2dIceFrontEnum;
    250         else if (strcmp(name,"MacAyeal3dIceFront")==0) return MacAyeal3dIceFrontEnum;
    251         else if (strcmp(name,"Matice")==0) return MaticeEnum;
    252         else if (strcmp(name,"Matpar")==0) return MatparEnum;
    253         else if (strcmp(name,"Node")==0) return NodeEnum;
    254         else if (strcmp(name,"Numericalflux")==0) return NumericalfluxEnum;
    255         else if (strcmp(name,"Param")==0) return ParamEnum;
    256         else if (strcmp(name,"PattynIceFront")==0) return PattynIceFrontEnum;
    257         else if (strcmp(name,"Pengrid")==0) return PengridEnum;
    258         else if (strcmp(name,"Penpair")==0) return PenpairEnum;
    259         else if (strcmp(name,"Penta")==0) return PentaEnum;
    260         else if (strcmp(name,"PentaP1Input")==0) return PentaP1InputEnum;
    261         else if (strcmp(name,"PetscMatParam")==0) return PetscMatParamEnum;
    262         else if (strcmp(name,"PetscVecParam")==0) return PetscVecParamEnum;
    263         else if (strcmp(name,"Riftfront")==0) return RiftfrontEnum;
    264         else if (strcmp(name,"Segment")==0) return SegmentEnum;
    265         else if (strcmp(name,"SegmentRiftfront")==0) return SegmentRiftfrontEnum;
    266         else if (strcmp(name,"SpcDynamic")==0) return SpcDynamicEnum;
    267         else if (strcmp(name,"SpcStatic")==0) return SpcStaticEnum;
    268         else if (strcmp(name,"SpcTransient")==0) return SpcTransientEnum;
    269         else if (strcmp(name,"StokesIceFront")==0) return StokesIceFrontEnum;
    270         else if (strcmp(name,"StringArrayParam")==0) return StringArrayParamEnum;
    271         else if (strcmp(name,"StringParam")==0) return StringParamEnum;
    272         else if (strcmp(name,"Tria")==0) return TriaEnum;
    273         else if (strcmp(name,"TriaP1Input")==0) return TriaP1InputEnum;
    274         else if (strcmp(name,"Vertex")==0) return VertexEnum;
    275         else if (strcmp(name,"Air")==0) return AirEnum;
    276         else if (strcmp(name,"Ice")==0) return IceEnum;
    277         else if (strcmp(name,"Melange")==0) return MelangeEnum;
    278         else if (strcmp(name,"Water")==0) return WaterEnum;
    279         else if (strcmp(name,"Closed")==0) return ClosedEnum;
    280         else if (strcmp(name,"Free")==0) return FreeEnum;
    281         else if (strcmp(name,"Open")==0) return OpenEnum;
    282         else if (strcmp(name,"Adjointp")==0) return AdjointpEnum;
    283         else if (strcmp(name,"Adjointx")==0) return AdjointxEnum;
    284         else if (strcmp(name,"Adjointy")==0) return AdjointyEnum;
    285         else if (strcmp(name,"Adjointz")==0) return AdjointzEnum;
    286         else if (strcmp(name,"BedSlopeX")==0) return BedSlopeXEnum;
    287         else if (strcmp(name,"BedSlopeY")==0) return BedSlopeYEnum;
    288         else if (strcmp(name,"Boundary")==0) return BoundaryEnum;
    289         else if (strcmp(name,"Constant")==0) return ConstantEnum;
    290         else if (strcmp(name,"Converged")==0) return ConvergedEnum;
    291         else if (strcmp(name,"ExtToIu")==0) return ExtToIuEnum;
    292         else if (strcmp(name,"Fill")==0) return FillEnum;
    293         else if (strcmp(name,"FractionIncrement")==0) return FractionIncrementEnum;
    294         else if (strcmp(name,"Friction")==0) return FrictionEnum;
    295         else if (strcmp(name,"GroundinglineMeltingRate")==0) return GroundinglineMeltingRateEnum;
    296         else if (strcmp(name,"Internal")==0) return InternalEnum;
    297         else if (strcmp(name,"IuToExt")==0) return IuToExtEnum;
    298         else if (strcmp(name,"MassFlux")==0) return MassFluxEnum;
    299         else if (strcmp(name,"MaxPenetration")==0) return MaxPenetrationEnum;
    300         else if (strcmp(name,"MeltingOffset")==0) return MeltingOffsetEnum;
    301         else if (strcmp(name,"Misfit")==0) return MisfitEnum;
    302         else if (strcmp(name,"NumberNodeToElementConnectivity")==0) return NumberNodeToElementConnectivityEnum;
    303         else if (strcmp(name,"Pressure")==0) return PressureEnum;
    304         else if (strcmp(name,"PressurePicard")==0) return PressurePicardEnum;
    305         else if (strcmp(name,"QmuPressure")==0) return QmuPressureEnum;
    306         else if (strcmp(name,"QmuVx")==0) return QmuVxEnum;
    307         else if (strcmp(name,"QmuVy")==0) return QmuVyEnum;
    308         else if (strcmp(name,"QmuVz")==0) return QmuVzEnum;
    309         else if (strcmp(name,"QmuThickness")==0) return QmuThicknessEnum;
    310         else if (strcmp(name,"QmuBed")==0) return QmuBedEnum;
    311         else if (strcmp(name,"QmuSurface")==0) return QmuSurfaceEnum;
    312         else if (strcmp(name,"QmuMelting")==0) return QmuMeltingEnum;
    313         else if (strcmp(name,"ResetPenalties")==0) return ResetPenaltiesEnum;
    314         else if (strcmp(name,"SegmentOnIceShelf")==0) return SegmentOnIceShelfEnum;
    315         else if (strcmp(name,"SurfaceAbsVelMisfit")==0) return SurfaceAbsVelMisfitEnum;
    316         else if (strcmp(name,"SurfaceArea")==0) return SurfaceAreaEnum;
    317         else if (strcmp(name,"SurfaceAverageVelMisfit")==0) return SurfaceAverageVelMisfitEnum;
    318         else if (strcmp(name,"SurfaceLogVelMisfit")==0) return SurfaceLogVelMisfitEnum;
    319         else if (strcmp(name,"SurfaceLogVxVyMisfit")==0) return SurfaceLogVxVyMisfitEnum;
    320         else if (strcmp(name,"SurfaceRelVelMisfit")==0) return SurfaceRelVelMisfitEnum;
    321         else if (strcmp(name,"SurfaceSlopeX")==0) return SurfaceSlopeXEnum;
    322         else if (strcmp(name,"SurfaceSlopeY")==0) return SurfaceSlopeYEnum;
    323         else if (strcmp(name,"Temperature")==0) return TemperatureEnum;
    324         else if (strcmp(name,"TemperatureOld")==0) return TemperatureOldEnum;
    325         else if (strcmp(name,"TemperaturePicard")==0) return TemperaturePicardEnum;
    326         else if (strcmp(name,"ThicknessAbsMisfit")==0) return ThicknessAbsMisfitEnum;
    327         else if (strcmp(name,"Type")==0) return TypeEnum;
    328         else if (strcmp(name,"Vel")==0) return VelEnum;
    329         else if (strcmp(name,"Velocity")==0) return VelocityEnum;
    330         else if (strcmp(name,"VxAverage")==0) return VxAverageEnum;
    331         else if (strcmp(name,"Vx")==0) return VxEnum;
    332         else if (strcmp(name,"VxPicard")==0) return VxPicardEnum;
    333         else if (strcmp(name,"VyAverage")==0) return VyAverageEnum;
    334         else if (strcmp(name,"Vy")==0) return VyEnum;
    335         else if (strcmp(name,"VyPicard")==0) return VyPicardEnum;
    336         else if (strcmp(name,"Vz")==0) return VzEnum;
    337         else if (strcmp(name,"VzMacAyeal")==0) return VzMacAyealEnum;
    338         else if (strcmp(name,"VzPattyn")==0) return VzPattynEnum;
    339         else if (strcmp(name,"VzPicard")==0) return VzPicardEnum;
    340         else if (strcmp(name,"VzStokes")==0) return VzStokesEnum;
    341         else if (strcmp(name,"VxMesh")==0) return VxMeshEnum;
    342         else if (strcmp(name,"VyMesh")==0) return VyMeshEnum;
    343         else if (strcmp(name,"VzMesh")==0) return VzMeshEnum;
    344         else if (strcmp(name,"Enthalpy")==0) return EnthalpyEnum;
    345         else if (strcmp(name,"EnthalpyPicard")==0) return EnthalpyPicardEnum;
    346         else if (strcmp(name,"ThicknessAbsGradient")==0) return ThicknessAbsGradientEnum;
    347         else if (strcmp(name,"StepResponses")==0) return StepResponsesEnum;
    348         else if (strcmp(name,"IntMatParam")==0) return IntMatParamEnum;
    349         else if (strcmp(name,"RheologyBbarAbsGradient")==0) return RheologyBbarAbsGradientEnum;
    350         else if (strcmp(name,"DragCoefficientAbsGradient")==0) return DragCoefficientAbsGradientEnum;
    351         else if (strcmp(name,"TransientInput")==0) return TransientInputEnum;
    352         else if (strcmp(name,"Outputfilename")==0) return OutputfilenameEnum;
    353         else if (strcmp(name,"Waterfraction")==0) return WaterfractionEnum;
    354         else if (strcmp(name,"Watercolumn")==0) return WatercolumnEnum;
    355         else if (strcmp(name,"BasalFriction")==0) return BasalFrictionEnum;
    356         else if (strcmp(name,"ViscousHeating")==0) return ViscousHeatingEnum;
    357         else if (strcmp(name,"QmuTemperature")==0) return QmuTemperatureEnum;
    358         else if (strcmp(name,"HydrologyWaterVx")==0) return HydrologyWaterVxEnum;
    359         else if (strcmp(name,"HydrologyWaterVy")==0) return HydrologyWaterVyEnum;
    360         else if (strcmp(name,"StressTensor")==0) return StressTensorEnum;
    361         else if (strcmp(name,"StressTensorxx")==0) return StressTensorxxEnum;
    362         else if (strcmp(name,"StressTensorxy")==0) return StressTensorxyEnum;
    363         else if (strcmp(name,"StressTensorxz")==0) return StressTensorxzEnum;
    364         else if (strcmp(name,"StressTensoryy")==0) return StressTensoryyEnum;
    365         else if (strcmp(name,"StressTensoryz")==0) return StressTensoryzEnum;
    366         else if (strcmp(name,"StressTensorzz")==0) return StressTensorzzEnum;
    367         else if (strcmp(name,"IceVolume")==0) return IceVolumeEnum;
    368         else if (strcmp(name,"P0")==0) return P0Enum;
    369         else if (strcmp(name,"P1")==0) return P1Enum;
    370         else if (strcmp(name,"P1DG")==0) return P1DGEnum;
    371         else if (strcmp(name,"BoolElementResult")==0) return BoolElementResultEnum;
    372         else if (strcmp(name,"BoolExternalResult")==0) return BoolExternalResultEnum;
    373         else if (strcmp(name,"DoubleElementResult")==0) return DoubleElementResultEnum;
    374         else if (strcmp(name,"DoubleExternalResult")==0) return DoubleExternalResultEnum;
    375         else if (strcmp(name,"DoubleMatExternalResult")==0) return DoubleMatExternalResultEnum;
    376         else if (strcmp(name,"DoubleVecExternalResult")==0) return DoubleVecExternalResultEnum;
    377         else if (strcmp(name,"IntExternalResult")==0) return IntExternalResultEnum;
    378         else if (strcmp(name,"J")==0) return JEnum;
    379         else if (strcmp(name,"Patch")==0) return PatchEnum;
    380         else if (strcmp(name,"PatchNodes")==0) return PatchNodesEnum;
    381         else if (strcmp(name,"PatchVertices")==0) return PatchVerticesEnum;
    382         else if (strcmp(name,"PentaP1ElementResult")==0) return PentaP1ElementResultEnum;
    383         else if (strcmp(name,"PetscVecExternalResult")==0) return PetscVecExternalResultEnum;
    384         else if (strcmp(name,"StringExternalResult")==0) return StringExternalResultEnum;
    385         else if (strcmp(name,"Time")==0) return TimeEnum;
    386         else if (strcmp(name,"TriaP1ElementResult")==0) return TriaP1ElementResultEnum;
    387         else if (strcmp(name,"WaterColumnOld")==0) return WaterColumnOldEnum;
    388         else if (strcmp(name,"MinVel")==0) return MinVelEnum;
    389         else if (strcmp(name,"MaxVel")==0) return MaxVelEnum;
    390         else if (strcmp(name,"MinVx")==0) return MinVxEnum;
    391         else if (strcmp(name,"MaxVx")==0) return MaxVxEnum;
    392         else if (strcmp(name,"MaxAbsVx")==0) return MaxAbsVxEnum;
    393         else if (strcmp(name,"MinVy")==0) return MinVyEnum;
    394         else if (strcmp(name,"MaxVy")==0) return MaxVyEnum;
    395         else if (strcmp(name,"MaxAbsVy")==0) return MaxAbsVyEnum;
    396         else if (strcmp(name,"MinVz")==0) return MinVzEnum;
    397         else if (strcmp(name,"MaxVz")==0) return MaxVzEnum;
    398         else if (strcmp(name,"MaxAbsVz")==0) return MaxAbsVzEnum;
    399         else if (strcmp(name,"Relative")==0) return RelativeEnum;
    400         else if (strcmp(name,"Absolute")==0) return AbsoluteEnum;
    401         else if (strcmp(name,"Incremental")==0) return IncrementalEnum;
    402         else if (strcmp(name,"AgressiveMigration")==0) return AgressiveMigrationEnum;
    403         else if (strcmp(name,"None")==0) return NoneEnum;
    404         else if (strcmp(name,"SoftMigration")==0) return SoftMigrationEnum;
    405         else if (strcmp(name,"StokesSolver")==0) return StokesSolverEnum;
    406         else if (strcmp(name,"Adjoint")==0) return AdjointEnum;
    407         else if (strcmp(name,"Colinear")==0) return ColinearEnum;
    408         else if (strcmp(name,"ControlSteady")==0) return ControlSteadyEnum;
    409         else if (strcmp(name,"Fset")==0) return FsetEnum;
    410         else if (strcmp(name,"Gradient1")==0) return Gradient1Enum;
    411         else if (strcmp(name,"Gradient2")==0) return Gradient2Enum;
    412         else if (strcmp(name,"Gradient3")==0) return Gradient3Enum;
    413         else if (strcmp(name,"Gradient")==0) return GradientEnum;
    414         else if (strcmp(name,"GroundinglineMigration")==0) return GroundinglineMigrationEnum;
    415         else if (strcmp(name,"Gset")==0) return GsetEnum;
    416         else if (strcmp(name,"Index")==0) return IndexEnum;
    417         else if (strcmp(name,"Indexed")==0) return IndexedEnum;
    418         else if (strcmp(name,"Intersect")==0) return IntersectEnum;
    419         else if (strcmp(name,"Nodal")==0) return NodalEnum;
    420         else if (strcmp(name,"OldGradient")==0) return OldGradientEnum;
    421         else if (strcmp(name,"OutputFilePointer")==0) return OutputFilePointerEnum;
    422         else if (strcmp(name,"PetscOptionsAnalyses")==0) return PetscOptionsAnalysesEnum;
    423         else if (strcmp(name,"PetscOptionsStrings")==0) return PetscOptionsStringsEnum;
    424         else if (strcmp(name,"QmuErrName")==0) return QmuErrNameEnum;
    425         else if (strcmp(name,"QmuInName")==0) return QmuInNameEnum;
    426         else if (strcmp(name,"QmuOutName")==0) return QmuOutNameEnum;
    427         else if (strcmp(name,"Regular")==0) return RegularEnum;
    428         else if (strcmp(name,"Scaled")==0) return ScaledEnum;
    429         else if (strcmp(name,"Separate")==0) return SeparateEnum;
    430         else if (strcmp(name,"Sset")==0) return SsetEnum;
    431         else if (strcmp(name,"Verbose")==0) return VerboseEnum;
    432         else if (strcmp(name,"TriangleInterp")==0) return TriangleInterpEnum;
    433         else if (strcmp(name,"BilinearInterp")==0) return BilinearInterpEnum;
    434         else if (strcmp(name,"NearestInterp")==0) return NearestInterpEnum;
    435         else if (strcmp(name,"XY")==0) return XYEnum;
    436         else if (strcmp(name,"XYZP")==0) return XYZPEnum;
    437         else if (strcmp(name,"Option")==0) return OptionEnum;
    438         else if (strcmp(name,"OptionCell")==0) return OptionCellEnum;
    439         else if (strcmp(name,"OptionChar")==0) return OptionCharEnum;
    440         else if (strcmp(name,"OptionStruct")==0) return OptionStructEnum;
    441         else if (strcmp(name,"OptionDouble")==0) return OptionDoubleEnum;
    442         else if (strcmp(name,"OptionLogical")==0) return OptionLogicalEnum;
    443         else if (strcmp(name,"Paterson")==0) return PatersonEnum;
    444         else if (strcmp(name,"Arrhenius")==0) return ArrheniusEnum;
    445         else _error_("Enum %s not found",name);
    446 =======
    44716   int  stage=1;
    448 >>>>>>> .merge-right.r11410
    44917
    45018   if(stage==1){
    … …  
    46533              else if (strcmp(name,"DiagnosticAbstol")==0) return DiagnosticAbstolEnum;
    46634              else if (strcmp(name,"DiagnosticIcefront")==0) return DiagnosticIcefrontEnum;
    467               else if (strcmp(name,"DiagnosticIsnewton")==0) return DiagnosticIsnewtonEnum;
    46835              else if (strcmp(name,"DiagnosticMaxiter")==0) return DiagnosticMaxiterEnum;
    46936              else if (strcmp(name,"DiagnosticNumRequestedOutputs")==0) return DiagnosticNumRequestedOutputsEnum;
    … …  
    537104              else if (strcmp(name,"MaterialsRheologyLaw")==0) return MaterialsRheologyLawEnum;
    538105              else if (strcmp(name,"MaterialsRheologyN")==0) return MaterialsRheologyNEnum;
     106              else if (strcmp(name,"MaterialsRheologyZ")==0) return MaterialsRheologyZEnum;
     107              else if (strcmp(name,"MaterialsRheologyZbar")==0) return MaterialsRheologyZbarEnum;
    539108              else if (strcmp(name,"MaterialsRhoIce")==0) return MaterialsRhoIceEnum;
    540109              else if (strcmp(name,"MaterialsRhoWater")==0) return MaterialsRhoWaterEnum;
    … …  
    568137              else if (strcmp(name,"PrognosticPenaltyFactor")==0) return PrognosticPenaltyFactorEnum;
    569138              else if (strcmp(name,"PrognosticSpcthickness")==0) return PrognosticSpcthicknessEnum;
    570               else if (strcmp(name,"PrognosticStabilization")==0) return PrognosticStabilizationEnum;
    571139         else stage=2;
    572140   }
    573141   if(stage==2){
    574               if (strcmp(name,"PrognosticVertexPairing")==0) return PrognosticVertexPairingEnum;
     142              if (strcmp(name,"PrognosticStabilization")==0) return PrognosticStabilizationEnum;
     143              else if (strcmp(name,"PrognosticVertexPairing")==0) return PrognosticVertexPairingEnum;
    575144              else if (strcmp(name,"QmuIsdakota")==0) return QmuIsdakotaEnum;
    576145              else if (strcmp(name,"QmuMassFluxSegments")==0) return QmuMassFluxSegmentsEnum;
    … …  
    691260              else if (strcmp(name,"Numericalflux")==0) return NumericalfluxEnum;
    692261              else if (strcmp(name,"Param")==0) return ParamEnum;
    693               else if (strcmp(name,"PattynIceFront")==0) return PattynIceFrontEnum;
    694262         else stage=3;
    695263   }
    696264   if(stage==3){
    697               if (strcmp(name,"Pengrid")==0) return PengridEnum;
     265              if (strcmp(name,"PattynIceFront")==0) return PattynIceFrontEnum;
     266              else if (strcmp(name,"Pengrid")==0) return PengridEnum;
    698267              else if (strcmp(name,"Penpair")==0) return PenpairEnum;
    699268              else if (strcmp(name,"Penta")==0) return PentaEnum;
    … …  
    814383              else if (strcmp(name,"DoubleExternalResult")==0) return DoubleExternalResultEnum;
    815384              else if (strcmp(name,"DoubleMatExternalResult")==0) return DoubleMatExternalResultEnum;
    816               else if (strcmp(name,"DoubleVecExternalResult")==0) return DoubleVecExternalResultEnum;
    817385         else stage=4;
    818386   }
    819387   if(stage==4){
    820               if (strcmp(name,"IntExternalResult")==0) return IntExternalResultEnum;
     388              if (strcmp(name,"DoubleVecExternalResult")==0) return DoubleVecExternalResultEnum;
     389              else if (strcmp(name,"IntExternalResult")==0) return IntExternalResultEnum;
    821390              else if (strcmp(name,"J")==0) return JEnum;
    822391              else if (strcmp(name,"Patch")==0) return PatchEnum;
Note: See TracChangeset for help on using the changeset viewer.