Index: /issm/trunk-jpl/src/c/shared/Enum/EnumDefinitions.h =================================================================== --- /issm/trunk-jpl/src/c/shared/Enum/EnumDefinitions.h (revision 23956) +++ /issm/trunk-jpl/src/c/shared/Enum/EnumDefinitions.h (revision 23957) @@ -61,14 +61,8 @@ BasalforcingsDeepwaterElevationEnum, BasalforcingsDeepwaterMeltingRateEnum, - BasalforcingsUpperwaterMeltingRateEnum, BasalforcingsDtbgEnum, BasalforcingsEnum, - BasalforcingsIsmp6BasinAreaEnum, - BasalforcingsIsmp6DeltaTEnum, - BasalforcingsIsmp6Gamma0Enum, + BasalforcingsIsmp6AverageTfEnum, BasalforcingsIsmp6IsLocalEnum, - BasalforcingsIsmp6NumBasinsEnum, - BasalforcingsIsmp6TfDepthsEnum, - BasalforcingsIsmp6AverageTfEnum, BasalforcingsLowercrustheatEnum, BasalforcingsMantleconductivityEnum, @@ -95,4 +89,5 @@ BasalforcingsUpperdepthMeltEnum, BasalforcingsUpperwaterElevationEnum, + BasalforcingsUpperwaterMeltingRateEnum, CalvingCrevasseDepthEnum, CalvingHeightAboveFloatationEnum, @@ -104,4 +99,6 @@ ConstantsReferencetemperatureEnum, ConstantsYtsEnum, + ControlInputSizeMEnum, + ControlInputSizeNEnum, DamageC1Enum, DamageC2Enum, @@ -135,4 +132,5 @@ FlowequationIsSSAEnum, FrictionCouplingEnum, + FrictionDeltaEnum, FrictionFEnum, FrictionGammaEnum, @@ -140,5 +138,4 @@ FrictionPseudoplasticityExponentEnum, FrictionThresholdSpeedEnum, - FrictionDeltaEnum, FrictionVoidRatioEnum, FrontalForcingsBasinIcefrontAreaEnum, @@ -147,11 +144,20 @@ FrontalForcingsParamEnum, GiaCrossSectionShapeEnum, - GroundinglineMigrationEnum, GroundinglineFrictionInterpolationEnum, GroundinglineMeltInterpolationEnum, - HydrologyBumpSpacingEnum, + GroundinglineMigrationEnum, HydrologyCavitySpacingEnum, - HydrologydcEplflipLockEnum, - HydrologydcEplThickCompEnum, + HydrologyChannelConductivityEnum, + HydrologyChannelSheetWidthEnum, + HydrologyEnglacialVoidRatioEnum, + HydrologyIschannelsEnum, + HydrologyModelEnum, + HydrologyNumRequestedOutputsEnum, + HydrologyPressureMeltCoefficientEnum, + HydrologyRelaxationEnum, + HydrologyRequestedOutputsEnum, + HydrologySedimentKmaxEnum, + HydrologyStepsPerStepEnum, + HydrologyStorageEnum, HydrologydcEplColapseThicknessEnum, HydrologydcEplCompressibilityEnum, @@ -160,32 +166,22 @@ HydrologydcEplMaxThicknessEnum, HydrologydcEplPorosityEnum, + HydrologydcEplThickCompEnum, + HydrologydcEplflipLockEnum, HydrologydcIsefficientlayerEnum, HydrologydcLeakageFactorEnum, + HydrologydcMaxIterEnum, + HydrologydcPenaltyFactorEnum, + HydrologydcPenaltyLockEnum, + HydrologydcRelTolEnum, HydrologydcSedimentCompressibilityEnum, HydrologydcSedimentPorosityEnum, HydrologydcSedimentThicknessEnum, - HydrologydcMaxIterEnum, - HydrologydcPenaltyFactorEnum, - HydrologydcWaterCompressibilityEnum, - HydrologydcPenaltyLockEnum, - HydrologydcRelTolEnum, HydrologydcSedimentlimitEnum, HydrologydcSedimentlimitFlagEnum, HydrologydcTransferFlagEnum, HydrologydcUnconfinedFlagEnum, + HydrologydcWaterCompressibilityEnum, HydrologydtEnum, - HydrologyIschannelsEnum, - HydrologyChannelConductivityEnum, - HydrologyChannelSheetWidthEnum, - HydrologyEnglacialVoidRatioEnum, - HydrologyModelEnum, - HydrologyNumRequestedOutputsEnum, - HydrologyPressureMeltCoefficientEnum, - HydrologyRelaxationEnum, - HydrologyRequestedOutputsEnum, - HydrologySedimentKmaxEnum, HydrologyshreveStabilizationEnum, - HydrologyStepsPerStepEnum, - HydrologyStorageEnum, IcecapToEarthCommEnum, IndexEnum, @@ -199,6 +195,4 @@ InversionControlParametersEnum, InversionControlScalingFactorsEnum, - ControlInputSizeMEnum, - ControlInputSizeNEnum, InversionCostFunctionsEnum, InversionDxminEnum, @@ -241,4 +235,5 @@ MaterialsBetaEnum, MaterialsEarthDensityEnum, + MaterialsEffectiveconductivityAveragingEnum, MaterialsHeatcapacityEnum, MaterialsLatentheatEnum, @@ -251,11 +246,10 @@ MaterialsMuWaterEnum, MaterialsRheologyLawEnum, + MaterialsRhoFreshwaterEnum, MaterialsRhoIceEnum, - MaterialsRhoFreshwaterEnum, MaterialsRhoSeawaterEnum, MaterialsTemperateiceconductivityEnum, - MaterialsEffectiveconductivityAveragingEnum, + MaterialsThermalExchangeVelocityEnum, MaterialsThermalconductivityEnum, - MaterialsThermalExchangeVelocityEnum, MeltingOffsetEnum, MeshAverageVertexConnectivityEnum, @@ -272,7 +266,7 @@ OutputBufferPointerEnum, OutputBufferSizePointerEnum, - OutputdefinitionEnum, OutputFileNameEnum, OutputFilePointerEnum, + OutputdefinitionEnum, ParamEnum, ParametersEnum, @@ -314,25 +308,25 @@ SealevelriseUElasticEnum, SettingsIoGatherEnum, + SettingsNumResultsOnNodesEnum, SettingsOutputFrequencyEnum, - SettingsSbCouplingFrequencyEnum, SettingsRecordingFrequencyEnum, SettingsResultsOnNodesEnum, - SettingsNumResultsOnNodesEnum, + SettingsSbCouplingFrequencyEnum, SettingsSolverResidueThresholdEnum, SettingsWaitonlockEnum, + SmbAIceEnum, + SmbAIdxEnum, + SmbASnowEnum, SmbAccualtiEnum, SmbAccugradEnum, SmbAccurefEnum, SmbAdThreshEnum, - SmbAIceEnum, - SmbAIdxEnum, - SmbDesfacEnum, - SmbDpermilEnum, - SmbDsnowIdxEnum, - SmbASnowEnum, SmbCldFracEnum, SmbDelta18oEnum, SmbDelta18oSurfaceEnum, SmbDenIdxEnum, + SmbDesfacEnum, + SmbDpermilEnum, + SmbDsnowIdxEnum, SmbDtEnum, SmbEnum, @@ -345,12 +339,12 @@ SmbIsdelta18oEnum, SmbIsdensificationEnum, + SmbIsfirnwarmingEnum, SmbIsgraingrowthEnum, - SmbIsfirnwarmingEnum, SmbIsmeltEnum, SmbIsmungsmEnum, + SmbIsprecipscaledEnum, SmbIssetpddfacEnum, SmbIsshortwaveEnum, SmbIstemperaturescaledEnum, - SmbIsprecipscaledEnum, SmbIsthermalEnum, SmbIsturbulentfluxEnum, @@ -358,6 +352,6 @@ SmbNumRequestedOutputsEnum, SmbPfacEnum, + SmbRdlEnum, SmbRequestedOutputsEnum, - SmbRdlEnum, SmbRlapsEnum, SmbRlapslgmEnum, @@ -432,4 +426,9 @@ VelocityEnum, WorldCommEnum, + BasalforcingsIsmp6BasinAreaEnum, + BasalforcingsIsmp6DeltaTEnum, + BasalforcingsIsmp6Gamma0Enum, + BasalforcingsIsmp6NumBasinsEnum, + BasalforcingsIsmp6TfDepthsEnum, /*}}}*/ ParametersENDEnum, @@ -451,7 +450,7 @@ BasalforcingsGeothermalfluxEnum, BasalforcingsGroundediceMeltingRateEnum, + BasalforcingsIsmp6BasinIdEnum, BasalforcingsIsmp6TfEnum, BasalforcingsIsmp6TfShelfEnum, - BasalforcingsIsmp6BasinIdEnum, BasalforcingsPicoBasinIdEnum, BasalforcingsPicoBoxIdEnum, @@ -467,16 +466,16 @@ CalvingCalvingrateEnum, CalvingHabFractionEnum, + CalvingMeltingrateEnum, + CalvingStressThresholdFloatingiceEnum, + CalvingStressThresholdGroundediceEnum, CalvinglevermannCoeffEnum, - CalvingMeltingrateEnum, CalvingratexAverageEnum, CalvingratexEnum, CalvingrateyAverageEnum, CalvingrateyEnum, - CalvingStressThresholdFloatingiceEnum, - CalvingStressThresholdGroundediceEnum, ConvergedEnum, CrevasseDepthEnum, + DamageDEnum, DamageDbarEnum, - DamageDEnum, DamageFEnum, DegreeOfChannelizationEnum, @@ -496,10 +495,9 @@ DrivingStressXEnum, DrivingStressYEnum, + EffectivePressureEnum, EffectivePressureHydrostepEnum, EffectivePressureStackedEnum, - EffectivePressureEnum, EnthalpyEnum, EnthalpyPicardEnum, - EplHeadStackedEnum, EplHeadEnum, EplHeadHydrostepEnum, @@ -507,12 +505,13 @@ EplHeadSlopeXEnum, EplHeadSlopeYEnum, + EplHeadStackedEnum, EsaDeltathicknessEnum, EsaEmotionEnum, EsaNmotionEnum, - EsaUmotionEnum, EsaRotationrateEnum, EsaStrainratexxEnum, EsaStrainratexyEnum, EsaStrainrateyyEnum, + EsaUmotionEnum, EsaXmotionEnum, EsaYmotionEnum, @@ -522,23 +521,22 @@ FrictionCEnum, FrictionCmaxEnum, + FrictionCoefficientEnum, FrictionCoefficientcoulombEnum, - FrictionCoefficientEnum, FrictionEffectivePressureEnum, - FrictionfEnum, FrictionMEnum, FrictionPEnum, FrictionPressureAdjustedTemperatureEnum, FrictionQEnum, + FrictionSedimentCompressibilityCoefficientEnum, + FrictionTillFrictionAngleEnum, FrictionWaterLayerEnum, + FrictionfEnum, FrontalForcingsSubglacialDischargeEnum, FrontalForcingsThermalForcingEnum, - HydrologyWatercolumnMaxEnum, - FrictionTillFrictionAngleEnum, - FrictionSedimentCompressibilityCoefficientEnum, GeometryHydrostaticRatioEnum, GiaLithosphereThicknessEnum, GiaMantleViscosityEnum, + GiaWEnum, GiadWdtEnum, - GiaWEnum, GradientEnum, GroundinglineHeightEnum, @@ -547,16 +545,7 @@ HydrologyBasalFluxEnum, HydrologyBumpHeightEnum, - HydrologySheetThicknessEnum, - HydrologydcBasalMoulinInputEnum, - HydrologydcEplThicknessHydrostepEnum, - HydrologydcEplThicknessOldEnum, - HydrologydcMaskEplactiveEltEnum, - HydrologydcMaskEplactiveNodeEnum, - HydrologydcMaskThawedEltEnum, - HydrologydcMaskThawedNodeEnum, - HydrologydcSedimentTransmitivityEnum, + HydrologyBumpSpacingEnum, + HydrologyDrainageRateEnum, HydrologyEnglacialInputEnum, - HydrologydcEplThicknessStackedEnum, - HydrologydcEplThicknessEnum, HydrologyGapHeightEnum, HydrologyHeadEnum, @@ -566,7 +555,18 @@ HydrologyReynoldsEnum, HydrologySheetConductivityEnum, + HydrologySheetThicknessEnum, HydrologyWaterVxEnum, HydrologyWaterVyEnum, - HydrologyDrainageRateEnum, + HydrologyWatercolumnMaxEnum, + HydrologydcBasalMoulinInputEnum, + HydrologydcEplThicknessEnum, + HydrologydcEplThicknessHydrostepEnum, + HydrologydcEplThicknessOldEnum, + HydrologydcEplThicknessStackedEnum, + HydrologydcMaskEplactiveEltEnum, + HydrologydcMaskEplactiveNodeEnum, + HydrologydcMaskThawedEltEnum, + HydrologydcMaskThawedNodeEnum, + HydrologydcSedimentTransmitivityEnum, IceEnum, IceMaskNodeActivationEnum, @@ -585,15 +585,15 @@ MaskGroundediceLevelsetEnum, MaskIceLevelsetEnum, - MasstransportSpcthicknessEnum, MaskLandLevelsetEnum, MaskOceanLevelsetEnum, + MasstransportSpcthicknessEnum, + MaterialsRheologyBEnum, MaterialsRheologyBbarEnum, - MaterialsRheologyBEnum, + MaterialsRheologyEEnum, MaterialsRheologyEbarEnum, + MaterialsRheologyEcEnum, MaterialsRheologyEcbarEnum, - MaterialsRheologyEcEnum, - MaterialsRheologyEEnum, + MaterialsRheologyEsEnum, MaterialsRheologyEsbarEnum, - MaterialsRheologyEsEnum, MaterialsRheologyNEnum, MeshScaleFactorEnum, @@ -610,39 +610,39 @@ PressureEnum, RheologyBAbsGradientEnum, + RheologyBInitialguessEnum, + RheologyBInitialguessMisfitEnum, RheologyBbarAbsGradientEnum, - RheologyBInitialguessMisfitEnum, - RheologyBInitialguessEnum, SealevelEnum, SealevelEustaticMaskEnum, + SealevelEustaticOceanMaskEnum, + SealevelNEsaEnum, + SealevelNEsaRateEnum, + SealevelNGiaEnum, + SealevelNGiaRateEnum, + SealevelRSLEnum, + SealevelRSLEustaticEnum, + SealevelRSLEustaticRateEnum, + SealevelRSLRateEnum, + SealevelUEastEsaEnum, + SealevelUEsaEnum, + SealevelUEsaRateEnum, + SealevelUGiaEnum, + SealevelUGiaRateEnum, + SealevelUNorthEsaEnum, SealevelriseCumDeltathicknessEnum, SealevelriseDeltathicknessEnum, - SealevelUEsaRateEnum, - SealevelNEsaRateEnum, - SealevelRSLRateEnum, - SealevelUEsaEnum, - SealevelRSLEustaticRateEnum, SealevelriseSpcthicknessEnum, SealevelriseStericRateEnum, - SealevelNEsaEnum, - SealevelUGiaEnum, - SealevelNGiaEnum, - SealevelRSLEnum, - SealevelRSLEustaticEnum, - SealevelUNorthEsaEnum, - SealevelUEastEsaEnum, - SealevelNGiaRateEnum, - SealevelUGiaRateEnum, - SealevelEustaticOceanMaskEnum, - SedimentHeadStackedEnum, SedimentHeadEnum, SedimentHeadHydrostepEnum, SedimentHeadOldEnum, SedimentHeadResidualEnum, + SedimentHeadStackedEnum, SigmaNNEnum, SigmaVMEnum, + SmbAEnum, + SmbAValueEnum, SmbAccumulationEnum, - SmbAEnum, SmbAiniEnum, - SmbAValueEnum, SmbBMaxEnum, SmbBMinEnum, @@ -650,21 +650,22 @@ SmbBPosEnum, SmbCEnum, - SmbDailysnowfallEnum, - SmbDailyrainfallEnum, - SmbDailydsradiationEnum, - SmbDailydlradiationEnum, - SmbDailywindspeedEnum, - SmbDailypressureEnum, + SmbDEnum, SmbDailyairdensityEnum, SmbDailyairhumidityEnum, + SmbDailydlradiationEnum, + SmbDailydsradiationEnum, + SmbDailypressureEnum, + SmbDailyrainfallEnum, + SmbDailysnowfallEnum, SmbDailytemperatureEnum, - SmbDEnum, + SmbDailywindspeedEnum, SmbDiniEnum, SmbDlwrfEnum, SmbDswrfEnum, + SmbDzAddEnum, SmbDzEnum, - SmbDziniEnum, SmbDzMinEnum, SmbDzTopEnum, + SmbDziniEnum, SmbEAirEnum, SmbECEnum, @@ -672,4 +673,5 @@ SmbElaEnum, SmbEvaporationEnum, + SmbFACEnum, SmbGdnEnum, SmbGdniniEnum, @@ -679,12 +681,17 @@ SmbIsInitializedEnum, SmbMAddEnum, + SmbMassBalanceClimateEnum, SmbMassBalanceEnum, - SmbMassBalanceClimateEnum, + SmbMeanLHFEnum, + SmbMeanSHFEnum, + SmbMeanULWEnum, SmbMeltEnum, SmbMonthlytemperaturesEnum, + SmbNetLWEnum, + SmbNetSWEnum, SmbPAirEnum, + SmbPEnum, SmbPddfacIceEnum, SmbPddfacSnowEnum, - SmbPEnum, SmbPrecipitationEnum, SmbPrecipitationsAnomalyEnum, @@ -696,22 +703,22 @@ SmbReiniEnum, SmbRunoffEnum, + SmbS0gcmEnum, SmbS0pEnum, SmbS0tEnum, - SmbS0gcmEnum, SmbSizeiniEnum, + SmbSmbCorrEnum, SmbSmbrefEnum, - SmbSmbCorrEnum, + SmbTEnum, SmbTaEnum, + SmbTeValueEnum, SmbTemperaturesAnomalyEnum, SmbTemperaturesLgmEnum, SmbTemperaturesPresentdayEnum, SmbTemperaturesReconstructedEnum, - SmbTEnum, - SmbTeValueEnum, SmbTiniEnum, SmbTmeanEnum, - SmbVmeanEnum, SmbTzEnum, SmbVEnum, + SmbVmeanEnum, SmbVzEnum, SmbWEnum, @@ -721,11 +728,4 @@ SmbZTopEnum, SmbZYEnum, - SmbDzAddEnum, - SmbFACEnum, - SmbMeanULWEnum, - SmbNetLWEnum, - SmbNetSWEnum, - SmbMeanLHFEnum, - SmbMeanSHFEnum, StrainRateeffectiveEnum, StrainRateparallelEnum, @@ -757,6 +757,6 @@ SurfaceSlopeYEnum, TemperatureEnum, + TemperaturePDDEnum, TemperaturePicardEnum, - TemperaturePDDEnum, TemperatureSEMICEnum, ThermalSpctemperatureEnum, @@ -781,6 +781,6 @@ VzMeshEnum, VzSSAEnum, + WaterColumnOldEnum, WatercolumnEnum, - WaterColumnOldEnum, WaterfractionDrainageEnum, WaterfractionDrainageIntegratedEnum, @@ -924,9 +924,9 @@ CalvingLevermannEnum, CalvingVonmisesEnum, + CfdragcoeffabsgradEnum, CfsurfacelogvelEnum, CfsurfacesquareEnum, - CfdragcoeffabsgradEnum, + ChannelEnum, ClosedEnum, - ChannelEnum, ColinearEnum, ConstraintsEnum, @@ -935,8 +935,8 @@ ContoursEnum, ControlInputEnum, + ControlInputGradEnum, + ControlInputMaxsEnum, + ControlInputMinsEnum, ControlInputValuesEnum, - ControlInputMinsEnum, - ControlInputMaxsEnum, - ControlInputGradEnum, CrouzeixRaviartEnum, CuffeyEnum, @@ -945,6 +945,6 @@ DamageEvolutionSolutionEnum, DataSetEnum, + DataSetParamEnum, DatasetInputEnum, - DataSetParamEnum, DefaultAnalysisEnum, DefaultCalvingEnum, @@ -974,4 +974,8 @@ ExtrudeFromBaseAnalysisEnum, ExtrudeFromTopAnalysisEnum, + FSApproximationEnum, + FSSolverEnum, + FSpressureEnum, + FSvelocityEnum, FemModelEnum, FileParamEnum, @@ -985,10 +989,7 @@ FrontalForcingsDefaultEnum, FrontalForcingsRignotEnum, - FSApproximationEnum, FsetEnum, - FSpressureEnum, - FSSolverEnum, - FSvelocityEnum, FullMeltOnPartiallyFloatingEnum, + GLheightadvectionAnalysisEnum, GaussPentaEnum, GaussSegEnum, @@ -997,5 +998,4 @@ GenericOptionEnum, GenericParamEnum, - GLheightadvectionAnalysisEnum, GiaIvinsAnalysisEnum, GiaSolutionEnum, @@ -1006,4 +1006,5 @@ GroundedAreaScaledEnum, GroundingOnlyEnum, + GroundinglineMassFluxEnum, GsetEnum, GslEnum, @@ -1012,15 +1013,15 @@ HookEnum, HydrologyDCEfficientAnalysisEnum, + HydrologyDCInefficientAnalysisEnum, + HydrologyGlaDSAnalysisEnum, + HydrologyGlaDSEnum, + HydrologyPismAnalysisEnum, + HydrologyShaktiAnalysisEnum, + HydrologyShreveAnalysisEnum, + HydrologySolutionEnum, HydrologydcEnum, - HydrologyDCInefficientAnalysisEnum, - HydrologyShreveAnalysisEnum, + HydrologypismEnum, + HydrologyshaktiEnum, HydrologyshreveEnum, - HydrologySolutionEnum, - HydrologyGlaDSAnalysisEnum, - HydrologyShaktiAnalysisEnum, - HydrologyPismAnalysisEnum, - HydrologyGlaDSEnum, - HydrologyshaktiEnum, - HydrologypismEnum, IceMassEnum, IceMassScaledEnum, @@ -1029,8 +1030,8 @@ IceVolumeEnum, IceVolumeScaledEnum, + IcefrontMassFluxEnum, + IcefrontMassFluxLevelsetEnum, IncrementalEnum, IndexedEnum, - InternalEnum, - IntersectEnum, IntExternalResultEnum, IntInputEnum, @@ -1039,4 +1040,6 @@ IntParamEnum, IntVecParamEnum, + InternalEnum, + IntersectEnum, InversionVzObsEnum, JEnum, @@ -1045,10 +1048,9 @@ L2ProjectionEPLAnalysisEnum, LACrouzeixRaviartEnum, + LATaylorHoodEnum, LambdaSEnum, - LATaylorHoodEnum, LevelsetAnalysisEnum, LevelsetfunctionPicardEnum, LinearFloatingMeltRateEnum, - SpatialLinearFloatingMeltRateEnum, LliboutryDuvalEnum, LoadsEnum, @@ -1063,18 +1065,17 @@ LoveLrEnum, LoveSolutionEnum, + MINIEnum, + MINIcondensedEnum, MantlePlumeGeothermalFluxEnum, + MassFluxEnum, + MassconEnum, MassconaxpbyEnum, - MassconEnum, MassfluxatgateEnum, - MassFluxEnum, - GroundinglineMassFluxEnum, - IcefrontMassFluxEnum, - IcefrontMassFluxLevelsetEnum, MasstransportAnalysisEnum, MasstransportSolutionEnum, MatdamageiceEnum, MatenhancediceEnum, + MaterialsEnum, MatestarEnum, - MaterialsEnum, MaticeEnum, MatlithoEnum, @@ -1093,6 +1094,4 @@ MeshXEnum, MeshYEnum, - MINIcondensedEnum, - MINIEnum, MinVelEnum, MinVxEnum, @@ -1105,9 +1104,9 @@ MpiSparseEnum, MumpsEnum, + NoFrictionOnPartiallyFloatingEnum, + NoMeltOnPartiallyFloatingEnum, NodalEnum, NodalvalueEnum, NodeSIdEnum, - NoFrictionOnPartiallyFloatingEnum, - NoMeltOnPartiallyFloatingEnum, NoneApproximationEnum, NoneEnum, @@ -1119,15 +1118,15 @@ OptionEnum, P0ArrayEnum, - P1bubblecondensedEnum, - P1bubbleEnum, P1DGEnum, P1P1Enum, P1P1GLSEnum, + P1bubbleEnum, + P1bubblecondensedEnum, P1xP2Enum, P1xP3Enum, P1xP4Enum, + P2Enum, + P2bubbleEnum, P2bubblecondensedEnum, - P2bubbleEnum, - P2Enum, P2xP1Enum, P2xP4Enum, @@ -1144,4 +1143,21 @@ RegularEnum, RiftfrontEnum, + SIAApproximationEnum, + SMBcomponentsEnum, + SMBd18opddEnum, + SMBforcingEnum, + SMBgcmEnum, + SMBgembEnum, + SMBgradientsEnum, + SMBgradientscomponentsEnum, + SMBgradientselaEnum, + SMBhenningEnum, + SMBmeltcomponentsEnum, + SMBpddEnum, + SMBpddSicopolisEnum, + SMBsemicEnum, + SSAApproximationEnum, + SSAFSApproximationEnum, + SSAHOApproximationEnum, ScaledEnum, SealevelAbsoluteEnum, @@ -1151,7 +1167,7 @@ SealevelInertiaTensorZZEnum, SealevelNmotionEnum, + SealevelUmotionEnum, SealevelriseAnalysisEnum, SealevelriseSolutionEnum, - SealevelUmotionEnum, SegEnum, SegInputEnum, @@ -1160,30 +1176,15 @@ SeparateEnum, SeqEnum, - SIAApproximationEnum, SmbAnalysisEnum, - SMBsemicEnum, - SMBcomponentsEnum, - SMBd18opddEnum, - SMBforcingEnum, - SMBgcmEnum, - SMBgembEnum, - SMBgradientselaEnum, - SMBgradientsEnum, - SMBhenningEnum, - SMBmeltcomponentsEnum, - SMBpddEnum, - SMBpddSicopolisEnum, - SMBgradientscomponentsEnum, SmbSolutionEnum, SmoothAnalysisEnum, SoftMigrationEnum, + SpatialLinearFloatingMeltRateEnum, SpcDynamicEnum, SpcStaticEnum, SpcTransientEnum, - SSAApproximationEnum, - SSAFSApproximationEnum, - SSAHOApproximationEnum, SsetEnum, SteadystateSolutionEnum, + StressIntensityFactorEnum, StressbalanceAnalysisEnum, StressbalanceConvergenceNumStepsEnum, @@ -1191,5 +1192,4 @@ StressbalanceSolutionEnum, StressbalanceVerticalAnalysisEnum, - StressIntensityFactorEnum, StringArrayParamEnum, StringExternalResultEnum, @@ -1197,7 +1197,7 @@ SubelementFriction1Enum, SubelementFriction2Enum, - SubelementMigrationEnum, SubelementMelt1Enum, SubelementMelt2Enum, + SubelementMigrationEnum, SurfaceSlopeSolutionEnum, TaylorHoodEnum, @@ -1222,7 +1222,7 @@ VectorParamEnum, VertexEnum, + VertexLIdEnum, VertexPIdEnum, VertexSIdEnum, - VertexLIdEnum, VerticesEnum, ViscousHeatingEnum, @@ -1245,6 +1245,6 @@ SealevelWeightsEnum, StrainRateEnum, + StressTensorEnum, StressbalanceViscosityOvershootEnum, - StressTensorEnum, SubelementMigration4Enum, TimesteppingTimeAdaptEnum, Index: /issm/trunk-jpl/src/c/shared/Enum/EnumToStringx.cpp =================================================================== --- /issm/trunk-jpl/src/c/shared/Enum/EnumToStringx.cpp (revision 23956) +++ /issm/trunk-jpl/src/c/shared/Enum/EnumToStringx.cpp (revision 23957) @@ -69,14 +69,8 @@ case BasalforcingsDeepwaterElevationEnum : return "BasalforcingsDeepwaterElevation"; case BasalforcingsDeepwaterMeltingRateEnum : return "BasalforcingsDeepwaterMeltingRate"; - case BasalforcingsUpperwaterMeltingRateEnum : return "BasalforcingsUpperwaterMeltingRate"; case BasalforcingsDtbgEnum : return "BasalforcingsDtbg"; case BasalforcingsEnum : return "Basalforcings"; - case BasalforcingsIsmp6BasinAreaEnum : return "BasalforcingsIsmp6BasinArea"; - case BasalforcingsIsmp6DeltaTEnum : return "BasalforcingsIsmp6DeltaT"; - case BasalforcingsIsmp6Gamma0Enum : return "BasalforcingsIsmp6Gamma0"; + case BasalforcingsIsmp6AverageTfEnum : return "BasalforcingsIsmp6AverageTf"; case BasalforcingsIsmp6IsLocalEnum : return "BasalforcingsIsmp6IsLocal"; - case BasalforcingsIsmp6NumBasinsEnum : return "BasalforcingsIsmp6NumBasins"; - case BasalforcingsIsmp6TfDepthsEnum : return "BasalforcingsIsmp6TfDepths"; - case BasalforcingsIsmp6AverageTfEnum : return "BasalforcingsIsmp6AverageTf"; case BasalforcingsLowercrustheatEnum : return "BasalforcingsLowercrustheat"; case BasalforcingsMantleconductivityEnum : return "BasalforcingsMantleconductivity"; @@ -103,4 +97,5 @@ case BasalforcingsUpperdepthMeltEnum : return "BasalforcingsUpperdepthMelt"; case BasalforcingsUpperwaterElevationEnum : return "BasalforcingsUpperwaterElevation"; + case BasalforcingsUpperwaterMeltingRateEnum : return "BasalforcingsUpperwaterMeltingRate"; case CalvingCrevasseDepthEnum : return "CalvingCrevasseDepth"; case CalvingHeightAboveFloatationEnum : return "CalvingHeightAboveFloatation"; @@ -112,4 +107,6 @@ case ConstantsReferencetemperatureEnum : return "ConstantsReferencetemperature"; case ConstantsYtsEnum : return "ConstantsYts"; + case ControlInputSizeMEnum : return "ControlInputSizeM"; + case ControlInputSizeNEnum : return "ControlInputSizeN"; case DamageC1Enum : return "DamageC1"; case DamageC2Enum : return "DamageC2"; @@ -143,4 +140,5 @@ case FlowequationIsSSAEnum : return "FlowequationIsSSA"; case FrictionCouplingEnum : return "FrictionCoupling"; + case FrictionDeltaEnum : return "FrictionDelta"; case FrictionFEnum : return "FrictionF"; case FrictionGammaEnum : return "FrictionGamma"; @@ -148,5 +146,4 @@ case FrictionPseudoplasticityExponentEnum : return "FrictionPseudoplasticityExponent"; case FrictionThresholdSpeedEnum : return "FrictionThresholdSpeed"; - case FrictionDeltaEnum : return "FrictionDelta"; case FrictionVoidRatioEnum : return "FrictionVoidRatio"; case FrontalForcingsBasinIcefrontAreaEnum : return "FrontalForcingsBasinIcefrontArea"; @@ -155,11 +152,20 @@ case FrontalForcingsParamEnum : return "FrontalForcingsParam"; case GiaCrossSectionShapeEnum : return "GiaCrossSectionShape"; - case GroundinglineMigrationEnum : return "GroundinglineMigration"; case GroundinglineFrictionInterpolationEnum : return "GroundinglineFrictionInterpolation"; case GroundinglineMeltInterpolationEnum : return "GroundinglineMeltInterpolation"; - case HydrologyBumpSpacingEnum : return "HydrologyBumpSpacing"; + case GroundinglineMigrationEnum : return "GroundinglineMigration"; case HydrologyCavitySpacingEnum : return "HydrologyCavitySpacing"; - case HydrologydcEplflipLockEnum : return "HydrologydcEplflipLock"; - case HydrologydcEplThickCompEnum : return "HydrologydcEplThickComp"; + case HydrologyChannelConductivityEnum : return "HydrologyChannelConductivity"; + case HydrologyChannelSheetWidthEnum : return "HydrologyChannelSheetWidth"; + case HydrologyEnglacialVoidRatioEnum : return "HydrologyEnglacialVoidRatio"; + case HydrologyIschannelsEnum : return "HydrologyIschannels"; + case HydrologyModelEnum : return "HydrologyModel"; + case HydrologyNumRequestedOutputsEnum : return "HydrologyNumRequestedOutputs"; + case HydrologyPressureMeltCoefficientEnum : return "HydrologyPressureMeltCoefficient"; + case HydrologyRelaxationEnum : return "HydrologyRelaxation"; + case HydrologyRequestedOutputsEnum : return "HydrologyRequestedOutputs"; + case HydrologySedimentKmaxEnum : return "HydrologySedimentKmax"; + case HydrologyStepsPerStepEnum : return "HydrologyStepsPerStep"; + case HydrologyStorageEnum : return "HydrologyStorage"; case HydrologydcEplColapseThicknessEnum : return "HydrologydcEplColapseThickness"; case HydrologydcEplCompressibilityEnum : return "HydrologydcEplCompressibility"; @@ -168,32 +174,22 @@ case HydrologydcEplMaxThicknessEnum : return "HydrologydcEplMaxThickness"; case HydrologydcEplPorosityEnum : return "HydrologydcEplPorosity"; + case HydrologydcEplThickCompEnum : return "HydrologydcEplThickComp"; + case HydrologydcEplflipLockEnum : return "HydrologydcEplflipLock"; case HydrologydcIsefficientlayerEnum : return "HydrologydcIsefficientlayer"; case HydrologydcLeakageFactorEnum : return "HydrologydcLeakageFactor"; + case HydrologydcMaxIterEnum : return "HydrologydcMaxIter"; + case HydrologydcPenaltyFactorEnum : return "HydrologydcPenaltyFactor"; + case HydrologydcPenaltyLockEnum : return "HydrologydcPenaltyLock"; + case HydrologydcRelTolEnum : return "HydrologydcRelTol"; case HydrologydcSedimentCompressibilityEnum : return "HydrologydcSedimentCompressibility"; case HydrologydcSedimentPorosityEnum : return "HydrologydcSedimentPorosity"; case HydrologydcSedimentThicknessEnum : return "HydrologydcSedimentThickness"; - case HydrologydcMaxIterEnum : return "HydrologydcMaxIter"; - case HydrologydcPenaltyFactorEnum : return "HydrologydcPenaltyFactor"; - case HydrologydcWaterCompressibilityEnum : return "HydrologydcWaterCompressibility"; - case HydrologydcPenaltyLockEnum : return "HydrologydcPenaltyLock"; - case HydrologydcRelTolEnum : return "HydrologydcRelTol"; case HydrologydcSedimentlimitEnum : return "HydrologydcSedimentlimit"; case HydrologydcSedimentlimitFlagEnum : return "HydrologydcSedimentlimitFlag"; case HydrologydcTransferFlagEnum : return "HydrologydcTransferFlag"; case HydrologydcUnconfinedFlagEnum : return "HydrologydcUnconfinedFlag"; + case HydrologydcWaterCompressibilityEnum : return "HydrologydcWaterCompressibility"; case HydrologydtEnum : return "Hydrologydt"; - case HydrologyIschannelsEnum : return "HydrologyIschannels"; - case HydrologyChannelConductivityEnum : return "HydrologyChannelConductivity"; - case HydrologyChannelSheetWidthEnum : return "HydrologyChannelSheetWidth"; - case HydrologyEnglacialVoidRatioEnum : return "HydrologyEnglacialVoidRatio"; - case HydrologyModelEnum : return "HydrologyModel"; - case HydrologyNumRequestedOutputsEnum : return "HydrologyNumRequestedOutputs"; - case HydrologyPressureMeltCoefficientEnum : return "HydrologyPressureMeltCoefficient"; - case HydrologyRelaxationEnum : return "HydrologyRelaxation"; - case HydrologyRequestedOutputsEnum : return "HydrologyRequestedOutputs"; - case HydrologySedimentKmaxEnum : return "HydrologySedimentKmax"; case HydrologyshreveStabilizationEnum : return "HydrologyshreveStabilization"; - case HydrologyStepsPerStepEnum : return "HydrologyStepsPerStep"; - case HydrologyStorageEnum : return "HydrologyStorage"; case IcecapToEarthCommEnum : return "IcecapToEarthComm"; case IndexEnum : return "Index"; @@ -207,6 +203,4 @@ case InversionControlParametersEnum : return "InversionControlParameters"; case InversionControlScalingFactorsEnum : return "InversionControlScalingFactors"; - case ControlInputSizeMEnum : return "ControlInputSizeM"; - case ControlInputSizeNEnum : return "ControlInputSizeN"; case InversionCostFunctionsEnum : return "InversionCostFunctions"; case InversionDxminEnum : return "InversionDxmin"; @@ -249,4 +243,5 @@ case MaterialsBetaEnum : return "MaterialsBeta"; case MaterialsEarthDensityEnum : return "MaterialsEarthDensity"; + case MaterialsEffectiveconductivityAveragingEnum : return "MaterialsEffectiveconductivityAveraging"; case MaterialsHeatcapacityEnum : return "MaterialsHeatcapacity"; case MaterialsLatentheatEnum : return "MaterialsLatentheat"; @@ -259,11 +254,10 @@ case MaterialsMuWaterEnum : return "MaterialsMuWater"; case MaterialsRheologyLawEnum : return "MaterialsRheologyLaw"; + case MaterialsRhoFreshwaterEnum : return "MaterialsRhoFreshwater"; case MaterialsRhoIceEnum : return "MaterialsRhoIce"; - case MaterialsRhoFreshwaterEnum : return "MaterialsRhoFreshwater"; case MaterialsRhoSeawaterEnum : return "MaterialsRhoSeawater"; case MaterialsTemperateiceconductivityEnum : return "MaterialsTemperateiceconductivity"; - case MaterialsEffectiveconductivityAveragingEnum : return "MaterialsEffectiveconductivityAveraging"; + case MaterialsThermalExchangeVelocityEnum : return "MaterialsThermalExchangeVelocity"; case MaterialsThermalconductivityEnum : return "MaterialsThermalconductivity"; - case MaterialsThermalExchangeVelocityEnum : return "MaterialsThermalExchangeVelocity"; case MeltingOffsetEnum : return "MeltingOffset"; case MeshAverageVertexConnectivityEnum : return "MeshAverageVertexConnectivity"; @@ -280,7 +274,7 @@ case OutputBufferPointerEnum : return "OutputBufferPointer"; case OutputBufferSizePointerEnum : return "OutputBufferSizePointer"; - case OutputdefinitionEnum : return "Outputdefinition"; case OutputFileNameEnum : return "OutputFileName"; case OutputFilePointerEnum : return "OutputFilePointer"; + case OutputdefinitionEnum : return "Outputdefinition"; case ParamEnum : return "Param"; case ParametersEnum : return "Parameters"; @@ -322,25 +316,25 @@ case SealevelriseUElasticEnum : return "SealevelriseUElastic"; case SettingsIoGatherEnum : return "SettingsIoGather"; + case SettingsNumResultsOnNodesEnum : return "SettingsNumResultsOnNodes"; case SettingsOutputFrequencyEnum : return "SettingsOutputFrequency"; - case SettingsSbCouplingFrequencyEnum : return "SettingsSbCouplingFrequency"; case SettingsRecordingFrequencyEnum : return "SettingsRecordingFrequency"; case SettingsResultsOnNodesEnum : return "SettingsResultsOnNodes"; - case SettingsNumResultsOnNodesEnum : return "SettingsNumResultsOnNodes"; + case SettingsSbCouplingFrequencyEnum : return "SettingsSbCouplingFrequency"; case SettingsSolverResidueThresholdEnum : return "SettingsSolverResidueThreshold"; case SettingsWaitonlockEnum : return "SettingsWaitonlock"; + case SmbAIceEnum : return "SmbAIce"; + case SmbAIdxEnum : return "SmbAIdx"; + case SmbASnowEnum : return "SmbASnow"; case SmbAccualtiEnum : return "SmbAccualti"; case SmbAccugradEnum : return "SmbAccugrad"; case SmbAccurefEnum : return "SmbAccuref"; case SmbAdThreshEnum : return "SmbAdThresh"; - case SmbAIceEnum : return "SmbAIce"; - case SmbAIdxEnum : return "SmbAIdx"; - case SmbDesfacEnum : return "SmbDesfac"; - case SmbDpermilEnum : return "SmbDpermil"; - case SmbDsnowIdxEnum : return "SmbDsnowIdx"; - case SmbASnowEnum : return "SmbASnow"; case SmbCldFracEnum : return "SmbCldFrac"; case SmbDelta18oEnum : return "SmbDelta18o"; case SmbDelta18oSurfaceEnum : return "SmbDelta18oSurface"; case SmbDenIdxEnum : return "SmbDenIdx"; + case SmbDesfacEnum : return "SmbDesfac"; + case SmbDpermilEnum : return "SmbDpermil"; + case SmbDsnowIdxEnum : return "SmbDsnowIdx"; case SmbDtEnum : return "SmbDt"; case SmbEnum : return "Smb"; @@ -353,12 +347,12 @@ case SmbIsdelta18oEnum : return "SmbIsdelta18o"; case SmbIsdensificationEnum : return "SmbIsdensification"; + case SmbIsfirnwarmingEnum : return "SmbIsfirnwarming"; case SmbIsgraingrowthEnum : return "SmbIsgraingrowth"; - case SmbIsfirnwarmingEnum : return "SmbIsfirnwarming"; case SmbIsmeltEnum : return "SmbIsmelt"; case SmbIsmungsmEnum : return "SmbIsmungsm"; + case SmbIsprecipscaledEnum : return "SmbIsprecipscaled"; case SmbIssetpddfacEnum : return "SmbIssetpddfac"; case SmbIsshortwaveEnum : return "SmbIsshortwave"; case SmbIstemperaturescaledEnum : return "SmbIstemperaturescaled"; - case SmbIsprecipscaledEnum : return "SmbIsprecipscaled"; case SmbIsthermalEnum : return "SmbIsthermal"; case SmbIsturbulentfluxEnum : return "SmbIsturbulentflux"; @@ -366,6 +360,6 @@ case SmbNumRequestedOutputsEnum : return "SmbNumRequestedOutputs"; case SmbPfacEnum : return "SmbPfac"; + case SmbRdlEnum : return "SmbRdl"; case SmbRequestedOutputsEnum : return "SmbRequestedOutputs"; - case SmbRdlEnum : return "SmbRdl"; case SmbRlapsEnum : return "SmbRlaps"; case SmbRlapslgmEnum : return "SmbRlapslgm"; @@ -440,4 +434,9 @@ case VelocityEnum : return "Velocity"; case WorldCommEnum : return "WorldComm"; + case BasalforcingsIsmp6BasinAreaEnum : return "BasalforcingsIsmp6BasinArea"; + case BasalforcingsIsmp6DeltaTEnum : return "BasalforcingsIsmp6DeltaT"; + case BasalforcingsIsmp6Gamma0Enum : return "BasalforcingsIsmp6Gamma0"; + case BasalforcingsIsmp6NumBasinsEnum : return "BasalforcingsIsmp6NumBasins"; + case BasalforcingsIsmp6TfDepthsEnum : return "BasalforcingsIsmp6TfDepths"; case ParametersENDEnum : return "ParametersEND"; case InputsSTARTEnum : return "InputsSTART"; @@ -457,7 +456,7 @@ case BasalforcingsGeothermalfluxEnum : return "BasalforcingsGeothermalflux"; case BasalforcingsGroundediceMeltingRateEnum : return "BasalforcingsGroundediceMeltingRate"; + case BasalforcingsIsmp6BasinIdEnum : return "BasalforcingsIsmp6BasinId"; case BasalforcingsIsmp6TfEnum : return "BasalforcingsIsmp6Tf"; case BasalforcingsIsmp6TfShelfEnum : return "BasalforcingsIsmp6TfShelf"; - case BasalforcingsIsmp6BasinIdEnum : return "BasalforcingsIsmp6BasinId"; case BasalforcingsPicoBasinIdEnum : return "BasalforcingsPicoBasinId"; case BasalforcingsPicoBoxIdEnum : return "BasalforcingsPicoBoxId"; @@ -473,16 +472,16 @@ case CalvingCalvingrateEnum : return "CalvingCalvingrate"; case CalvingHabFractionEnum : return "CalvingHabFraction"; + case CalvingMeltingrateEnum : return "CalvingMeltingrate"; + case CalvingStressThresholdFloatingiceEnum : return "CalvingStressThresholdFloatingice"; + case CalvingStressThresholdGroundediceEnum : return "CalvingStressThresholdGroundedice"; case CalvinglevermannCoeffEnum : return "CalvinglevermannCoeff"; - case CalvingMeltingrateEnum : return "CalvingMeltingrate"; case CalvingratexAverageEnum : return "CalvingratexAverage"; case CalvingratexEnum : return "Calvingratex"; case CalvingrateyAverageEnum : return "CalvingrateyAverage"; case CalvingrateyEnum : return "Calvingratey"; - case CalvingStressThresholdFloatingiceEnum : return "CalvingStressThresholdFloatingice"; - case CalvingStressThresholdGroundediceEnum : return "CalvingStressThresholdGroundedice"; case ConvergedEnum : return "Converged"; case CrevasseDepthEnum : return "CrevasseDepth"; + case DamageDEnum : return "DamageD"; case DamageDbarEnum : return "DamageDbar"; - case DamageDEnum : return "DamageD"; case DamageFEnum : return "DamageF"; case DegreeOfChannelizationEnum : return "DegreeOfChannelization"; @@ -502,10 +501,9 @@ case DrivingStressXEnum : return "DrivingStressX"; case DrivingStressYEnum : return "DrivingStressY"; + case EffectivePressureEnum : return "EffectivePressure"; case EffectivePressureHydrostepEnum : return "EffectivePressureHydrostep"; case EffectivePressureStackedEnum : return "EffectivePressureStacked"; - case EffectivePressureEnum : return "EffectivePressure"; case EnthalpyEnum : return "Enthalpy"; case EnthalpyPicardEnum : return "EnthalpyPicard"; - case EplHeadStackedEnum : return "EplHeadStacked"; case EplHeadEnum : return "EplHead"; case EplHeadHydrostepEnum : return "EplHeadHydrostep"; @@ -513,12 +511,13 @@ case EplHeadSlopeXEnum : return "EplHeadSlopeX"; case EplHeadSlopeYEnum : return "EplHeadSlopeY"; + case EplHeadStackedEnum : return "EplHeadStacked"; case EsaDeltathicknessEnum : return "EsaDeltathickness"; case EsaEmotionEnum : return "EsaEmotion"; case EsaNmotionEnum : return "EsaNmotion"; - case EsaUmotionEnum : return "EsaUmotion"; case EsaRotationrateEnum : return "EsaRotationrate"; case EsaStrainratexxEnum : return "EsaStrainratexx"; case EsaStrainratexyEnum : return "EsaStrainratexy"; case EsaStrainrateyyEnum : return "EsaStrainrateyy"; + case EsaUmotionEnum : return "EsaUmotion"; case EsaXmotionEnum : return "EsaXmotion"; case EsaYmotionEnum : return "EsaYmotion"; @@ -528,23 +527,22 @@ case FrictionCEnum : return "FrictionC"; case FrictionCmaxEnum : return "FrictionCmax"; + case FrictionCoefficientEnum : return "FrictionCoefficient"; case FrictionCoefficientcoulombEnum : return "FrictionCoefficientcoulomb"; - case FrictionCoefficientEnum : return "FrictionCoefficient"; case FrictionEffectivePressureEnum : return "FrictionEffectivePressure"; - case FrictionfEnum : return "Frictionf"; case FrictionMEnum : return "FrictionM"; case FrictionPEnum : return "FrictionP"; case FrictionPressureAdjustedTemperatureEnum : return "FrictionPressureAdjustedTemperature"; case FrictionQEnum : return "FrictionQ"; + case FrictionSedimentCompressibilityCoefficientEnum : return "FrictionSedimentCompressibilityCoefficient"; + case FrictionTillFrictionAngleEnum : return "FrictionTillFrictionAngle"; case FrictionWaterLayerEnum : return "FrictionWaterLayer"; + case FrictionfEnum : return "Frictionf"; case FrontalForcingsSubglacialDischargeEnum : return "FrontalForcingsSubglacialDischarge"; case FrontalForcingsThermalForcingEnum : return "FrontalForcingsThermalForcing"; - case HydrologyWatercolumnMaxEnum : return "HydrologyWatercolumnMax"; - case FrictionTillFrictionAngleEnum : return "FrictionTillFrictionAngle"; - case FrictionSedimentCompressibilityCoefficientEnum : return "FrictionSedimentCompressibilityCoefficient"; case GeometryHydrostaticRatioEnum : return "GeometryHydrostaticRatio"; case GiaLithosphereThicknessEnum : return "GiaLithosphereThickness"; case GiaMantleViscosityEnum : return "GiaMantleViscosity"; + case GiaWEnum : return "GiaW"; case GiadWdtEnum : return "GiadWdt"; - case GiaWEnum : return "GiaW"; case GradientEnum : return "Gradient"; case GroundinglineHeightEnum : return "GroundinglineHeight"; @@ -553,16 +551,7 @@ case HydrologyBasalFluxEnum : return "HydrologyBasalFlux"; case HydrologyBumpHeightEnum : return "HydrologyBumpHeight"; - case HydrologySheetThicknessEnum : return "HydrologySheetThickness"; - case HydrologydcBasalMoulinInputEnum : return "HydrologydcBasalMoulinInput"; - case HydrologydcEplThicknessHydrostepEnum : return "HydrologydcEplThicknessHydrostep"; - case HydrologydcEplThicknessOldEnum : return "HydrologydcEplThicknessOld"; - case HydrologydcMaskEplactiveEltEnum : return "HydrologydcMaskEplactiveElt"; - case HydrologydcMaskEplactiveNodeEnum : return "HydrologydcMaskEplactiveNode"; - case HydrologydcMaskThawedEltEnum : return "HydrologydcMaskThawedElt"; - case HydrologydcMaskThawedNodeEnum : return "HydrologydcMaskThawedNode"; - case HydrologydcSedimentTransmitivityEnum : return "HydrologydcSedimentTransmitivity"; + case HydrologyBumpSpacingEnum : return "HydrologyBumpSpacing"; + case HydrologyDrainageRateEnum : return "HydrologyDrainageRate"; case HydrologyEnglacialInputEnum : return "HydrologyEnglacialInput"; - case HydrologydcEplThicknessStackedEnum : return "HydrologydcEplThicknessStacked"; - case HydrologydcEplThicknessEnum : return "HydrologydcEplThickness"; case HydrologyGapHeightEnum : return "HydrologyGapHeight"; case HydrologyHeadEnum : return "HydrologyHead"; @@ -572,7 +561,18 @@ case HydrologyReynoldsEnum : return "HydrologyReynolds"; case HydrologySheetConductivityEnum : return "HydrologySheetConductivity"; + case HydrologySheetThicknessEnum : return "HydrologySheetThickness"; case HydrologyWaterVxEnum : return "HydrologyWaterVx"; case HydrologyWaterVyEnum : return "HydrologyWaterVy"; - case HydrologyDrainageRateEnum : return "HydrologyDrainageRate"; + case HydrologyWatercolumnMaxEnum : return "HydrologyWatercolumnMax"; + case HydrologydcBasalMoulinInputEnum : return "HydrologydcBasalMoulinInput"; + case HydrologydcEplThicknessEnum : return "HydrologydcEplThickness"; + case HydrologydcEplThicknessHydrostepEnum : return "HydrologydcEplThicknessHydrostep"; + case HydrologydcEplThicknessOldEnum : return "HydrologydcEplThicknessOld"; + case HydrologydcEplThicknessStackedEnum : return "HydrologydcEplThicknessStacked"; + case HydrologydcMaskEplactiveEltEnum : return "HydrologydcMaskEplactiveElt"; + case HydrologydcMaskEplactiveNodeEnum : return "HydrologydcMaskEplactiveNode"; + case HydrologydcMaskThawedEltEnum : return "HydrologydcMaskThawedElt"; + case HydrologydcMaskThawedNodeEnum : return "HydrologydcMaskThawedNode"; + case HydrologydcSedimentTransmitivityEnum : return "HydrologydcSedimentTransmitivity"; case IceEnum : return "Ice"; case IceMaskNodeActivationEnum : return "IceMaskNodeActivation"; @@ -591,15 +591,15 @@ case MaskGroundediceLevelsetEnum : return "MaskGroundediceLevelset"; case MaskIceLevelsetEnum : return "MaskIceLevelset"; - case MasstransportSpcthicknessEnum : return "MasstransportSpcthickness"; case MaskLandLevelsetEnum : return "MaskLandLevelset"; case MaskOceanLevelsetEnum : return "MaskOceanLevelset"; + case MasstransportSpcthicknessEnum : return "MasstransportSpcthickness"; + case MaterialsRheologyBEnum : return "MaterialsRheologyB"; case MaterialsRheologyBbarEnum : return "MaterialsRheologyBbar"; - case MaterialsRheologyBEnum : return "MaterialsRheologyB"; + case MaterialsRheologyEEnum : return "MaterialsRheologyE"; case MaterialsRheologyEbarEnum : return "MaterialsRheologyEbar"; + case MaterialsRheologyEcEnum : return "MaterialsRheologyEc"; case MaterialsRheologyEcbarEnum : return "MaterialsRheologyEcbar"; - case MaterialsRheologyEcEnum : return "MaterialsRheologyEc"; - case MaterialsRheologyEEnum : return "MaterialsRheologyE"; + case MaterialsRheologyEsEnum : return "MaterialsRheologyEs"; case MaterialsRheologyEsbarEnum : return "MaterialsRheologyEsbar"; - case MaterialsRheologyEsEnum : return "MaterialsRheologyEs"; case MaterialsRheologyNEnum : return "MaterialsRheologyN"; case MeshScaleFactorEnum : return "MeshScaleFactor"; @@ -616,39 +616,39 @@ case PressureEnum : return "Pressure"; case RheologyBAbsGradientEnum : return "RheologyBAbsGradient"; + case RheologyBInitialguessEnum : return "RheologyBInitialguess"; + case RheologyBInitialguessMisfitEnum : return "RheologyBInitialguessMisfit"; case RheologyBbarAbsGradientEnum : return "RheologyBbarAbsGradient"; - case RheologyBInitialguessMisfitEnum : return "RheologyBInitialguessMisfit"; - case RheologyBInitialguessEnum : return "RheologyBInitialguess"; case SealevelEnum : return "Sealevel"; case SealevelEustaticMaskEnum : return "SealevelEustaticMask"; + case SealevelEustaticOceanMaskEnum : return "SealevelEustaticOceanMask"; + case SealevelNEsaEnum : return "SealevelNEsa"; + case SealevelNEsaRateEnum : return "SealevelNEsaRate"; + case SealevelNGiaEnum : return "SealevelNGia"; + case SealevelNGiaRateEnum : return "SealevelNGiaRate"; + case SealevelRSLEnum : return "SealevelRSL"; + case SealevelRSLEustaticEnum : return "SealevelRSLEustatic"; + case SealevelRSLEustaticRateEnum : return "SealevelRSLEustaticRate"; + case SealevelRSLRateEnum : return "SealevelRSLRate"; + case SealevelUEastEsaEnum : return "SealevelUEastEsa"; + case SealevelUEsaEnum : return "SealevelUEsa"; + case SealevelUEsaRateEnum : return "SealevelUEsaRate"; + case SealevelUGiaEnum : return "SealevelUGia"; + case SealevelUGiaRateEnum : return "SealevelUGiaRate"; + case SealevelUNorthEsaEnum : return "SealevelUNorthEsa"; case SealevelriseCumDeltathicknessEnum : return "SealevelriseCumDeltathickness"; case SealevelriseDeltathicknessEnum : return "SealevelriseDeltathickness"; - case SealevelUEsaRateEnum : return "SealevelUEsaRate"; - case SealevelNEsaRateEnum : return "SealevelNEsaRate"; - case SealevelRSLRateEnum : return "SealevelRSLRate"; - case SealevelUEsaEnum : return "SealevelUEsa"; - case SealevelRSLEustaticRateEnum : return "SealevelRSLEustaticRate"; case SealevelriseSpcthicknessEnum : return "SealevelriseSpcthickness"; case SealevelriseStericRateEnum : return "SealevelriseStericRate"; - case SealevelNEsaEnum : return "SealevelNEsa"; - case SealevelUGiaEnum : return "SealevelUGia"; - case SealevelNGiaEnum : return "SealevelNGia"; - case SealevelRSLEnum : return "SealevelRSL"; - case SealevelRSLEustaticEnum : return "SealevelRSLEustatic"; - case SealevelUNorthEsaEnum : return "SealevelUNorthEsa"; - case SealevelUEastEsaEnum : return "SealevelUEastEsa"; - case SealevelNGiaRateEnum : return "SealevelNGiaRate"; - case SealevelUGiaRateEnum : return "SealevelUGiaRate"; - case SealevelEustaticOceanMaskEnum : return "SealevelEustaticOceanMask"; - case SedimentHeadStackedEnum : return "SedimentHeadStacked"; case SedimentHeadEnum : return "SedimentHead"; case SedimentHeadHydrostepEnum : return "SedimentHeadHydrostep"; case SedimentHeadOldEnum : return "SedimentHeadOld"; case SedimentHeadResidualEnum : return "SedimentHeadResidual"; + case SedimentHeadStackedEnum : return "SedimentHeadStacked"; case SigmaNNEnum : return "SigmaNN"; case SigmaVMEnum : return "SigmaVM"; + case SmbAEnum : return "SmbA"; + case SmbAValueEnum : return "SmbAValue"; case SmbAccumulationEnum : return "SmbAccumulation"; - case SmbAEnum : return "SmbA"; case SmbAiniEnum : return "SmbAini"; - case SmbAValueEnum : return "SmbAValue"; case SmbBMaxEnum : return "SmbBMax"; case SmbBMinEnum : return "SmbBMin"; @@ -656,21 +656,22 @@ case SmbBPosEnum : return "SmbBPos"; case SmbCEnum : return "SmbC"; - case SmbDailysnowfallEnum : return "SmbDailysnowfall"; - case SmbDailyrainfallEnum : return "SmbDailyrainfall"; - case SmbDailydsradiationEnum : return "SmbDailydsradiation"; - case SmbDailydlradiationEnum : return "SmbDailydlradiation"; - case SmbDailywindspeedEnum : return "SmbDailywindspeed"; - case SmbDailypressureEnum : return "SmbDailypressure"; + case SmbDEnum : return "SmbD"; case SmbDailyairdensityEnum : return "SmbDailyairdensity"; case SmbDailyairhumidityEnum : return "SmbDailyairhumidity"; + case SmbDailydlradiationEnum : return "SmbDailydlradiation"; + case SmbDailydsradiationEnum : return "SmbDailydsradiation"; + case SmbDailypressureEnum : return "SmbDailypressure"; + case SmbDailyrainfallEnum : return "SmbDailyrainfall"; + case SmbDailysnowfallEnum : return "SmbDailysnowfall"; case SmbDailytemperatureEnum : return "SmbDailytemperature"; - case SmbDEnum : return "SmbD"; + case SmbDailywindspeedEnum : return "SmbDailywindspeed"; case SmbDiniEnum : return "SmbDini"; case SmbDlwrfEnum : return "SmbDlwrf"; case SmbDswrfEnum : return "SmbDswrf"; + case SmbDzAddEnum : return "SmbDzAdd"; case SmbDzEnum : return "SmbDz"; - case SmbDziniEnum : return "SmbDzini"; case SmbDzMinEnum : return "SmbDzMin"; case SmbDzTopEnum : return "SmbDzTop"; + case SmbDziniEnum : return "SmbDzini"; case SmbEAirEnum : return "SmbEAir"; case SmbECEnum : return "SmbEC"; @@ -678,4 +679,5 @@ case SmbElaEnum : return "SmbEla"; case SmbEvaporationEnum : return "SmbEvaporation"; + case SmbFACEnum : return "SmbFAC"; case SmbGdnEnum : return "SmbGdn"; case SmbGdniniEnum : return "SmbGdnini"; @@ -685,12 +687,17 @@ case SmbIsInitializedEnum : return "SmbIsInitialized"; case SmbMAddEnum : return "SmbMAdd"; + case SmbMassBalanceClimateEnum : return "SmbMassBalanceClimate"; case SmbMassBalanceEnum : return "SmbMassBalance"; - case SmbMassBalanceClimateEnum : return "SmbMassBalanceClimate"; + case SmbMeanLHFEnum : return "SmbMeanLHF"; + case SmbMeanSHFEnum : return "SmbMeanSHF"; + case SmbMeanULWEnum : return "SmbMeanULW"; case SmbMeltEnum : return "SmbMelt"; case SmbMonthlytemperaturesEnum : return "SmbMonthlytemperatures"; + case SmbNetLWEnum : return "SmbNetLW"; + case SmbNetSWEnum : return "SmbNetSW"; case SmbPAirEnum : return "SmbPAir"; + case SmbPEnum : return "SmbP"; case SmbPddfacIceEnum : return "SmbPddfacIce"; case SmbPddfacSnowEnum : return "SmbPddfacSnow"; - case SmbPEnum : return "SmbP"; case SmbPrecipitationEnum : return "SmbPrecipitation"; case SmbPrecipitationsAnomalyEnum : return "SmbPrecipitationsAnomaly"; @@ -702,22 +709,22 @@ case SmbReiniEnum : return "SmbReini"; case SmbRunoffEnum : return "SmbRunoff"; + case SmbS0gcmEnum : return "SmbS0gcm"; case SmbS0pEnum : return "SmbS0p"; case SmbS0tEnum : return "SmbS0t"; - case SmbS0gcmEnum : return "SmbS0gcm"; case SmbSizeiniEnum : return "SmbSizeini"; + case SmbSmbCorrEnum : return "SmbSmbCorr"; case SmbSmbrefEnum : return "SmbSmbref"; - case SmbSmbCorrEnum : return "SmbSmbCorr"; + case SmbTEnum : return "SmbT"; case SmbTaEnum : return "SmbTa"; + case SmbTeValueEnum : return "SmbTeValue"; case SmbTemperaturesAnomalyEnum : return "SmbTemperaturesAnomaly"; case SmbTemperaturesLgmEnum : return "SmbTemperaturesLgm"; case SmbTemperaturesPresentdayEnum : return "SmbTemperaturesPresentday"; case SmbTemperaturesReconstructedEnum : return "SmbTemperaturesReconstructed"; - case SmbTEnum : return "SmbT"; - case SmbTeValueEnum : return "SmbTeValue"; case SmbTiniEnum : return "SmbTini"; case SmbTmeanEnum : return "SmbTmean"; - case SmbVmeanEnum : return "SmbVmean"; case SmbTzEnum : return "SmbTz"; case SmbVEnum : return "SmbV"; + case SmbVmeanEnum : return "SmbVmean"; case SmbVzEnum : return "SmbVz"; case SmbWEnum : return "SmbW"; @@ -727,11 +734,4 @@ case SmbZTopEnum : return "SmbZTop"; case SmbZYEnum : return "SmbZY"; - case SmbDzAddEnum : return "SmbDzAdd"; - case SmbFACEnum : return "SmbFAC"; - case SmbMeanULWEnum : return "SmbMeanULW"; - case SmbNetLWEnum : return "SmbNetLW"; - case SmbNetSWEnum : return "SmbNetSW"; - case SmbMeanLHFEnum : return "SmbMeanLHF"; - case SmbMeanSHFEnum : return "SmbMeanSHF"; case StrainRateeffectiveEnum : return "StrainRateeffective"; case StrainRateparallelEnum : return "StrainRateparallel"; @@ -763,6 +763,6 @@ case SurfaceSlopeYEnum : return "SurfaceSlopeY"; case TemperatureEnum : return "Temperature"; + case TemperaturePDDEnum : return "TemperaturePDD"; case TemperaturePicardEnum : return "TemperaturePicard"; - case TemperaturePDDEnum : return "TemperaturePDD"; case TemperatureSEMICEnum : return "TemperatureSEMIC"; case ThermalSpctemperatureEnum : return "ThermalSpctemperature"; @@ -787,6 +787,6 @@ case VzMeshEnum : return "VzMesh"; case VzSSAEnum : return "VzSSA"; + case WaterColumnOldEnum : return "WaterColumnOld"; case WatercolumnEnum : return "Watercolumn"; - case WaterColumnOldEnum : return "WaterColumnOld"; case WaterfractionDrainageEnum : return "WaterfractionDrainage"; case WaterfractionDrainageIntegratedEnum : return "WaterfractionDrainageIntegrated"; @@ -928,9 +928,9 @@ case CalvingLevermannEnum : return "CalvingLevermann"; case CalvingVonmisesEnum : return "CalvingVonmises"; + case CfdragcoeffabsgradEnum : return "Cfdragcoeffabsgrad"; case CfsurfacelogvelEnum : return "Cfsurfacelogvel"; case CfsurfacesquareEnum : return "Cfsurfacesquare"; - case CfdragcoeffabsgradEnum : return "Cfdragcoeffabsgrad"; + case ChannelEnum : return "Channel"; case ClosedEnum : return "Closed"; - case ChannelEnum : return "Channel"; case ColinearEnum : return "Colinear"; case ConstraintsEnum : return "Constraints"; @@ -939,8 +939,8 @@ case ContoursEnum : return "Contours"; case ControlInputEnum : return "ControlInput"; + case ControlInputGradEnum : return "ControlInputGrad"; + case ControlInputMaxsEnum : return "ControlInputMaxs"; + case ControlInputMinsEnum : return "ControlInputMins"; case ControlInputValuesEnum : return "ControlInputValues"; - case ControlInputMinsEnum : return "ControlInputMins"; - case ControlInputMaxsEnum : return "ControlInputMaxs"; - case ControlInputGradEnum : return "ControlInputGrad"; case CrouzeixRaviartEnum : return "CrouzeixRaviart"; case CuffeyEnum : return "Cuffey"; @@ -949,6 +949,6 @@ case DamageEvolutionSolutionEnum : return "DamageEvolutionSolution"; case DataSetEnum : return "DataSet"; + case DataSetParamEnum : return "DataSetParam"; case DatasetInputEnum : return "DatasetInput"; - case DataSetParamEnum : return "DataSetParam"; case DefaultAnalysisEnum : return "DefaultAnalysis"; case DefaultCalvingEnum : return "DefaultCalving"; @@ -978,4 +978,8 @@ case ExtrudeFromBaseAnalysisEnum : return "ExtrudeFromBaseAnalysis"; case ExtrudeFromTopAnalysisEnum : return "ExtrudeFromTopAnalysis"; + case FSApproximationEnum : return "FSApproximation"; + case FSSolverEnum : return "FSSolver"; + case FSpressureEnum : return "FSpressure"; + case FSvelocityEnum : return "FSvelocity"; case FemModelEnum : return "FemModel"; case FileParamEnum : return "FileParam"; @@ -989,10 +993,7 @@ case FrontalForcingsDefaultEnum : return "FrontalForcingsDefault"; case FrontalForcingsRignotEnum : return "FrontalForcingsRignot"; - case FSApproximationEnum : return "FSApproximation"; case FsetEnum : return "Fset"; - case FSpressureEnum : return "FSpressure"; - case FSSolverEnum : return "FSSolver"; - case FSvelocityEnum : return "FSvelocity"; case FullMeltOnPartiallyFloatingEnum : return "FullMeltOnPartiallyFloating"; + case GLheightadvectionAnalysisEnum : return "GLheightadvectionAnalysis"; case GaussPentaEnum : return "GaussPenta"; case GaussSegEnum : return "GaussSeg"; @@ -1001,5 +1002,4 @@ case GenericOptionEnum : return "GenericOption"; case GenericParamEnum : return "GenericParam"; - case GLheightadvectionAnalysisEnum : return "GLheightadvectionAnalysis"; case GiaIvinsAnalysisEnum : return "GiaIvinsAnalysis"; case GiaSolutionEnum : return "GiaSolution"; @@ -1010,4 +1010,5 @@ case GroundedAreaScaledEnum : return "GroundedAreaScaled"; case GroundingOnlyEnum : return "GroundingOnly"; + case GroundinglineMassFluxEnum : return "GroundinglineMassFlux"; case GsetEnum : return "Gset"; case GslEnum : return "Gsl"; @@ -1016,15 +1017,15 @@ case HookEnum : return "Hook"; case HydrologyDCEfficientAnalysisEnum : return "HydrologyDCEfficientAnalysis"; + case HydrologyDCInefficientAnalysisEnum : return "HydrologyDCInefficientAnalysis"; + case HydrologyGlaDSAnalysisEnum : return "HydrologyGlaDSAnalysis"; + case HydrologyGlaDSEnum : return "HydrologyGlaDS"; + case HydrologyPismAnalysisEnum : return "HydrologyPismAnalysis"; + case HydrologyShaktiAnalysisEnum : return "HydrologyShaktiAnalysis"; + case HydrologyShreveAnalysisEnum : return "HydrologyShreveAnalysis"; + case HydrologySolutionEnum : return "HydrologySolution"; case HydrologydcEnum : return "Hydrologydc"; - case HydrologyDCInefficientAnalysisEnum : return "HydrologyDCInefficientAnalysis"; - case HydrologyShreveAnalysisEnum : return "HydrologyShreveAnalysis"; + case HydrologypismEnum : return "Hydrologypism"; + case HydrologyshaktiEnum : return "Hydrologyshakti"; case HydrologyshreveEnum : return "Hydrologyshreve"; - case HydrologySolutionEnum : return "HydrologySolution"; - case HydrologyGlaDSAnalysisEnum : return "HydrologyGlaDSAnalysis"; - case HydrologyShaktiAnalysisEnum : return "HydrologyShaktiAnalysis"; - case HydrologyPismAnalysisEnum : return "HydrologyPismAnalysis"; - case HydrologyGlaDSEnum : return "HydrologyGlaDS"; - case HydrologyshaktiEnum : return "Hydrologyshakti"; - case HydrologypismEnum : return "Hydrologypism"; case IceMassEnum : return "IceMass"; case IceMassScaledEnum : return "IceMassScaled"; @@ -1033,8 +1034,8 @@ case IceVolumeEnum : return "IceVolume"; case IceVolumeScaledEnum : return "IceVolumeScaled"; + case IcefrontMassFluxEnum : return "IcefrontMassFlux"; + case IcefrontMassFluxLevelsetEnum : return "IcefrontMassFluxLevelset"; case IncrementalEnum : return "Incremental"; case IndexedEnum : return "Indexed"; - case InternalEnum : return "Internal"; - case IntersectEnum : return "Intersect"; case IntExternalResultEnum : return "IntExternalResult"; case IntInputEnum : return "IntInput"; @@ -1043,4 +1044,6 @@ case IntParamEnum : return "IntParam"; case IntVecParamEnum : return "IntVecParam"; + case InternalEnum : return "Internal"; + case IntersectEnum : return "Intersect"; case InversionVzObsEnum : return "InversionVzObs"; case JEnum : return "J"; @@ -1049,10 +1052,9 @@ case L2ProjectionEPLAnalysisEnum : return "L2ProjectionEPLAnalysis"; case LACrouzeixRaviartEnum : return "LACrouzeixRaviart"; + case LATaylorHoodEnum : return "LATaylorHood"; case LambdaSEnum : return "LambdaS"; - case LATaylorHoodEnum : return "LATaylorHood"; case LevelsetAnalysisEnum : return "LevelsetAnalysis"; case LevelsetfunctionPicardEnum : return "LevelsetfunctionPicard"; case LinearFloatingMeltRateEnum : return "LinearFloatingMeltRate"; - case SpatialLinearFloatingMeltRateEnum : return "SpatialLinearFloatingMeltRate"; case LliboutryDuvalEnum : return "LliboutryDuval"; case LoadsEnum : return "Loads"; @@ -1067,18 +1069,17 @@ case LoveLrEnum : return "LoveLr"; case LoveSolutionEnum : return "LoveSolution"; + case MINIEnum : return "MINI"; + case MINIcondensedEnum : return "MINIcondensed"; case MantlePlumeGeothermalFluxEnum : return "MantlePlumeGeothermalFlux"; + case MassFluxEnum : return "MassFlux"; + case MassconEnum : return "Masscon"; case MassconaxpbyEnum : return "Massconaxpby"; - case MassconEnum : return "Masscon"; case MassfluxatgateEnum : return "Massfluxatgate"; - case MassFluxEnum : return "MassFlux"; - case GroundinglineMassFluxEnum : return "GroundinglineMassFlux"; - case IcefrontMassFluxEnum : return "IcefrontMassFlux"; - case IcefrontMassFluxLevelsetEnum : return "IcefrontMassFluxLevelset"; case MasstransportAnalysisEnum : return "MasstransportAnalysis"; case MasstransportSolutionEnum : return "MasstransportSolution"; case MatdamageiceEnum : return "Matdamageice"; case MatenhancediceEnum : return "Matenhancedice"; + case MaterialsEnum : return "Materials"; case MatestarEnum : return "Matestar"; - case MaterialsEnum : return "Materials"; case MaticeEnum : return "Matice"; case MatlithoEnum : return "Matlitho"; @@ -1097,6 +1098,4 @@ case MeshXEnum : return "MeshX"; case MeshYEnum : return "MeshY"; - case MINIcondensedEnum : return "MINIcondensed"; - case MINIEnum : return "MINI"; case MinVelEnum : return "MinVel"; case MinVxEnum : return "MinVx"; @@ -1109,9 +1108,9 @@ case MpiSparseEnum : return "MpiSparse"; case MumpsEnum : return "Mumps"; + case NoFrictionOnPartiallyFloatingEnum : return "NoFrictionOnPartiallyFloating"; + case NoMeltOnPartiallyFloatingEnum : return "NoMeltOnPartiallyFloating"; case NodalEnum : return "Nodal"; case NodalvalueEnum : return "Nodalvalue"; case NodeSIdEnum : return "NodeSId"; - case NoFrictionOnPartiallyFloatingEnum : return "NoFrictionOnPartiallyFloating"; - case NoMeltOnPartiallyFloatingEnum : return "NoMeltOnPartiallyFloating"; case NoneApproximationEnum : return "NoneApproximation"; case NoneEnum : return "None"; @@ -1123,15 +1122,15 @@ case OptionEnum : return "Option"; case P0ArrayEnum : return "P0Array"; - case P1bubblecondensedEnum : return "P1bubblecondensed"; - case P1bubbleEnum : return "P1bubble"; case P1DGEnum : return "P1DG"; case P1P1Enum : return "P1P1"; case P1P1GLSEnum : return "P1P1GLS"; + case P1bubbleEnum : return "P1bubble"; + case P1bubblecondensedEnum : return "P1bubblecondensed"; case P1xP2Enum : return "P1xP2"; case P1xP3Enum : return "P1xP3"; case P1xP4Enum : return "P1xP4"; + case P2Enum : return "P2"; + case P2bubbleEnum : return "P2bubble"; case P2bubblecondensedEnum : return "P2bubblecondensed"; - case P2bubbleEnum : return "P2bubble"; - case P2Enum : return "P2"; case P2xP1Enum : return "P2xP1"; case P2xP4Enum : return "P2xP4"; @@ -1148,4 +1147,21 @@ case RegularEnum : return "Regular"; case RiftfrontEnum : return "Riftfront"; + case SIAApproximationEnum : return "SIAApproximation"; + case SMBcomponentsEnum : return "SMBcomponents"; + case SMBd18opddEnum : return "SMBd18opdd"; + case SMBforcingEnum : return "SMBforcing"; + case SMBgcmEnum : return "SMBgcm"; + case SMBgembEnum : return "SMBgemb"; + case SMBgradientsEnum : return "SMBgradients"; + case SMBgradientscomponentsEnum : return "SMBgradientscomponents"; + case SMBgradientselaEnum : return "SMBgradientsela"; + case SMBhenningEnum : return "SMBhenning"; + case SMBmeltcomponentsEnum : return "SMBmeltcomponents"; + case SMBpddEnum : return "SMBpdd"; + case SMBpddSicopolisEnum : return "SMBpddSicopolis"; + case SMBsemicEnum : return "SMBsemic"; + case SSAApproximationEnum : return "SSAApproximation"; + case SSAFSApproximationEnum : return "SSAFSApproximation"; + case SSAHOApproximationEnum : return "SSAHOApproximation"; case ScaledEnum : return "Scaled"; case SealevelAbsoluteEnum : return "SealevelAbsolute"; @@ -1155,7 +1171,7 @@ case SealevelInertiaTensorZZEnum : return "SealevelInertiaTensorZZ"; case SealevelNmotionEnum : return "SealevelNmotion"; + case SealevelUmotionEnum : return "SealevelUmotion"; case SealevelriseAnalysisEnum : return "SealevelriseAnalysis"; case SealevelriseSolutionEnum : return "SealevelriseSolution"; - case SealevelUmotionEnum : return "SealevelUmotion"; case SegEnum : return "Seg"; case SegInputEnum : return "SegInput"; @@ -1164,30 +1180,15 @@ case SeparateEnum : return "Separate"; case SeqEnum : return "Seq"; - case SIAApproximationEnum : return "SIAApproximation"; case SmbAnalysisEnum : return "SmbAnalysis"; - case SMBsemicEnum : return "SMBsemic"; - case SMBcomponentsEnum : return "SMBcomponents"; - case SMBd18opddEnum : return "SMBd18opdd"; - case SMBforcingEnum : return "SMBforcing"; - case SMBgcmEnum : return "SMBgcm"; - case SMBgembEnum : return "SMBgemb"; - case SMBgradientselaEnum : return "SMBgradientsela"; - case SMBgradientsEnum : return "SMBgradients"; - case SMBhenningEnum : return "SMBhenning"; - case SMBmeltcomponentsEnum : return "SMBmeltcomponents"; - case SMBpddEnum : return "SMBpdd"; - case SMBpddSicopolisEnum : return "SMBpddSicopolis"; - case SMBgradientscomponentsEnum : return "SMBgradientscomponents"; case SmbSolutionEnum : return "SmbSolution"; case SmoothAnalysisEnum : return "SmoothAnalysis"; case SoftMigrationEnum : return "SoftMigration"; + case SpatialLinearFloatingMeltRateEnum : return "SpatialLinearFloatingMeltRate"; case SpcDynamicEnum : return "SpcDynamic"; case SpcStaticEnum : return "SpcStatic"; case SpcTransientEnum : return "SpcTransient"; - case SSAApproximationEnum : return "SSAApproximation"; - case SSAFSApproximationEnum : return "SSAFSApproximation"; - case SSAHOApproximationEnum : return "SSAHOApproximation"; case SsetEnum : return "Sset"; case SteadystateSolutionEnum : return "SteadystateSolution"; + case StressIntensityFactorEnum : return "StressIntensityFactor"; case StressbalanceAnalysisEnum : return "StressbalanceAnalysis"; case StressbalanceConvergenceNumStepsEnum : return "StressbalanceConvergenceNumSteps"; @@ -1195,5 +1196,4 @@ case StressbalanceSolutionEnum : return "StressbalanceSolution"; case StressbalanceVerticalAnalysisEnum : return "StressbalanceVerticalAnalysis"; - case StressIntensityFactorEnum : return "StressIntensityFactor"; case StringArrayParamEnum : return "StringArrayParam"; case StringExternalResultEnum : return "StringExternalResult"; @@ -1201,7 +1201,7 @@ case SubelementFriction1Enum : return "SubelementFriction1"; case SubelementFriction2Enum : return "SubelementFriction2"; - case SubelementMigrationEnum : return "SubelementMigration"; case SubelementMelt1Enum : return "SubelementMelt1"; case SubelementMelt2Enum : return "SubelementMelt2"; + case SubelementMigrationEnum : return "SubelementMigration"; case SurfaceSlopeSolutionEnum : return "SurfaceSlopeSolution"; case TaylorHoodEnum : return "TaylorHood"; @@ -1226,7 +1226,7 @@ case VectorParamEnum : return "VectorParam"; case VertexEnum : return "Vertex"; + case VertexLIdEnum : return "VertexLId"; case VertexPIdEnum : return "VertexPId"; case VertexSIdEnum : return "VertexSId"; - case VertexLIdEnum : return "VertexLId"; case VerticesEnum : return "Vertices"; case ViscousHeatingEnum : return "ViscousHeating"; @@ -1247,6 +1247,6 @@ case SealevelWeightsEnum : return "SealevelWeights"; case StrainRateEnum : return "StrainRate"; + case StressTensorEnum : return "StressTensor"; case StressbalanceViscosityOvershootEnum : return "StressbalanceViscosityOvershoot"; - case StressTensorEnum : return "StressTensor"; case SubelementMigration4Enum : return "SubelementMigration4"; case TimesteppingTimeAdaptEnum : return "TimesteppingTimeAdapt"; Index: /issm/trunk-jpl/src/c/shared/Enum/StringToEnumx.cpp =================================================================== --- /issm/trunk-jpl/src/c/shared/Enum/StringToEnumx.cpp (revision 23956) +++ /issm/trunk-jpl/src/c/shared/Enum/StringToEnumx.cpp (revision 23957) @@ -69,14 +69,8 @@ else if (strcmp(name,"BasalforcingsDeepwaterElevation")==0) return BasalforcingsDeepwaterElevationEnum; else if (strcmp(name,"BasalforcingsDeepwaterMeltingRate")==0) return BasalforcingsDeepwaterMeltingRateEnum; - else if (strcmp(name,"BasalforcingsUpperwaterMeltingRate")==0) return BasalforcingsUpperwaterMeltingRateEnum; else if (strcmp(name,"BasalforcingsDtbg")==0) return BasalforcingsDtbgEnum; else if (strcmp(name,"Basalforcings")==0) return BasalforcingsEnum; - else if (strcmp(name,"BasalforcingsIsmp6BasinArea")==0) return BasalforcingsIsmp6BasinAreaEnum; - else if (strcmp(name,"BasalforcingsIsmp6DeltaT")==0) return BasalforcingsIsmp6DeltaTEnum; - else if (strcmp(name,"BasalforcingsIsmp6Gamma0")==0) return BasalforcingsIsmp6Gamma0Enum; + else if (strcmp(name,"BasalforcingsIsmp6AverageTf")==0) return BasalforcingsIsmp6AverageTfEnum; else if (strcmp(name,"BasalforcingsIsmp6IsLocal")==0) return BasalforcingsIsmp6IsLocalEnum; - else if (strcmp(name,"BasalforcingsIsmp6NumBasins")==0) return BasalforcingsIsmp6NumBasinsEnum; - else if (strcmp(name,"BasalforcingsIsmp6TfDepths")==0) return BasalforcingsIsmp6TfDepthsEnum; - else if (strcmp(name,"BasalforcingsIsmp6AverageTf")==0) return BasalforcingsIsmp6AverageTfEnum; else if (strcmp(name,"BasalforcingsLowercrustheat")==0) return BasalforcingsLowercrustheatEnum; else if (strcmp(name,"BasalforcingsMantleconductivity")==0) return BasalforcingsMantleconductivityEnum; @@ -103,4 +97,5 @@ else if (strcmp(name,"BasalforcingsUpperdepthMelt")==0) return BasalforcingsUpperdepthMeltEnum; else if (strcmp(name,"BasalforcingsUpperwaterElevation")==0) return BasalforcingsUpperwaterElevationEnum; + else if (strcmp(name,"BasalforcingsUpperwaterMeltingRate")==0) return BasalforcingsUpperwaterMeltingRateEnum; else if (strcmp(name,"CalvingCrevasseDepth")==0) return CalvingCrevasseDepthEnum; else if (strcmp(name,"CalvingHeightAboveFloatation")==0) return CalvingHeightAboveFloatationEnum; @@ -112,4 +107,6 @@ else if (strcmp(name,"ConstantsReferencetemperature")==0) return ConstantsReferencetemperatureEnum; else if (strcmp(name,"ConstantsYts")==0) return ConstantsYtsEnum; + else if (strcmp(name,"ControlInputSizeM")==0) return ControlInputSizeMEnum; + else if (strcmp(name,"ControlInputSizeN")==0) return ControlInputSizeNEnum; else if (strcmp(name,"DamageC1")==0) return DamageC1Enum; else if (strcmp(name,"DamageC2")==0) return DamageC2Enum; @@ -137,13 +134,14 @@ else if (strcmp(name,"FemModelComm")==0) return FemModelCommEnum; else if (strcmp(name,"FlowequationFeFS")==0) return FlowequationFeFSEnum; + else if (strcmp(name,"FlowequationIsFS")==0) return FlowequationIsFSEnum; + else if (strcmp(name,"FlowequationIsHO")==0) return FlowequationIsHOEnum; + else if (strcmp(name,"FlowequationIsL1L2")==0) return FlowequationIsL1L2Enum; else stage=2; } if(stage==2){ - if (strcmp(name,"FlowequationIsFS")==0) return FlowequationIsFSEnum; - else if (strcmp(name,"FlowequationIsHO")==0) return FlowequationIsHOEnum; - else if (strcmp(name,"FlowequationIsL1L2")==0) return FlowequationIsL1L2Enum; - else if (strcmp(name,"FlowequationIsSIA")==0) return FlowequationIsSIAEnum; + if (strcmp(name,"FlowequationIsSIA")==0) return FlowequationIsSIAEnum; else if (strcmp(name,"FlowequationIsSSA")==0) return FlowequationIsSSAEnum; else if (strcmp(name,"FrictionCoupling")==0) return FrictionCouplingEnum; + else if (strcmp(name,"FrictionDelta")==0) return FrictionDeltaEnum; else if (strcmp(name,"FrictionF")==0) return FrictionFEnum; else if (strcmp(name,"FrictionGamma")==0) return FrictionGammaEnum; @@ -151,5 +149,4 @@ else if (strcmp(name,"FrictionPseudoplasticityExponent")==0) return FrictionPseudoplasticityExponentEnum; else if (strcmp(name,"FrictionThresholdSpeed")==0) return FrictionThresholdSpeedEnum; - else if (strcmp(name,"FrictionDelta")==0) return FrictionDeltaEnum; else if (strcmp(name,"FrictionVoidRatio")==0) return FrictionVoidRatioEnum; else if (strcmp(name,"FrontalForcingsBasinIcefrontArea")==0) return FrontalForcingsBasinIcefrontAreaEnum; @@ -158,11 +155,20 @@ else if (strcmp(name,"FrontalForcingsParam")==0) return FrontalForcingsParamEnum; else if (strcmp(name,"GiaCrossSectionShape")==0) return GiaCrossSectionShapeEnum; - else if (strcmp(name,"GroundinglineMigration")==0) return GroundinglineMigrationEnum; else if (strcmp(name,"GroundinglineFrictionInterpolation")==0) return GroundinglineFrictionInterpolationEnum; else if (strcmp(name,"GroundinglineMeltInterpolation")==0) return GroundinglineMeltInterpolationEnum; - else if (strcmp(name,"HydrologyBumpSpacing")==0) return HydrologyBumpSpacingEnum; + else if (strcmp(name,"GroundinglineMigration")==0) return GroundinglineMigrationEnum; else if (strcmp(name,"HydrologyCavitySpacing")==0) return HydrologyCavitySpacingEnum; - else if (strcmp(name,"HydrologydcEplflipLock")==0) return HydrologydcEplflipLockEnum; - else if (strcmp(name,"HydrologydcEplThickComp")==0) return HydrologydcEplThickCompEnum; + else if (strcmp(name,"HydrologyChannelConductivity")==0) return HydrologyChannelConductivityEnum; + else if (strcmp(name,"HydrologyChannelSheetWidth")==0) return HydrologyChannelSheetWidthEnum; + else if (strcmp(name,"HydrologyEnglacialVoidRatio")==0) return HydrologyEnglacialVoidRatioEnum; + else if (strcmp(name,"HydrologyIschannels")==0) return HydrologyIschannelsEnum; + else if (strcmp(name,"HydrologyModel")==0) return HydrologyModelEnum; + else if (strcmp(name,"HydrologyNumRequestedOutputs")==0) return HydrologyNumRequestedOutputsEnum; + else if (strcmp(name,"HydrologyPressureMeltCoefficient")==0) return HydrologyPressureMeltCoefficientEnum; + else if (strcmp(name,"HydrologyRelaxation")==0) return HydrologyRelaxationEnum; + else if (strcmp(name,"HydrologyRequestedOutputs")==0) return HydrologyRequestedOutputsEnum; + else if (strcmp(name,"HydrologySedimentKmax")==0) return HydrologySedimentKmaxEnum; + else if (strcmp(name,"HydrologyStepsPerStep")==0) return HydrologyStepsPerStepEnum; + else if (strcmp(name,"HydrologyStorage")==0) return HydrologyStorageEnum; else if (strcmp(name,"HydrologydcEplColapseThickness")==0) return HydrologydcEplColapseThicknessEnum; else if (strcmp(name,"HydrologydcEplCompressibility")==0) return HydrologydcEplCompressibilityEnum; @@ -171,32 +177,22 @@ else if (strcmp(name,"HydrologydcEplMaxThickness")==0) return HydrologydcEplMaxThicknessEnum; else if (strcmp(name,"HydrologydcEplPorosity")==0) return HydrologydcEplPorosityEnum; + else if (strcmp(name,"HydrologydcEplThickComp")==0) return HydrologydcEplThickCompEnum; + else if (strcmp(name,"HydrologydcEplflipLock")==0) return HydrologydcEplflipLockEnum; else if (strcmp(name,"HydrologydcIsefficientlayer")==0) return HydrologydcIsefficientlayerEnum; else if (strcmp(name,"HydrologydcLeakageFactor")==0) return HydrologydcLeakageFactorEnum; + else if (strcmp(name,"HydrologydcMaxIter")==0) return HydrologydcMaxIterEnum; + else if (strcmp(name,"HydrologydcPenaltyFactor")==0) return HydrologydcPenaltyFactorEnum; + else if (strcmp(name,"HydrologydcPenaltyLock")==0) return HydrologydcPenaltyLockEnum; + else if (strcmp(name,"HydrologydcRelTol")==0) return HydrologydcRelTolEnum; else if (strcmp(name,"HydrologydcSedimentCompressibility")==0) return HydrologydcSedimentCompressibilityEnum; else if (strcmp(name,"HydrologydcSedimentPorosity")==0) return HydrologydcSedimentPorosityEnum; else if (strcmp(name,"HydrologydcSedimentThickness")==0) return HydrologydcSedimentThicknessEnum; - else if (strcmp(name,"HydrologydcMaxIter")==0) return HydrologydcMaxIterEnum; - else if (strcmp(name,"HydrologydcPenaltyFactor")==0) return HydrologydcPenaltyFactorEnum; - else if (strcmp(name,"HydrologydcWaterCompressibility")==0) return HydrologydcWaterCompressibilityEnum; - else if (strcmp(name,"HydrologydcPenaltyLock")==0) return HydrologydcPenaltyLockEnum; - else if (strcmp(name,"HydrologydcRelTol")==0) return HydrologydcRelTolEnum; else if (strcmp(name,"HydrologydcSedimentlimit")==0) return HydrologydcSedimentlimitEnum; else if (strcmp(name,"HydrologydcSedimentlimitFlag")==0) return HydrologydcSedimentlimitFlagEnum; else if (strcmp(name,"HydrologydcTransferFlag")==0) return HydrologydcTransferFlagEnum; else if (strcmp(name,"HydrologydcUnconfinedFlag")==0) return HydrologydcUnconfinedFlagEnum; + else if (strcmp(name,"HydrologydcWaterCompressibility")==0) return HydrologydcWaterCompressibilityEnum; else if (strcmp(name,"Hydrologydt")==0) return HydrologydtEnum; - else if (strcmp(name,"HydrologyIschannels")==0) return HydrologyIschannelsEnum; - else if (strcmp(name,"HydrologyChannelConductivity")==0) return HydrologyChannelConductivityEnum; - else if (strcmp(name,"HydrologyChannelSheetWidth")==0) return HydrologyChannelSheetWidthEnum; - else if (strcmp(name,"HydrologyEnglacialVoidRatio")==0) return HydrologyEnglacialVoidRatioEnum; - else if (strcmp(name,"HydrologyModel")==0) return HydrologyModelEnum; - else if (strcmp(name,"HydrologyNumRequestedOutputs")==0) return HydrologyNumRequestedOutputsEnum; - else if (strcmp(name,"HydrologyPressureMeltCoefficient")==0) return HydrologyPressureMeltCoefficientEnum; - else if (strcmp(name,"HydrologyRelaxation")==0) return HydrologyRelaxationEnum; - else if (strcmp(name,"HydrologyRequestedOutputs")==0) return HydrologyRequestedOutputsEnum; - else if (strcmp(name,"HydrologySedimentKmax")==0) return HydrologySedimentKmaxEnum; else if (strcmp(name,"HydrologyshreveStabilization")==0) return HydrologyshreveStabilizationEnum; - else if (strcmp(name,"HydrologyStepsPerStep")==0) return HydrologyStepsPerStepEnum; - else if (strcmp(name,"HydrologyStorage")==0) return HydrologyStorageEnum; else if (strcmp(name,"IcecapToEarthComm")==0) return IcecapToEarthCommEnum; else if (strcmp(name,"Index")==0) return IndexEnum; @@ -210,6 +206,4 @@ else if (strcmp(name,"InversionControlParameters")==0) return InversionControlParametersEnum; else if (strcmp(name,"InversionControlScalingFactors")==0) return InversionControlScalingFactorsEnum; - else if (strcmp(name,"ControlInputSizeM")==0) return ControlInputSizeMEnum; - else if (strcmp(name,"ControlInputSizeN")==0) return ControlInputSizeNEnum; else if (strcmp(name,"InversionCostFunctions")==0) return InversionCostFunctionsEnum; else if (strcmp(name,"InversionDxmin")==0) return InversionDxminEnum; @@ -252,4 +246,5 @@ else if (strcmp(name,"MaterialsBeta")==0) return MaterialsBetaEnum; else if (strcmp(name,"MaterialsEarthDensity")==0) return MaterialsEarthDensityEnum; + else if (strcmp(name,"MaterialsEffectiveconductivityAveraging")==0) return MaterialsEffectiveconductivityAveragingEnum; else if (strcmp(name,"MaterialsHeatcapacity")==0) return MaterialsHeatcapacityEnum; else if (strcmp(name,"MaterialsLatentheat")==0) return MaterialsLatentheatEnum; @@ -260,16 +255,15 @@ else if (strcmp(name,"MaterialsMeltingpoint")==0) return MaterialsMeltingpointEnum; else if (strcmp(name,"MaterialsMixedLayerCapacity")==0) return MaterialsMixedLayerCapacityEnum; + else if (strcmp(name,"MaterialsMuWater")==0) return MaterialsMuWaterEnum; + else if (strcmp(name,"MaterialsRheologyLaw")==0) return MaterialsRheologyLawEnum; + else if (strcmp(name,"MaterialsRhoFreshwater")==0) return MaterialsRhoFreshwaterEnum; + else if (strcmp(name,"MaterialsRhoIce")==0) return MaterialsRhoIceEnum; + else if (strcmp(name,"MaterialsRhoSeawater")==0) return MaterialsRhoSeawaterEnum; else stage=3; } if(stage==3){ - if (strcmp(name,"MaterialsMuWater")==0) return MaterialsMuWaterEnum; - else if (strcmp(name,"MaterialsRheologyLaw")==0) return MaterialsRheologyLawEnum; - else if (strcmp(name,"MaterialsRhoIce")==0) return MaterialsRhoIceEnum; - else if (strcmp(name,"MaterialsRhoFreshwater")==0) return MaterialsRhoFreshwaterEnum; - else if (strcmp(name,"MaterialsRhoSeawater")==0) return MaterialsRhoSeawaterEnum; - else if (strcmp(name,"MaterialsTemperateiceconductivity")==0) return MaterialsTemperateiceconductivityEnum; - else if (strcmp(name,"MaterialsEffectiveconductivityAveraging")==0) return MaterialsEffectiveconductivityAveragingEnum; + if (strcmp(name,"MaterialsTemperateiceconductivity")==0) return MaterialsTemperateiceconductivityEnum; + else if (strcmp(name,"MaterialsThermalExchangeVelocity")==0) return MaterialsThermalExchangeVelocityEnum; else if (strcmp(name,"MaterialsThermalconductivity")==0) return MaterialsThermalconductivityEnum; - else if (strcmp(name,"MaterialsThermalExchangeVelocity")==0) return MaterialsThermalExchangeVelocityEnum; else if (strcmp(name,"MeltingOffset")==0) return MeltingOffsetEnum; else if (strcmp(name,"MeshAverageVertexConnectivity")==0) return MeshAverageVertexConnectivityEnum; @@ -286,7 +280,7 @@ else if (strcmp(name,"OutputBufferPointer")==0) return OutputBufferPointerEnum; else if (strcmp(name,"OutputBufferSizePointer")==0) return OutputBufferSizePointerEnum; - else if (strcmp(name,"Outputdefinition")==0) return OutputdefinitionEnum; else if (strcmp(name,"OutputFileName")==0) return OutputFileNameEnum; else if (strcmp(name,"OutputFilePointer")==0) return OutputFilePointerEnum; + else if (strcmp(name,"Outputdefinition")==0) return OutputdefinitionEnum; else if (strcmp(name,"Param")==0) return ParamEnum; else if (strcmp(name,"Parameters")==0) return ParametersEnum; @@ -328,25 +322,25 @@ else if (strcmp(name,"SealevelriseUElastic")==0) return SealevelriseUElasticEnum; else if (strcmp(name,"SettingsIoGather")==0) return SettingsIoGatherEnum; + else if (strcmp(name,"SettingsNumResultsOnNodes")==0) return SettingsNumResultsOnNodesEnum; else if (strcmp(name,"SettingsOutputFrequency")==0) return SettingsOutputFrequencyEnum; - else if (strcmp(name,"SettingsSbCouplingFrequency")==0) return SettingsSbCouplingFrequencyEnum; else if (strcmp(name,"SettingsRecordingFrequency")==0) return SettingsRecordingFrequencyEnum; else if (strcmp(name,"SettingsResultsOnNodes")==0) return SettingsResultsOnNodesEnum; - else if (strcmp(name,"SettingsNumResultsOnNodes")==0) return SettingsNumResultsOnNodesEnum; + else if (strcmp(name,"SettingsSbCouplingFrequency")==0) return SettingsSbCouplingFrequencyEnum; else if (strcmp(name,"SettingsSolverResidueThreshold")==0) return SettingsSolverResidueThresholdEnum; else if (strcmp(name,"SettingsWaitonlock")==0) return SettingsWaitonlockEnum; + else if (strcmp(name,"SmbAIce")==0) return SmbAIceEnum; + else if (strcmp(name,"SmbAIdx")==0) return SmbAIdxEnum; + else if (strcmp(name,"SmbASnow")==0) return SmbASnowEnum; else if (strcmp(name,"SmbAccualti")==0) return SmbAccualtiEnum; else if (strcmp(name,"SmbAccugrad")==0) return SmbAccugradEnum; else if (strcmp(name,"SmbAccuref")==0) return SmbAccurefEnum; else if (strcmp(name,"SmbAdThresh")==0) return SmbAdThreshEnum; - else if (strcmp(name,"SmbAIce")==0) return SmbAIceEnum; - else if (strcmp(name,"SmbAIdx")==0) return SmbAIdxEnum; - else if (strcmp(name,"SmbDesfac")==0) return SmbDesfacEnum; - else if (strcmp(name,"SmbDpermil")==0) return SmbDpermilEnum; - else if (strcmp(name,"SmbDsnowIdx")==0) return SmbDsnowIdxEnum; - else if (strcmp(name,"SmbASnow")==0) return SmbASnowEnum; else if (strcmp(name,"SmbCldFrac")==0) return SmbCldFracEnum; else if (strcmp(name,"SmbDelta18o")==0) return SmbDelta18oEnum; else if (strcmp(name,"SmbDelta18oSurface")==0) return SmbDelta18oSurfaceEnum; else if (strcmp(name,"SmbDenIdx")==0) return SmbDenIdxEnum; + else if (strcmp(name,"SmbDesfac")==0) return SmbDesfacEnum; + else if (strcmp(name,"SmbDpermil")==0) return SmbDpermilEnum; + else if (strcmp(name,"SmbDsnowIdx")==0) return SmbDsnowIdxEnum; else if (strcmp(name,"SmbDt")==0) return SmbDtEnum; else if (strcmp(name,"Smb")==0) return SmbEnum; @@ -359,12 +353,12 @@ else if (strcmp(name,"SmbIsdelta18o")==0) return SmbIsdelta18oEnum; else if (strcmp(name,"SmbIsdensification")==0) return SmbIsdensificationEnum; + else if (strcmp(name,"SmbIsfirnwarming")==0) return SmbIsfirnwarmingEnum; else if (strcmp(name,"SmbIsgraingrowth")==0) return SmbIsgraingrowthEnum; - else if (strcmp(name,"SmbIsfirnwarming")==0) return SmbIsfirnwarmingEnum; else if (strcmp(name,"SmbIsmelt")==0) return SmbIsmeltEnum; else if (strcmp(name,"SmbIsmungsm")==0) return SmbIsmungsmEnum; + else if (strcmp(name,"SmbIsprecipscaled")==0) return SmbIsprecipscaledEnum; else if (strcmp(name,"SmbIssetpddfac")==0) return SmbIssetpddfacEnum; else if (strcmp(name,"SmbIsshortwave")==0) return SmbIsshortwaveEnum; else if (strcmp(name,"SmbIstemperaturescaled")==0) return SmbIstemperaturescaledEnum; - else if (strcmp(name,"SmbIsprecipscaled")==0) return SmbIsprecipscaledEnum; else if (strcmp(name,"SmbIsthermal")==0) return SmbIsthermalEnum; else if (strcmp(name,"SmbIsturbulentflux")==0) return SmbIsturbulentfluxEnum; @@ -372,6 +366,6 @@ else if (strcmp(name,"SmbNumRequestedOutputs")==0) return SmbNumRequestedOutputsEnum; else if (strcmp(name,"SmbPfac")==0) return SmbPfacEnum; + else if (strcmp(name,"SmbRdl")==0) return SmbRdlEnum; else if (strcmp(name,"SmbRequestedOutputs")==0) return SmbRequestedOutputsEnum; - else if (strcmp(name,"SmbRdl")==0) return SmbRdlEnum; else if (strcmp(name,"SmbRlaps")==0) return SmbRlapsEnum; else if (strcmp(name,"SmbRlapslgm")==0) return SmbRlapslgmEnum; @@ -383,8 +377,5 @@ else if (strcmp(name,"SmbT0dry")==0) return SmbT0dryEnum; else if (strcmp(name,"SmbT0wet")==0) return SmbT0wetEnum; - else stage=4; - } - if(stage==4){ - if (strcmp(name,"SmbTdiff")==0) return SmbTdiffEnum; + else if (strcmp(name,"SmbTdiff")==0) return SmbTdiffEnum; else if (strcmp(name,"SmbThermoDeltaTScaling")==0) return SmbThermoDeltaTScalingEnum; else if (strcmp(name,"SmoothThicknessMultiplier")==0) return SmoothThicknessMultiplierEnum; @@ -392,5 +383,8 @@ else if (strcmp(name,"SteadystateMaxiter")==0) return SteadystateMaxiterEnum; else if (strcmp(name,"SteadystateNumRequestedOutputs")==0) return SteadystateNumRequestedOutputsEnum; - else if (strcmp(name,"SteadystateReltol")==0) return SteadystateReltolEnum; + else stage=4; + } + if(stage==4){ + if (strcmp(name,"SteadystateReltol")==0) return SteadystateReltolEnum; else if (strcmp(name,"SteadystateRequestedOutputs")==0) return SteadystateRequestedOutputsEnum; else if (strcmp(name,"Step")==0) return StepEnum; @@ -449,4 +443,9 @@ else if (strcmp(name,"Velocity")==0) return VelocityEnum; else if (strcmp(name,"WorldComm")==0) return WorldCommEnum; + else if (strcmp(name,"BasalforcingsIsmp6BasinArea")==0) return BasalforcingsIsmp6BasinAreaEnum; + else if (strcmp(name,"BasalforcingsIsmp6DeltaT")==0) return BasalforcingsIsmp6DeltaTEnum; + else if (strcmp(name,"BasalforcingsIsmp6Gamma0")==0) return BasalforcingsIsmp6Gamma0Enum; + else if (strcmp(name,"BasalforcingsIsmp6NumBasins")==0) return BasalforcingsIsmp6NumBasinsEnum; + else if (strcmp(name,"BasalforcingsIsmp6TfDepths")==0) return BasalforcingsIsmp6TfDepthsEnum; else if (strcmp(name,"ParametersEND")==0) return ParametersENDEnum; else if (strcmp(name,"InputsSTART")==0) return InputsSTARTEnum; @@ -466,7 +465,7 @@ else if (strcmp(name,"BasalforcingsGeothermalflux")==0) return BasalforcingsGeothermalfluxEnum; else if (strcmp(name,"BasalforcingsGroundediceMeltingRate")==0) return BasalforcingsGroundediceMeltingRateEnum; + else if (strcmp(name,"BasalforcingsIsmp6BasinId")==0) return BasalforcingsIsmp6BasinIdEnum; else if (strcmp(name,"BasalforcingsIsmp6Tf")==0) return BasalforcingsIsmp6TfEnum; else if (strcmp(name,"BasalforcingsIsmp6TfShelf")==0) return BasalforcingsIsmp6TfShelfEnum; - else if (strcmp(name,"BasalforcingsIsmp6BasinId")==0) return BasalforcingsIsmp6BasinIdEnum; else if (strcmp(name,"BasalforcingsPicoBasinId")==0) return BasalforcingsPicoBasinIdEnum; else if (strcmp(name,"BasalforcingsPicoBoxId")==0) return BasalforcingsPicoBoxIdEnum; @@ -482,16 +481,16 @@ else if (strcmp(name,"CalvingCalvingrate")==0) return CalvingCalvingrateEnum; else if (strcmp(name,"CalvingHabFraction")==0) return CalvingHabFractionEnum; + else if (strcmp(name,"CalvingMeltingrate")==0) return CalvingMeltingrateEnum; + else if (strcmp(name,"CalvingStressThresholdFloatingice")==0) return CalvingStressThresholdFloatingiceEnum; + else if (strcmp(name,"CalvingStressThresholdGroundedice")==0) return CalvingStressThresholdGroundediceEnum; else if (strcmp(name,"CalvinglevermannCoeff")==0) return CalvinglevermannCoeffEnum; - else if (strcmp(name,"CalvingMeltingrate")==0) return CalvingMeltingrateEnum; else if (strcmp(name,"CalvingratexAverage")==0) return CalvingratexAverageEnum; else if (strcmp(name,"Calvingratex")==0) return CalvingratexEnum; else if (strcmp(name,"CalvingrateyAverage")==0) return CalvingrateyAverageEnum; else if (strcmp(name,"Calvingratey")==0) return CalvingrateyEnum; - else if (strcmp(name,"CalvingStressThresholdFloatingice")==0) return CalvingStressThresholdFloatingiceEnum; - else if (strcmp(name,"CalvingStressThresholdGroundedice")==0) return CalvingStressThresholdGroundediceEnum; else if (strcmp(name,"Converged")==0) return ConvergedEnum; else if (strcmp(name,"CrevasseDepth")==0) return CrevasseDepthEnum; + else if (strcmp(name,"DamageD")==0) return DamageDEnum; else if (strcmp(name,"DamageDbar")==0) return DamageDbarEnum; - else if (strcmp(name,"DamageD")==0) return DamageDEnum; else if (strcmp(name,"DamageF")==0) return DamageFEnum; else if (strcmp(name,"DegreeOfChannelization")==0) return DegreeOfChannelizationEnum; @@ -506,18 +505,17 @@ else if (strcmp(name,"DistanceToGroundingline")==0) return DistanceToGroundinglineEnum; else if (strcmp(name,"Domain2Dhorizontal")==0) return Domain2DhorizontalEnum; + else if (strcmp(name,"Domain2Dvertical")==0) return Domain2DverticalEnum; else stage=5; } if(stage==5){ - if (strcmp(name,"Domain2Dvertical")==0) return Domain2DverticalEnum; - else if (strcmp(name,"Domain3D")==0) return Domain3DEnum; + if (strcmp(name,"Domain3D")==0) return Domain3DEnum; else if (strcmp(name,"DragCoefficientAbsGradient")==0) return DragCoefficientAbsGradientEnum; else if (strcmp(name,"DrivingStressX")==0) return DrivingStressXEnum; else if (strcmp(name,"DrivingStressY")==0) return DrivingStressYEnum; + else if (strcmp(name,"EffectivePressure")==0) return EffectivePressureEnum; else if (strcmp(name,"EffectivePressureHydrostep")==0) return EffectivePressureHydrostepEnum; else if (strcmp(name,"EffectivePressureStacked")==0) return EffectivePressureStackedEnum; - else if (strcmp(name,"EffectivePressure")==0) return EffectivePressureEnum; else if (strcmp(name,"Enthalpy")==0) return EnthalpyEnum; else if (strcmp(name,"EnthalpyPicard")==0) return EnthalpyPicardEnum; - else if (strcmp(name,"EplHeadStacked")==0) return EplHeadStackedEnum; else if (strcmp(name,"EplHead")==0) return EplHeadEnum; else if (strcmp(name,"EplHeadHydrostep")==0) return EplHeadHydrostepEnum; @@ -525,12 +523,13 @@ else if (strcmp(name,"EplHeadSlopeX")==0) return EplHeadSlopeXEnum; else if (strcmp(name,"EplHeadSlopeY")==0) return EplHeadSlopeYEnum; + else if (strcmp(name,"EplHeadStacked")==0) return EplHeadStackedEnum; else if (strcmp(name,"EsaDeltathickness")==0) return EsaDeltathicknessEnum; else if (strcmp(name,"EsaEmotion")==0) return EsaEmotionEnum; else if (strcmp(name,"EsaNmotion")==0) return EsaNmotionEnum; - else if (strcmp(name,"EsaUmotion")==0) return EsaUmotionEnum; else if (strcmp(name,"EsaRotationrate")==0) return EsaRotationrateEnum; else if (strcmp(name,"EsaStrainratexx")==0) return EsaStrainratexxEnum; else if (strcmp(name,"EsaStrainratexy")==0) return EsaStrainratexyEnum; else if (strcmp(name,"EsaStrainrateyy")==0) return EsaStrainrateyyEnum; + else if (strcmp(name,"EsaUmotion")==0) return EsaUmotionEnum; else if (strcmp(name,"EsaXmotion")==0) return EsaXmotionEnum; else if (strcmp(name,"EsaYmotion")==0) return EsaYmotionEnum; @@ -540,23 +539,22 @@ else if (strcmp(name,"FrictionC")==0) return FrictionCEnum; else if (strcmp(name,"FrictionCmax")==0) return FrictionCmaxEnum; + else if (strcmp(name,"FrictionCoefficient")==0) return FrictionCoefficientEnum; else if (strcmp(name,"FrictionCoefficientcoulomb")==0) return FrictionCoefficientcoulombEnum; - else if (strcmp(name,"FrictionCoefficient")==0) return FrictionCoefficientEnum; else if (strcmp(name,"FrictionEffectivePressure")==0) return FrictionEffectivePressureEnum; - else if (strcmp(name,"Frictionf")==0) return FrictionfEnum; else if (strcmp(name,"FrictionM")==0) return FrictionMEnum; else if (strcmp(name,"FrictionP")==0) return FrictionPEnum; else if (strcmp(name,"FrictionPressureAdjustedTemperature")==0) return FrictionPressureAdjustedTemperatureEnum; else if (strcmp(name,"FrictionQ")==0) return FrictionQEnum; + else if (strcmp(name,"FrictionSedimentCompressibilityCoefficient")==0) return FrictionSedimentCompressibilityCoefficientEnum; + else if (strcmp(name,"FrictionTillFrictionAngle")==0) return FrictionTillFrictionAngleEnum; else if (strcmp(name,"FrictionWaterLayer")==0) return FrictionWaterLayerEnum; + else if (strcmp(name,"Frictionf")==0) return FrictionfEnum; else if (strcmp(name,"FrontalForcingsSubglacialDischarge")==0) return FrontalForcingsSubglacialDischargeEnum; else if (strcmp(name,"FrontalForcingsThermalForcing")==0) return FrontalForcingsThermalForcingEnum; - else if (strcmp(name,"HydrologyWatercolumnMax")==0) return HydrologyWatercolumnMaxEnum; - else if (strcmp(name,"FrictionTillFrictionAngle")==0) return FrictionTillFrictionAngleEnum; - else if (strcmp(name,"FrictionSedimentCompressibilityCoefficient")==0) return FrictionSedimentCompressibilityCoefficientEnum; else if (strcmp(name,"GeometryHydrostaticRatio")==0) return GeometryHydrostaticRatioEnum; else if (strcmp(name,"GiaLithosphereThickness")==0) return GiaLithosphereThicknessEnum; else if (strcmp(name,"GiaMantleViscosity")==0) return GiaMantleViscosityEnum; + else if (strcmp(name,"GiaW")==0) return GiaWEnum; else if (strcmp(name,"GiadWdt")==0) return GiadWdtEnum; - else if (strcmp(name,"GiaW")==0) return GiaWEnum; else if (strcmp(name,"Gradient")==0) return GradientEnum; else if (strcmp(name,"GroundinglineHeight")==0) return GroundinglineHeightEnum; @@ -565,16 +563,7 @@ else if (strcmp(name,"HydrologyBasalFlux")==0) return HydrologyBasalFluxEnum; else if (strcmp(name,"HydrologyBumpHeight")==0) return HydrologyBumpHeightEnum; - else if (strcmp(name,"HydrologySheetThickness")==0) return HydrologySheetThicknessEnum; - else if (strcmp(name,"HydrologydcBasalMoulinInput")==0) return HydrologydcBasalMoulinInputEnum; - else if (strcmp(name,"HydrologydcEplThicknessHydrostep")==0) return HydrologydcEplThicknessHydrostepEnum; - else if (strcmp(name,"HydrologydcEplThicknessOld")==0) return HydrologydcEplThicknessOldEnum; - else if (strcmp(name,"HydrologydcMaskEplactiveElt")==0) return HydrologydcMaskEplactiveEltEnum; - else if (strcmp(name,"HydrologydcMaskEplactiveNode")==0) return HydrologydcMaskEplactiveNodeEnum; - else if (strcmp(name,"HydrologydcMaskThawedElt")==0) return HydrologydcMaskThawedEltEnum; - else if (strcmp(name,"HydrologydcMaskThawedNode")==0) return HydrologydcMaskThawedNodeEnum; - else if (strcmp(name,"HydrologydcSedimentTransmitivity")==0) return HydrologydcSedimentTransmitivityEnum; + else if (strcmp(name,"HydrologyBumpSpacing")==0) return HydrologyBumpSpacingEnum; + else if (strcmp(name,"HydrologyDrainageRate")==0) return HydrologyDrainageRateEnum; else if (strcmp(name,"HydrologyEnglacialInput")==0) return HydrologyEnglacialInputEnum; - else if (strcmp(name,"HydrologydcEplThicknessStacked")==0) return HydrologydcEplThicknessStackedEnum; - else if (strcmp(name,"HydrologydcEplThickness")==0) return HydrologydcEplThicknessEnum; else if (strcmp(name,"HydrologyGapHeight")==0) return HydrologyGapHeightEnum; else if (strcmp(name,"HydrologyHead")==0) return HydrologyHeadEnum; @@ -584,7 +573,18 @@ else if (strcmp(name,"HydrologyReynolds")==0) return HydrologyReynoldsEnum; else if (strcmp(name,"HydrologySheetConductivity")==0) return HydrologySheetConductivityEnum; + else if (strcmp(name,"HydrologySheetThickness")==0) return HydrologySheetThicknessEnum; else if (strcmp(name,"HydrologyWaterVx")==0) return HydrologyWaterVxEnum; else if (strcmp(name,"HydrologyWaterVy")==0) return HydrologyWaterVyEnum; - else if (strcmp(name,"HydrologyDrainageRate")==0) return HydrologyDrainageRateEnum; + else if (strcmp(name,"HydrologyWatercolumnMax")==0) return HydrologyWatercolumnMaxEnum; + else if (strcmp(name,"HydrologydcBasalMoulinInput")==0) return HydrologydcBasalMoulinInputEnum; + else if (strcmp(name,"HydrologydcEplThickness")==0) return HydrologydcEplThicknessEnum; + else if (strcmp(name,"HydrologydcEplThicknessHydrostep")==0) return HydrologydcEplThicknessHydrostepEnum; + else if (strcmp(name,"HydrologydcEplThicknessOld")==0) return HydrologydcEplThicknessOldEnum; + else if (strcmp(name,"HydrologydcEplThicknessStacked")==0) return HydrologydcEplThicknessStackedEnum; + else if (strcmp(name,"HydrologydcMaskEplactiveElt")==0) return HydrologydcMaskEplactiveEltEnum; + else if (strcmp(name,"HydrologydcMaskEplactiveNode")==0) return HydrologydcMaskEplactiveNodeEnum; + else if (strcmp(name,"HydrologydcMaskThawedElt")==0) return HydrologydcMaskThawedEltEnum; + else if (strcmp(name,"HydrologydcMaskThawedNode")==0) return HydrologydcMaskThawedNodeEnum; + else if (strcmp(name,"HydrologydcSedimentTransmitivity")==0) return HydrologydcSedimentTransmitivityEnum; else if (strcmp(name,"Ice")==0) return IceEnum; else if (strcmp(name,"IceMaskNodeActivation")==0) return IceMaskNodeActivationEnum; @@ -603,15 +603,15 @@ else if (strcmp(name,"MaskGroundediceLevelset")==0) return MaskGroundediceLevelsetEnum; else if (strcmp(name,"MaskIceLevelset")==0) return MaskIceLevelsetEnum; - else if (strcmp(name,"MasstransportSpcthickness")==0) return MasstransportSpcthicknessEnum; else if (strcmp(name,"MaskLandLevelset")==0) return MaskLandLevelsetEnum; else if (strcmp(name,"MaskOceanLevelset")==0) return MaskOceanLevelsetEnum; + else if (strcmp(name,"MasstransportSpcthickness")==0) return MasstransportSpcthicknessEnum; + else if (strcmp(name,"MaterialsRheologyB")==0) return MaterialsRheologyBEnum; else if (strcmp(name,"MaterialsRheologyBbar")==0) return MaterialsRheologyBbarEnum; - else if (strcmp(name,"MaterialsRheologyB")==0) return MaterialsRheologyBEnum; + else if (strcmp(name,"MaterialsRheologyE")==0) return MaterialsRheologyEEnum; else if (strcmp(name,"MaterialsRheologyEbar")==0) return MaterialsRheologyEbarEnum; + else if (strcmp(name,"MaterialsRheologyEc")==0) return MaterialsRheologyEcEnum; else if (strcmp(name,"MaterialsRheologyEcbar")==0) return MaterialsRheologyEcbarEnum; - else if (strcmp(name,"MaterialsRheologyEc")==0) return MaterialsRheologyEcEnum; - else if (strcmp(name,"MaterialsRheologyE")==0) return MaterialsRheologyEEnum; + else if (strcmp(name,"MaterialsRheologyEs")==0) return MaterialsRheologyEsEnum; else if (strcmp(name,"MaterialsRheologyEsbar")==0) return MaterialsRheologyEsbarEnum; - else if (strcmp(name,"MaterialsRheologyEs")==0) return MaterialsRheologyEsEnum; else if (strcmp(name,"MaterialsRheologyN")==0) return MaterialsRheologyNEnum; else if (strcmp(name,"MeshScaleFactor")==0) return MeshScaleFactorEnum; @@ -628,42 +628,42 @@ else if (strcmp(name,"Pressure")==0) return PressureEnum; else if (strcmp(name,"RheologyBAbsGradient")==0) return RheologyBAbsGradientEnum; - else if (strcmp(name,"RheologyBbarAbsGradient")==0) return RheologyBbarAbsGradientEnum; + else if (strcmp(name,"RheologyBInitialguess")==0) return RheologyBInitialguessEnum; else stage=6; } if(stage==6){ if (strcmp(name,"RheologyBInitialguessMisfit")==0) return RheologyBInitialguessMisfitEnum; - else if (strcmp(name,"RheologyBInitialguess")==0) return RheologyBInitialguessEnum; + else if (strcmp(name,"RheologyBbarAbsGradient")==0) return RheologyBbarAbsGradientEnum; else if (strcmp(name,"Sealevel")==0) return SealevelEnum; else if (strcmp(name,"SealevelEustaticMask")==0) return SealevelEustaticMaskEnum; + else if (strcmp(name,"SealevelEustaticOceanMask")==0) return SealevelEustaticOceanMaskEnum; + else if (strcmp(name,"SealevelNEsa")==0) return SealevelNEsaEnum; + else if (strcmp(name,"SealevelNEsaRate")==0) return SealevelNEsaRateEnum; + else if (strcmp(name,"SealevelNGia")==0) return SealevelNGiaEnum; + else if (strcmp(name,"SealevelNGiaRate")==0) return SealevelNGiaRateEnum; + else if (strcmp(name,"SealevelRSL")==0) return SealevelRSLEnum; + else if (strcmp(name,"SealevelRSLEustatic")==0) return SealevelRSLEustaticEnum; + else if (strcmp(name,"SealevelRSLEustaticRate")==0) return SealevelRSLEustaticRateEnum; + else if (strcmp(name,"SealevelRSLRate")==0) return SealevelRSLRateEnum; + else if (strcmp(name,"SealevelUEastEsa")==0) return SealevelUEastEsaEnum; + else if (strcmp(name,"SealevelUEsa")==0) return SealevelUEsaEnum; + else if (strcmp(name,"SealevelUEsaRate")==0) return SealevelUEsaRateEnum; + else if (strcmp(name,"SealevelUGia")==0) return SealevelUGiaEnum; + else if (strcmp(name,"SealevelUGiaRate")==0) return SealevelUGiaRateEnum; + else if (strcmp(name,"SealevelUNorthEsa")==0) return SealevelUNorthEsaEnum; else if (strcmp(name,"SealevelriseCumDeltathickness")==0) return SealevelriseCumDeltathicknessEnum; else if (strcmp(name,"SealevelriseDeltathickness")==0) return SealevelriseDeltathicknessEnum; - else if (strcmp(name,"SealevelUEsaRate")==0) return SealevelUEsaRateEnum; - else if (strcmp(name,"SealevelNEsaRate")==0) return SealevelNEsaRateEnum; - else if (strcmp(name,"SealevelRSLRate")==0) return SealevelRSLRateEnum; - else if (strcmp(name,"SealevelUEsa")==0) return SealevelUEsaEnum; - else if (strcmp(name,"SealevelRSLEustaticRate")==0) return SealevelRSLEustaticRateEnum; else if (strcmp(name,"SealevelriseSpcthickness")==0) return SealevelriseSpcthicknessEnum; else if (strcmp(name,"SealevelriseStericRate")==0) return SealevelriseStericRateEnum; - else if (strcmp(name,"SealevelNEsa")==0) return SealevelNEsaEnum; - else if (strcmp(name,"SealevelUGia")==0) return SealevelUGiaEnum; - else if (strcmp(name,"SealevelNGia")==0) return SealevelNGiaEnum; - else if (strcmp(name,"SealevelRSL")==0) return SealevelRSLEnum; - else if (strcmp(name,"SealevelRSLEustatic")==0) return SealevelRSLEustaticEnum; - else if (strcmp(name,"SealevelUNorthEsa")==0) return SealevelUNorthEsaEnum; - else if (strcmp(name,"SealevelUEastEsa")==0) return SealevelUEastEsaEnum; - else if (strcmp(name,"SealevelNGiaRate")==0) return SealevelNGiaRateEnum; - else if (strcmp(name,"SealevelUGiaRate")==0) return SealevelUGiaRateEnum; - else if (strcmp(name,"SealevelEustaticOceanMask")==0) return SealevelEustaticOceanMaskEnum; - else if (strcmp(name,"SedimentHeadStacked")==0) return SedimentHeadStackedEnum; else if (strcmp(name,"SedimentHead")==0) return SedimentHeadEnum; else if (strcmp(name,"SedimentHeadHydrostep")==0) return SedimentHeadHydrostepEnum; else if (strcmp(name,"SedimentHeadOld")==0) return SedimentHeadOldEnum; else if (strcmp(name,"SedimentHeadResidual")==0) return SedimentHeadResidualEnum; + else if (strcmp(name,"SedimentHeadStacked")==0) return SedimentHeadStackedEnum; else if (strcmp(name,"SigmaNN")==0) return SigmaNNEnum; else if (strcmp(name,"SigmaVM")==0) return SigmaVMEnum; + else if (strcmp(name,"SmbA")==0) return SmbAEnum; + else if (strcmp(name,"SmbAValue")==0) return SmbAValueEnum; else if (strcmp(name,"SmbAccumulation")==0) return SmbAccumulationEnum; - else if (strcmp(name,"SmbA")==0) return SmbAEnum; else if (strcmp(name,"SmbAini")==0) return SmbAiniEnum; - else if (strcmp(name,"SmbAValue")==0) return SmbAValueEnum; else if (strcmp(name,"SmbBMax")==0) return SmbBMaxEnum; else if (strcmp(name,"SmbBMin")==0) return SmbBMinEnum; @@ -671,21 +671,22 @@ else if (strcmp(name,"SmbBPos")==0) return SmbBPosEnum; else if (strcmp(name,"SmbC")==0) return SmbCEnum; - else if (strcmp(name,"SmbDailysnowfall")==0) return SmbDailysnowfallEnum; - else if (strcmp(name,"SmbDailyrainfall")==0) return SmbDailyrainfallEnum; - else if (strcmp(name,"SmbDailydsradiation")==0) return SmbDailydsradiationEnum; - else if (strcmp(name,"SmbDailydlradiation")==0) return SmbDailydlradiationEnum; - else if (strcmp(name,"SmbDailywindspeed")==0) return SmbDailywindspeedEnum; - else if (strcmp(name,"SmbDailypressure")==0) return SmbDailypressureEnum; + else if (strcmp(name,"SmbD")==0) return SmbDEnum; else if (strcmp(name,"SmbDailyairdensity")==0) return SmbDailyairdensityEnum; else if (strcmp(name,"SmbDailyairhumidity")==0) return SmbDailyairhumidityEnum; + else if (strcmp(name,"SmbDailydlradiation")==0) return SmbDailydlradiationEnum; + else if (strcmp(name,"SmbDailydsradiation")==0) return SmbDailydsradiationEnum; + else if (strcmp(name,"SmbDailypressure")==0) return SmbDailypressureEnum; + else if (strcmp(name,"SmbDailyrainfall")==0) return SmbDailyrainfallEnum; + else if (strcmp(name,"SmbDailysnowfall")==0) return SmbDailysnowfallEnum; else if (strcmp(name,"SmbDailytemperature")==0) return SmbDailytemperatureEnum; - else if (strcmp(name,"SmbD")==0) return SmbDEnum; + else if (strcmp(name,"SmbDailywindspeed")==0) return SmbDailywindspeedEnum; else if (strcmp(name,"SmbDini")==0) return SmbDiniEnum; else if (strcmp(name,"SmbDlwrf")==0) return SmbDlwrfEnum; else if (strcmp(name,"SmbDswrf")==0) return SmbDswrfEnum; + else if (strcmp(name,"SmbDzAdd")==0) return SmbDzAddEnum; else if (strcmp(name,"SmbDz")==0) return SmbDzEnum; - else if (strcmp(name,"SmbDzini")==0) return SmbDziniEnum; else if (strcmp(name,"SmbDzMin")==0) return SmbDzMinEnum; else if (strcmp(name,"SmbDzTop")==0) return SmbDzTopEnum; + else if (strcmp(name,"SmbDzini")==0) return SmbDziniEnum; else if (strcmp(name,"SmbEAir")==0) return SmbEAirEnum; else if (strcmp(name,"SmbEC")==0) return SmbECEnum; @@ -693,4 +694,5 @@ else if (strcmp(name,"SmbEla")==0) return SmbElaEnum; else if (strcmp(name,"SmbEvaporation")==0) return SmbEvaporationEnum; + else if (strcmp(name,"SmbFAC")==0) return SmbFACEnum; else if (strcmp(name,"SmbGdn")==0) return SmbGdnEnum; else if (strcmp(name,"SmbGdnini")==0) return SmbGdniniEnum; @@ -700,12 +702,17 @@ else if (strcmp(name,"SmbIsInitialized")==0) return SmbIsInitializedEnum; else if (strcmp(name,"SmbMAdd")==0) return SmbMAddEnum; + else if (strcmp(name,"SmbMassBalanceClimate")==0) return SmbMassBalanceClimateEnum; else if (strcmp(name,"SmbMassBalance")==0) return SmbMassBalanceEnum; - else if (strcmp(name,"SmbMassBalanceClimate")==0) return SmbMassBalanceClimateEnum; + else if (strcmp(name,"SmbMeanLHF")==0) return SmbMeanLHFEnum; + else if (strcmp(name,"SmbMeanSHF")==0) return SmbMeanSHFEnum; + else if (strcmp(name,"SmbMeanULW")==0) return SmbMeanULWEnum; else if (strcmp(name,"SmbMelt")==0) return SmbMeltEnum; else if (strcmp(name,"SmbMonthlytemperatures")==0) return SmbMonthlytemperaturesEnum; + else if (strcmp(name,"SmbNetLW")==0) return SmbNetLWEnum; + else if (strcmp(name,"SmbNetSW")==0) return SmbNetSWEnum; else if (strcmp(name,"SmbPAir")==0) return SmbPAirEnum; + else if (strcmp(name,"SmbP")==0) return SmbPEnum; else if (strcmp(name,"SmbPddfacIce")==0) return SmbPddfacIceEnum; else if (strcmp(name,"SmbPddfacSnow")==0) return SmbPddfacSnowEnum; - else if (strcmp(name,"SmbP")==0) return SmbPEnum; else if (strcmp(name,"SmbPrecipitation")==0) return SmbPrecipitationEnum; else if (strcmp(name,"SmbPrecipitationsAnomaly")==0) return SmbPrecipitationsAnomalyEnum; @@ -717,22 +724,22 @@ else if (strcmp(name,"SmbReini")==0) return SmbReiniEnum; else if (strcmp(name,"SmbRunoff")==0) return SmbRunoffEnum; + else if (strcmp(name,"SmbS0gcm")==0) return SmbS0gcmEnum; else if (strcmp(name,"SmbS0p")==0) return SmbS0pEnum; else if (strcmp(name,"SmbS0t")==0) return SmbS0tEnum; - else if (strcmp(name,"SmbS0gcm")==0) return SmbS0gcmEnum; else if (strcmp(name,"SmbSizeini")==0) return SmbSizeiniEnum; + else if (strcmp(name,"SmbSmbCorr")==0) return SmbSmbCorrEnum; else if (strcmp(name,"SmbSmbref")==0) return SmbSmbrefEnum; - else if (strcmp(name,"SmbSmbCorr")==0) return SmbSmbCorrEnum; + else if (strcmp(name,"SmbT")==0) return SmbTEnum; else if (strcmp(name,"SmbTa")==0) return SmbTaEnum; + else if (strcmp(name,"SmbTeValue")==0) return SmbTeValueEnum; else if (strcmp(name,"SmbTemperaturesAnomaly")==0) return SmbTemperaturesAnomalyEnum; else if (strcmp(name,"SmbTemperaturesLgm")==0) return SmbTemperaturesLgmEnum; else if (strcmp(name,"SmbTemperaturesPresentday")==0) return SmbTemperaturesPresentdayEnum; else if (strcmp(name,"SmbTemperaturesReconstructed")==0) return SmbTemperaturesReconstructedEnum; - else if (strcmp(name,"SmbT")==0) return SmbTEnum; - else if (strcmp(name,"SmbTeValue")==0) return SmbTeValueEnum; else if (strcmp(name,"SmbTini")==0) return SmbTiniEnum; else if (strcmp(name,"SmbTmean")==0) return SmbTmeanEnum; - else if (strcmp(name,"SmbVmean")==0) return SmbVmeanEnum; else if (strcmp(name,"SmbTz")==0) return SmbTzEnum; else if (strcmp(name,"SmbV")==0) return SmbVEnum; + else if (strcmp(name,"SmbVmean")==0) return SmbVmeanEnum; else if (strcmp(name,"SmbVz")==0) return SmbVzEnum; else if (strcmp(name,"SmbW")==0) return SmbWEnum; @@ -742,11 +749,4 @@ else if (strcmp(name,"SmbZTop")==0) return SmbZTopEnum; else if (strcmp(name,"SmbZY")==0) return SmbZYEnum; - else if (strcmp(name,"SmbDzAdd")==0) return SmbDzAddEnum; - else if (strcmp(name,"SmbFAC")==0) return SmbFACEnum; - else if (strcmp(name,"SmbMeanULW")==0) return SmbMeanULWEnum; - else if (strcmp(name,"SmbNetLW")==0) return SmbNetLWEnum; - else if (strcmp(name,"SmbNetSW")==0) return SmbNetSWEnum; - else if (strcmp(name,"SmbMeanLHF")==0) return SmbMeanLHFEnum; - else if (strcmp(name,"SmbMeanSHF")==0) return SmbMeanSHFEnum; else if (strcmp(name,"StrainRateeffective")==0) return StrainRateeffectiveEnum; else if (strcmp(name,"StrainRateparallel")==0) return StrainRateparallelEnum; @@ -781,6 +781,6 @@ else if (strcmp(name,"SurfaceSlopeY")==0) return SurfaceSlopeYEnum; else if (strcmp(name,"Temperature")==0) return TemperatureEnum; + else if (strcmp(name,"TemperaturePDD")==0) return TemperaturePDDEnum; else if (strcmp(name,"TemperaturePicard")==0) return TemperaturePicardEnum; - else if (strcmp(name,"TemperaturePDD")==0) return TemperaturePDDEnum; else if (strcmp(name,"TemperatureSEMIC")==0) return TemperatureSEMICEnum; else if (strcmp(name,"ThermalSpctemperature")==0) return ThermalSpctemperatureEnum; @@ -805,6 +805,6 @@ else if (strcmp(name,"VzMesh")==0) return VzMeshEnum; else if (strcmp(name,"VzSSA")==0) return VzSSAEnum; + else if (strcmp(name,"WaterColumnOld")==0) return WaterColumnOldEnum; else if (strcmp(name,"Watercolumn")==0) return WatercolumnEnum; - else if (strcmp(name,"WaterColumnOld")==0) return WaterColumnOldEnum; else if (strcmp(name,"WaterfractionDrainage")==0) return WaterfractionDrainageEnum; else if (strcmp(name,"WaterfractionDrainageIntegrated")==0) return WaterfractionDrainageIntegratedEnum; @@ -949,9 +949,9 @@ else if (strcmp(name,"CalvingLevermann")==0) return CalvingLevermannEnum; else if (strcmp(name,"CalvingVonmises")==0) return CalvingVonmisesEnum; + else if (strcmp(name,"Cfdragcoeffabsgrad")==0) return CfdragcoeffabsgradEnum; else if (strcmp(name,"Cfsurfacelogvel")==0) return CfsurfacelogvelEnum; else if (strcmp(name,"Cfsurfacesquare")==0) return CfsurfacesquareEnum; - else if (strcmp(name,"Cfdragcoeffabsgrad")==0) return CfdragcoeffabsgradEnum; + else if (strcmp(name,"Channel")==0) return ChannelEnum; else if (strcmp(name,"Closed")==0) return ClosedEnum; - else if (strcmp(name,"Channel")==0) return ChannelEnum; else if (strcmp(name,"Colinear")==0) return ColinearEnum; else if (strcmp(name,"Constraints")==0) return ConstraintsEnum; @@ -960,8 +960,8 @@ else if (strcmp(name,"Contours")==0) return ContoursEnum; else if (strcmp(name,"ControlInput")==0) return ControlInputEnum; + else if (strcmp(name,"ControlInputGrad")==0) return ControlInputGradEnum; + else if (strcmp(name,"ControlInputMaxs")==0) return ControlInputMaxsEnum; + else if (strcmp(name,"ControlInputMins")==0) return ControlInputMinsEnum; else if (strcmp(name,"ControlInputValues")==0) return ControlInputValuesEnum; - else if (strcmp(name,"ControlInputMins")==0) return ControlInputMinsEnum; - else if (strcmp(name,"ControlInputMaxs")==0) return ControlInputMaxsEnum; - else if (strcmp(name,"ControlInputGrad")==0) return ControlInputGradEnum; else if (strcmp(name,"CrouzeixRaviart")==0) return CrouzeixRaviartEnum; else if (strcmp(name,"Cuffey")==0) return CuffeyEnum; @@ -970,6 +970,6 @@ else if (strcmp(name,"DamageEvolutionSolution")==0) return DamageEvolutionSolutionEnum; else if (strcmp(name,"DataSet")==0) return DataSetEnum; + else if (strcmp(name,"DataSetParam")==0) return DataSetParamEnum; else if (strcmp(name,"DatasetInput")==0) return DatasetInputEnum; - else if (strcmp(name,"DataSetParam")==0) return DataSetParamEnum; else if (strcmp(name,"DefaultAnalysis")==0) return DefaultAnalysisEnum; else if (strcmp(name,"DefaultCalving")==0) return DefaultCalvingEnum; @@ -1002,4 +1002,8 @@ if(stage==9){ if (strcmp(name,"ExtrudeFromTopAnalysis")==0) return ExtrudeFromTopAnalysisEnum; + else if (strcmp(name,"FSApproximation")==0) return FSApproximationEnum; + else if (strcmp(name,"FSSolver")==0) return FSSolverEnum; + else if (strcmp(name,"FSpressure")==0) return FSpressureEnum; + else if (strcmp(name,"FSvelocity")==0) return FSvelocityEnum; else if (strcmp(name,"FemModel")==0) return FemModelEnum; else if (strcmp(name,"FileParam")==0) return FileParamEnum; @@ -1013,10 +1017,7 @@ else if (strcmp(name,"FrontalForcingsDefault")==0) return FrontalForcingsDefaultEnum; else if (strcmp(name,"FrontalForcingsRignot")==0) return FrontalForcingsRignotEnum; - else if (strcmp(name,"FSApproximation")==0) return FSApproximationEnum; else if (strcmp(name,"Fset")==0) return FsetEnum; - else if (strcmp(name,"FSpressure")==0) return FSpressureEnum; - else if (strcmp(name,"FSSolver")==0) return FSSolverEnum; - else if (strcmp(name,"FSvelocity")==0) return FSvelocityEnum; else if (strcmp(name,"FullMeltOnPartiallyFloating")==0) return FullMeltOnPartiallyFloatingEnum; + else if (strcmp(name,"GLheightadvectionAnalysis")==0) return GLheightadvectionAnalysisEnum; else if (strcmp(name,"GaussPenta")==0) return GaussPentaEnum; else if (strcmp(name,"GaussSeg")==0) return GaussSegEnum; @@ -1025,5 +1026,4 @@ else if (strcmp(name,"GenericOption")==0) return GenericOptionEnum; else if (strcmp(name,"GenericParam")==0) return GenericParamEnum; - else if (strcmp(name,"GLheightadvectionAnalysis")==0) return GLheightadvectionAnalysisEnum; else if (strcmp(name,"GiaIvinsAnalysis")==0) return GiaIvinsAnalysisEnum; else if (strcmp(name,"GiaSolution")==0) return GiaSolutionEnum; @@ -1034,4 +1034,5 @@ else if (strcmp(name,"GroundedAreaScaled")==0) return GroundedAreaScaledEnum; else if (strcmp(name,"GroundingOnly")==0) return GroundingOnlyEnum; + else if (strcmp(name,"GroundinglineMassFlux")==0) return GroundinglineMassFluxEnum; else if (strcmp(name,"Gset")==0) return GsetEnum; else if (strcmp(name,"Gsl")==0) return GslEnum; @@ -1040,15 +1041,15 @@ else if (strcmp(name,"Hook")==0) return HookEnum; else if (strcmp(name,"HydrologyDCEfficientAnalysis")==0) return HydrologyDCEfficientAnalysisEnum; + else if (strcmp(name,"HydrologyDCInefficientAnalysis")==0) return HydrologyDCInefficientAnalysisEnum; + else if (strcmp(name,"HydrologyGlaDSAnalysis")==0) return HydrologyGlaDSAnalysisEnum; + else if (strcmp(name,"HydrologyGlaDS")==0) return HydrologyGlaDSEnum; + else if (strcmp(name,"HydrologyPismAnalysis")==0) return HydrologyPismAnalysisEnum; + else if (strcmp(name,"HydrologyShaktiAnalysis")==0) return HydrologyShaktiAnalysisEnum; + else if (strcmp(name,"HydrologyShreveAnalysis")==0) return HydrologyShreveAnalysisEnum; + else if (strcmp(name,"HydrologySolution")==0) return HydrologySolutionEnum; else if (strcmp(name,"Hydrologydc")==0) return HydrologydcEnum; - else if (strcmp(name,"HydrologyDCInefficientAnalysis")==0) return HydrologyDCInefficientAnalysisEnum; - else if (strcmp(name,"HydrologyShreveAnalysis")==0) return HydrologyShreveAnalysisEnum; + else if (strcmp(name,"Hydrologypism")==0) return HydrologypismEnum; + else if (strcmp(name,"Hydrologyshakti")==0) return HydrologyshaktiEnum; else if (strcmp(name,"Hydrologyshreve")==0) return HydrologyshreveEnum; - else if (strcmp(name,"HydrologySolution")==0) return HydrologySolutionEnum; - else if (strcmp(name,"HydrologyGlaDSAnalysis")==0) return HydrologyGlaDSAnalysisEnum; - else if (strcmp(name,"HydrologyShaktiAnalysis")==0) return HydrologyShaktiAnalysisEnum; - else if (strcmp(name,"HydrologyPismAnalysis")==0) return HydrologyPismAnalysisEnum; - else if (strcmp(name,"HydrologyGlaDS")==0) return HydrologyGlaDSEnum; - else if (strcmp(name,"Hydrologyshakti")==0) return HydrologyshaktiEnum; - else if (strcmp(name,"Hydrologypism")==0) return HydrologypismEnum; else if (strcmp(name,"IceMass")==0) return IceMassEnum; else if (strcmp(name,"IceMassScaled")==0) return IceMassScaledEnum; @@ -1057,8 +1058,8 @@ else if (strcmp(name,"IceVolume")==0) return IceVolumeEnum; else if (strcmp(name,"IceVolumeScaled")==0) return IceVolumeScaledEnum; + else if (strcmp(name,"IcefrontMassFlux")==0) return IcefrontMassFluxEnum; + else if (strcmp(name,"IcefrontMassFluxLevelset")==0) return IcefrontMassFluxLevelsetEnum; else if (strcmp(name,"Incremental")==0) return IncrementalEnum; else if (strcmp(name,"Indexed")==0) return IndexedEnum; - else if (strcmp(name,"Internal")==0) return InternalEnum; - else if (strcmp(name,"Intersect")==0) return IntersectEnum; else if (strcmp(name,"IntExternalResult")==0) return IntExternalResultEnum; else if (strcmp(name,"IntInput")==0) return IntInputEnum; @@ -1067,4 +1068,6 @@ else if (strcmp(name,"IntParam")==0) return IntParamEnum; else if (strcmp(name,"IntVecParam")==0) return IntVecParamEnum; + else if (strcmp(name,"Internal")==0) return InternalEnum; + else if (strcmp(name,"Intersect")==0) return IntersectEnum; else if (strcmp(name,"InversionVzObs")==0) return InversionVzObsEnum; else if (strcmp(name,"J")==0) return JEnum; @@ -1073,10 +1076,9 @@ else if (strcmp(name,"L2ProjectionEPLAnalysis")==0) return L2ProjectionEPLAnalysisEnum; else if (strcmp(name,"LACrouzeixRaviart")==0) return LACrouzeixRaviartEnum; + else if (strcmp(name,"LATaylorHood")==0) return LATaylorHoodEnum; else if (strcmp(name,"LambdaS")==0) return LambdaSEnum; - else if (strcmp(name,"LATaylorHood")==0) return LATaylorHoodEnum; else if (strcmp(name,"LevelsetAnalysis")==0) return LevelsetAnalysisEnum; else if (strcmp(name,"LevelsetfunctionPicard")==0) return LevelsetfunctionPicardEnum; else if (strcmp(name,"LinearFloatingMeltRate")==0) return LinearFloatingMeltRateEnum; - else if (strcmp(name,"SpatialLinearFloatingMeltRate")==0) return SpatialLinearFloatingMeltRateEnum; else if (strcmp(name,"LliboutryDuval")==0) return LliboutryDuvalEnum; else if (strcmp(name,"Loads")==0) return LoadsEnum; @@ -1091,18 +1093,17 @@ else if (strcmp(name,"LoveLr")==0) return LoveLrEnum; else if (strcmp(name,"LoveSolution")==0) return LoveSolutionEnum; + else if (strcmp(name,"MINI")==0) return MINIEnum; + else if (strcmp(name,"MINIcondensed")==0) return MINIcondensedEnum; else if (strcmp(name,"MantlePlumeGeothermalFlux")==0) return MantlePlumeGeothermalFluxEnum; + else if (strcmp(name,"MassFlux")==0) return MassFluxEnum; + else if (strcmp(name,"Masscon")==0) return MassconEnum; else if (strcmp(name,"Massconaxpby")==0) return MassconaxpbyEnum; - else if (strcmp(name,"Masscon")==0) return MassconEnum; else if (strcmp(name,"Massfluxatgate")==0) return MassfluxatgateEnum; - else if (strcmp(name,"MassFlux")==0) return MassFluxEnum; - else if (strcmp(name,"GroundinglineMassFlux")==0) return GroundinglineMassFluxEnum; - else if (strcmp(name,"IcefrontMassFlux")==0) return IcefrontMassFluxEnum; - else if (strcmp(name,"IcefrontMassFluxLevelset")==0) return IcefrontMassFluxLevelsetEnum; else if (strcmp(name,"MasstransportAnalysis")==0) return MasstransportAnalysisEnum; else if (strcmp(name,"MasstransportSolution")==0) return MasstransportSolutionEnum; else if (strcmp(name,"Matdamageice")==0) return MatdamageiceEnum; else if (strcmp(name,"Matenhancedice")==0) return MatenhancediceEnum; + else if (strcmp(name,"Materials")==0) return MaterialsEnum; else if (strcmp(name,"Matestar")==0) return MatestarEnum; - else if (strcmp(name,"Materials")==0) return MaterialsEnum; else if (strcmp(name,"Matice")==0) return MaticeEnum; else if (strcmp(name,"Matlitho")==0) return MatlithoEnum; @@ -1120,10 +1121,8 @@ else if (strcmp(name,"MeshElements")==0) return MeshElementsEnum; else if (strcmp(name,"MeshX")==0) return MeshXEnum; - else if (strcmp(name,"MeshY")==0) return MeshYEnum; else stage=10; } if(stage==10){ - if (strcmp(name,"MINIcondensed")==0) return MINIcondensedEnum; - else if (strcmp(name,"MINI")==0) return MINIEnum; + if (strcmp(name,"MeshY")==0) return MeshYEnum; else if (strcmp(name,"MinVel")==0) return MinVelEnum; else if (strcmp(name,"MinVx")==0) return MinVxEnum; @@ -1136,9 +1135,9 @@ else if (strcmp(name,"MpiSparse")==0) return MpiSparseEnum; else if (strcmp(name,"Mumps")==0) return MumpsEnum; + else if (strcmp(name,"NoFrictionOnPartiallyFloating")==0) return NoFrictionOnPartiallyFloatingEnum; + else if (strcmp(name,"NoMeltOnPartiallyFloating")==0) return NoMeltOnPartiallyFloatingEnum; else if (strcmp(name,"Nodal")==0) return NodalEnum; else if (strcmp(name,"Nodalvalue")==0) return NodalvalueEnum; else if (strcmp(name,"NodeSId")==0) return NodeSIdEnum; - else if (strcmp(name,"NoFrictionOnPartiallyFloating")==0) return NoFrictionOnPartiallyFloatingEnum; - else if (strcmp(name,"NoMeltOnPartiallyFloating")==0) return NoMeltOnPartiallyFloatingEnum; else if (strcmp(name,"NoneApproximation")==0) return NoneApproximationEnum; else if (strcmp(name,"None")==0) return NoneEnum; @@ -1150,15 +1149,15 @@ else if (strcmp(name,"Option")==0) return OptionEnum; else if (strcmp(name,"P0Array")==0) return P0ArrayEnum; - else if (strcmp(name,"P1bubblecondensed")==0) return P1bubblecondensedEnum; - else if (strcmp(name,"P1bubble")==0) return P1bubbleEnum; else if (strcmp(name,"P1DG")==0) return P1DGEnum; else if (strcmp(name,"P1P1")==0) return P1P1Enum; else if (strcmp(name,"P1P1GLS")==0) return P1P1GLSEnum; + else if (strcmp(name,"P1bubble")==0) return P1bubbleEnum; + else if (strcmp(name,"P1bubblecondensed")==0) return P1bubblecondensedEnum; else if (strcmp(name,"P1xP2")==0) return P1xP2Enum; else if (strcmp(name,"P1xP3")==0) return P1xP3Enum; else if (strcmp(name,"P1xP4")==0) return P1xP4Enum; + else if (strcmp(name,"P2")==0) return P2Enum; + else if (strcmp(name,"P2bubble")==0) return P2bubbleEnum; else if (strcmp(name,"P2bubblecondensed")==0) return P2bubblecondensedEnum; - else if (strcmp(name,"P2bubble")==0) return P2bubbleEnum; - else if (strcmp(name,"P2")==0) return P2Enum; else if (strcmp(name,"P2xP1")==0) return P2xP1Enum; else if (strcmp(name,"P2xP4")==0) return P2xP4Enum; @@ -1175,4 +1174,21 @@ else if (strcmp(name,"Regular")==0) return RegularEnum; else if (strcmp(name,"Riftfront")==0) return RiftfrontEnum; + else if (strcmp(name,"SIAApproximation")==0) return SIAApproximationEnum; + else if (strcmp(name,"SMBcomponents")==0) return SMBcomponentsEnum; + else if (strcmp(name,"SMBd18opdd")==0) return SMBd18opddEnum; + else if (strcmp(name,"SMBforcing")==0) return SMBforcingEnum; + else if (strcmp(name,"SMBgcm")==0) return SMBgcmEnum; + else if (strcmp(name,"SMBgemb")==0) return SMBgembEnum; + else if (strcmp(name,"SMBgradients")==0) return SMBgradientsEnum; + else if (strcmp(name,"SMBgradientscomponents")==0) return SMBgradientscomponentsEnum; + else if (strcmp(name,"SMBgradientsela")==0) return SMBgradientselaEnum; + else if (strcmp(name,"SMBhenning")==0) return SMBhenningEnum; + else if (strcmp(name,"SMBmeltcomponents")==0) return SMBmeltcomponentsEnum; + else if (strcmp(name,"SMBpdd")==0) return SMBpddEnum; + else if (strcmp(name,"SMBpddSicopolis")==0) return SMBpddSicopolisEnum; + else if (strcmp(name,"SMBsemic")==0) return SMBsemicEnum; + else if (strcmp(name,"SSAApproximation")==0) return SSAApproximationEnum; + else if (strcmp(name,"SSAFSApproximation")==0) return SSAFSApproximationEnum; + else if (strcmp(name,"SSAHOApproximation")==0) return SSAHOApproximationEnum; else if (strcmp(name,"Scaled")==0) return ScaledEnum; else if (strcmp(name,"SealevelAbsolute")==0) return SealevelAbsoluteEnum; @@ -1182,7 +1198,7 @@ else if (strcmp(name,"SealevelInertiaTensorZZ")==0) return SealevelInertiaTensorZZEnum; else if (strcmp(name,"SealevelNmotion")==0) return SealevelNmotionEnum; + else if (strcmp(name,"SealevelUmotion")==0) return SealevelUmotionEnum; else if (strcmp(name,"SealevelriseAnalysis")==0) return SealevelriseAnalysisEnum; else if (strcmp(name,"SealevelriseSolution")==0) return SealevelriseSolutionEnum; - else if (strcmp(name,"SealevelUmotion")==0) return SealevelUmotionEnum; else if (strcmp(name,"Seg")==0) return SegEnum; else if (strcmp(name,"SegInput")==0) return SegInputEnum; @@ -1191,30 +1207,15 @@ else if (strcmp(name,"Separate")==0) return SeparateEnum; else if (strcmp(name,"Seq")==0) return SeqEnum; - else if (strcmp(name,"SIAApproximation")==0) return SIAApproximationEnum; else if (strcmp(name,"SmbAnalysis")==0) return SmbAnalysisEnum; - else if (strcmp(name,"SMBsemic")==0) return SMBsemicEnum; - else if (strcmp(name,"SMBcomponents")==0) return SMBcomponentsEnum; - else if (strcmp(name,"SMBd18opdd")==0) return SMBd18opddEnum; - else if (strcmp(name,"SMBforcing")==0) return SMBforcingEnum; - else if (strcmp(name,"SMBgcm")==0) return SMBgcmEnum; - else if (strcmp(name,"SMBgemb")==0) return SMBgembEnum; - else if (strcmp(name,"SMBgradientsela")==0) return SMBgradientselaEnum; - else if (strcmp(name,"SMBgradients")==0) return SMBgradientsEnum; - else if (strcmp(name,"SMBhenning")==0) return SMBhenningEnum; - else if (strcmp(name,"SMBmeltcomponents")==0) return SMBmeltcomponentsEnum; - else if (strcmp(name,"SMBpdd")==0) return SMBpddEnum; - else if (strcmp(name,"SMBpddSicopolis")==0) return SMBpddSicopolisEnum; - else if (strcmp(name,"SMBgradientscomponents")==0) return SMBgradientscomponentsEnum; else if (strcmp(name,"SmbSolution")==0) return SmbSolutionEnum; else if (strcmp(name,"SmoothAnalysis")==0) return SmoothAnalysisEnum; else if (strcmp(name,"SoftMigration")==0) return SoftMigrationEnum; + else if (strcmp(name,"SpatialLinearFloatingMeltRate")==0) return SpatialLinearFloatingMeltRateEnum; else if (strcmp(name,"SpcDynamic")==0) return SpcDynamicEnum; else if (strcmp(name,"SpcStatic")==0) return SpcStaticEnum; else if (strcmp(name,"SpcTransient")==0) return SpcTransientEnum; - else if (strcmp(name,"SSAApproximation")==0) return SSAApproximationEnum; - else if (strcmp(name,"SSAFSApproximation")==0) return SSAFSApproximationEnum; - else if (strcmp(name,"SSAHOApproximation")==0) return SSAHOApproximationEnum; else if (strcmp(name,"Sset")==0) return SsetEnum; else if (strcmp(name,"SteadystateSolution")==0) return SteadystateSolutionEnum; + else if (strcmp(name,"StressIntensityFactor")==0) return StressIntensityFactorEnum; else if (strcmp(name,"StressbalanceAnalysis")==0) return StressbalanceAnalysisEnum; else if (strcmp(name,"StressbalanceConvergenceNumSteps")==0) return StressbalanceConvergenceNumStepsEnum; @@ -1222,5 +1223,4 @@ else if (strcmp(name,"StressbalanceSolution")==0) return StressbalanceSolutionEnum; else if (strcmp(name,"StressbalanceVerticalAnalysis")==0) return StressbalanceVerticalAnalysisEnum; - else if (strcmp(name,"StressIntensityFactor")==0) return StressIntensityFactorEnum; else if (strcmp(name,"StringArrayParam")==0) return StringArrayParamEnum; else if (strcmp(name,"StringExternalResult")==0) return StringExternalResultEnum; @@ -1228,7 +1228,7 @@ else if (strcmp(name,"SubelementFriction1")==0) return SubelementFriction1Enum; else if (strcmp(name,"SubelementFriction2")==0) return SubelementFriction2Enum; - else if (strcmp(name,"SubelementMigration")==0) return SubelementMigrationEnum; else if (strcmp(name,"SubelementMelt1")==0) return SubelementMelt1Enum; else if (strcmp(name,"SubelementMelt2")==0) return SubelementMelt2Enum; + else if (strcmp(name,"SubelementMigration")==0) return SubelementMigrationEnum; else if (strcmp(name,"SurfaceSlopeSolution")==0) return SurfaceSlopeSolutionEnum; else if (strcmp(name,"TaylorHood")==0) return TaylorHoodEnum; @@ -1256,7 +1256,7 @@ else if (strcmp(name,"VectorParam")==0) return VectorParamEnum; else if (strcmp(name,"Vertex")==0) return VertexEnum; + else if (strcmp(name,"VertexLId")==0) return VertexLIdEnum; else if (strcmp(name,"VertexPId")==0) return VertexPIdEnum; else if (strcmp(name,"VertexSId")==0) return VertexSIdEnum; - else if (strcmp(name,"VertexLId")==0) return VertexLIdEnum; else if (strcmp(name,"Vertices")==0) return VerticesEnum; else if (strcmp(name,"ViscousHeating")==0) return ViscousHeatingEnum; @@ -1277,6 +1277,6 @@ else if (strcmp(name,"SealevelWeights")==0) return SealevelWeightsEnum; else if (strcmp(name,"StrainRate")==0) return StrainRateEnum; + else if (strcmp(name,"StressTensor")==0) return StressTensorEnum; else if (strcmp(name,"StressbalanceViscosityOvershoot")==0) return StressbalanceViscosityOvershootEnum; - else if (strcmp(name,"StressTensor")==0) return StressTensorEnum; else if (strcmp(name,"SubelementMigration4")==0) return SubelementMigration4Enum; else if (strcmp(name,"TimesteppingTimeAdapt")==0) return TimesteppingTimeAdaptEnum;