Index: /issm/trunk-jpl/src/c/shared/Enum/EnumDefinitions.h =================================================================== --- /issm/trunk-jpl/src/c/shared/Enum/EnumDefinitions.h (revision 23946) +++ /issm/trunk-jpl/src/c/shared/Enum/EnumDefinitions.h (revision 23947) @@ -150,4 +150,6 @@ GroundinglineFrictionInterpolationEnum, GroundinglineMeltInterpolationEnum, + HydrologyBumpSpacingEnum, + HydrologyCavitySpacingEnum, HydrologydcEplflipLockEnum, HydrologydcEplThickCompEnum, @@ -173,6 +175,11 @@ HydrologydcUnconfinedFlagEnum, HydrologydtEnum, + HydrologyIschannelsEnum, + HydrologyChannelConductivityEnum, + HydrologyChannelSheetWidthEnum, + HydrologyEnglacialVoidRatioEnum, HydrologyModelEnum, HydrologyNumRequestedOutputsEnum, + HydrologyPressureMeltCoefficientEnum, HydrologyRelaxationEnum, HydrologyRequestedOutputsEnum, @@ -539,7 +546,6 @@ HydraulicPotentialOldEnum, HydrologyBasalFluxEnum, + HydrologyBumpHeightEnum, HydrologySheetThicknessEnum, - HydrologyBumpHeightEnum, - HydrologyBumpSpacingEnum, HydrologydcBasalMoulinInputEnum, HydrologydcEplThicknessHydrostepEnum, @@ -550,11 +556,4 @@ HydrologydcMaskThawedNodeEnum, HydrologydcSedimentTransmitivityEnum, - HydrologySheetConductivityEnum, - HydrologyPressureMeltCoefficientEnum, - HydrologyCavitySpacingEnum, - HydrologyIschannelsEnum, - HydrologyChannelConductivityEnum, - HydrologyChannelSheetWidthEnum, - HydrologyEnglacialVoidRatioEnum, HydrologyEnglacialInputEnum, HydrologydcEplThicknessStackedEnum, @@ -566,4 +565,5 @@ HydrologyNeumannfluxEnum, HydrologyReynoldsEnum, + HydrologySheetConductivityEnum, HydrologyWaterVxEnum, HydrologyWaterVyEnum, Index: /issm/trunk-jpl/src/c/shared/Enum/EnumToStringx.cpp =================================================================== --- /issm/trunk-jpl/src/c/shared/Enum/EnumToStringx.cpp (revision 23946) +++ /issm/trunk-jpl/src/c/shared/Enum/EnumToStringx.cpp (revision 23947) @@ -158,4 +158,6 @@ case GroundinglineFrictionInterpolationEnum : return "GroundinglineFrictionInterpolation"; case GroundinglineMeltInterpolationEnum : return "GroundinglineMeltInterpolation"; + case HydrologyBumpSpacingEnum : return "HydrologyBumpSpacing"; + case HydrologyCavitySpacingEnum : return "HydrologyCavitySpacing"; case HydrologydcEplflipLockEnum : return "HydrologydcEplflipLock"; case HydrologydcEplThickCompEnum : return "HydrologydcEplThickComp"; @@ -181,6 +183,11 @@ case HydrologydcUnconfinedFlagEnum : return "HydrologydcUnconfinedFlag"; 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"; @@ -545,7 +552,6 @@ case HydraulicPotentialOldEnum : return "HydraulicPotentialOld"; case HydrologyBasalFluxEnum : return "HydrologyBasalFlux"; + case HydrologyBumpHeightEnum : return "HydrologyBumpHeight"; case HydrologySheetThicknessEnum : return "HydrologySheetThickness"; - case HydrologyBumpHeightEnum : return "HydrologyBumpHeight"; - case HydrologyBumpSpacingEnum : return "HydrologyBumpSpacing"; case HydrologydcBasalMoulinInputEnum : return "HydrologydcBasalMoulinInput"; case HydrologydcEplThicknessHydrostepEnum : return "HydrologydcEplThicknessHydrostep"; @@ -556,11 +562,4 @@ case HydrologydcMaskThawedNodeEnum : return "HydrologydcMaskThawedNode"; case HydrologydcSedimentTransmitivityEnum : return "HydrologydcSedimentTransmitivity"; - case HydrologySheetConductivityEnum : return "HydrologySheetConductivity"; - case HydrologyPressureMeltCoefficientEnum : return "HydrologyPressureMeltCoefficient"; - case HydrologyCavitySpacingEnum : return "HydrologyCavitySpacing"; - case HydrologyIschannelsEnum : return "HydrologyIschannels"; - case HydrologyChannelConductivityEnum : return "HydrologyChannelConductivity"; - case HydrologyChannelSheetWidthEnum : return "HydrologyChannelSheetWidth"; - case HydrologyEnglacialVoidRatioEnum : return "HydrologyEnglacialVoidRatio"; case HydrologyEnglacialInputEnum : return "HydrologyEnglacialInput"; case HydrologydcEplThicknessStackedEnum : return "HydrologydcEplThicknessStacked"; @@ -572,4 +571,5 @@ case HydrologyNeumannfluxEnum : return "HydrologyNeumannflux"; case HydrologyReynoldsEnum : return "HydrologyReynolds"; + case HydrologySheetConductivityEnum : return "HydrologySheetConductivity"; case HydrologyWaterVxEnum : return "HydrologyWaterVx"; case HydrologyWaterVyEnum : return "HydrologyWaterVy"; Index: /issm/trunk-jpl/src/c/shared/Enum/StringToEnumx.cpp =================================================================== --- /issm/trunk-jpl/src/c/shared/Enum/StringToEnumx.cpp (revision 23946) +++ /issm/trunk-jpl/src/c/shared/Enum/StringToEnumx.cpp (revision 23947) @@ -161,4 +161,6 @@ 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,"HydrologyCavitySpacing")==0) return HydrologyCavitySpacingEnum; else if (strcmp(name,"HydrologydcEplflipLock")==0) return HydrologydcEplflipLockEnum; else if (strcmp(name,"HydrologydcEplThickComp")==0) return HydrologydcEplThickCompEnum; @@ -184,6 +186,11 @@ else if (strcmp(name,"HydrologydcUnconfinedFlag")==0) return HydrologydcUnconfinedFlagEnum; 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; @@ -253,5 +260,8 @@ 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 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; @@ -260,8 +270,5 @@ else if (strcmp(name,"MaterialsTemperateiceconductivity")==0) return MaterialsTemperateiceconductivityEnum; else if (strcmp(name,"MaterialsEffectiveconductivityAveraging")==0) return MaterialsEffectiveconductivityAveragingEnum; - else stage=3; - } - if(stage==3){ - if (strcmp(name,"MaterialsThermalconductivity")==0) return MaterialsThermalconductivityEnum; + else if (strcmp(name,"MaterialsThermalconductivity")==0) return MaterialsThermalconductivityEnum; else if (strcmp(name,"MaterialsThermalExchangeVelocity")==0) return MaterialsThermalExchangeVelocityEnum; else if (strcmp(name,"MeltingOffset")==0) return MeltingOffsetEnum; @@ -376,5 +383,8 @@ else if (strcmp(name,"SmbT0dry")==0) return SmbT0dryEnum; else if (strcmp(name,"SmbT0wet")==0) return SmbT0wetEnum; - else if (strcmp(name,"SmbTdiff")==0) return SmbTdiffEnum; + else stage=4; + } + if(stage==4){ + if (strcmp(name,"SmbTdiff")==0) return SmbTdiffEnum; else if (strcmp(name,"SmbThermoDeltaTScaling")==0) return SmbThermoDeltaTScalingEnum; else if (strcmp(name,"SmoothThicknessMultiplier")==0) return SmoothThicknessMultiplierEnum; @@ -383,8 +393,5 @@ 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,"SteadystateRequestedOutputs")==0) return SteadystateRequestedOutputsEnum; + else if (strcmp(name,"SteadystateRequestedOutputs")==0) return SteadystateRequestedOutputsEnum; else if (strcmp(name,"Step")==0) return StepEnum; else if (strcmp(name,"StressbalanceAbstol")==0) return StressbalanceAbstolEnum; @@ -499,5 +506,8 @@ 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; else if (strcmp(name,"DragCoefficientAbsGradient")==0) return DragCoefficientAbsGradientEnum; @@ -506,8 +516,5 @@ else if (strcmp(name,"EffectivePressureHydrostep")==0) return EffectivePressureHydrostepEnum; else if (strcmp(name,"EffectivePressureStacked")==0) return EffectivePressureStackedEnum; - else stage=5; - } - if(stage==5){ - if (strcmp(name,"EffectivePressure")==0) return EffectivePressureEnum; + else if (strcmp(name,"EffectivePressure")==0) return EffectivePressureEnum; else if (strcmp(name,"Enthalpy")==0) return EnthalpyEnum; else if (strcmp(name,"EnthalpyPicard")==0) return EnthalpyPicardEnum; @@ -557,7 +564,6 @@ else if (strcmp(name,"HydraulicPotentialOld")==0) return HydraulicPotentialOldEnum; 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,"HydrologyBumpHeight")==0) return HydrologyBumpHeightEnum; - else if (strcmp(name,"HydrologyBumpSpacing")==0) return HydrologyBumpSpacingEnum; else if (strcmp(name,"HydrologydcBasalMoulinInput")==0) return HydrologydcBasalMoulinInputEnum; else if (strcmp(name,"HydrologydcEplThicknessHydrostep")==0) return HydrologydcEplThicknessHydrostepEnum; @@ -568,11 +574,4 @@ else if (strcmp(name,"HydrologydcMaskThawedNode")==0) return HydrologydcMaskThawedNodeEnum; else if (strcmp(name,"HydrologydcSedimentTransmitivity")==0) return HydrologydcSedimentTransmitivityEnum; - else if (strcmp(name,"HydrologySheetConductivity")==0) return HydrologySheetConductivityEnum; - else if (strcmp(name,"HydrologyPressureMeltCoefficient")==0) return HydrologyPressureMeltCoefficientEnum; - else if (strcmp(name,"HydrologyCavitySpacing")==0) return HydrologyCavitySpacingEnum; - 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,"HydrologyEnglacialInput")==0) return HydrologyEnglacialInputEnum; else if (strcmp(name,"HydrologydcEplThicknessStacked")==0) return HydrologydcEplThicknessStackedEnum; @@ -584,4 +583,5 @@ else if (strcmp(name,"HydrologyNeumannflux")==0) return HydrologyNeumannfluxEnum; else if (strcmp(name,"HydrologyReynolds")==0) return HydrologyReynoldsEnum; + else if (strcmp(name,"HydrologySheetConductivity")==0) return HydrologySheetConductivityEnum; else if (strcmp(name,"HydrologyWaterVx")==0) return HydrologyWaterVxEnum; else if (strcmp(name,"HydrologyWaterVy")==0) return HydrologyWaterVyEnum;