Index: /issm/trunk-jpl/src/c/shared/Enum/EnumDefinitions.h =================================================================== --- /issm/trunk-jpl/src/c/shared/Enum/EnumDefinitions.h (revision 23856) +++ /issm/trunk-jpl/src/c/shared/Enum/EnumDefinitions.h (revision 23857) @@ -529,4 +529,5 @@ GradientEnum, GroundinglineHeightEnum, + HydrologyBasalFluxEnum, HydrologyBumpHeightEnum, HydrologyBumpSpacingEnum, @@ -606,4 +607,6 @@ SealevelNGiaRateEnum, SealevelUGiaRateEnum, + SedimentHeadStackedEnum, + SedimentHeadEnum, SedimentHeadHydrostepEnum, SedimentHeadOldEnum, @@ -718,4 +721,5 @@ SurfaceAreaEnum, SurfaceAverageVelMisfitEnum, + SurfaceCrevasseEnum, SurfaceEnum, SurfaceLogVelMisfitEnum, @@ -887,5 +891,4 @@ HOFSApproximationEnum, HookEnum, - HydrologyBasalFluxEnum, HydrologyDCEfficientAnalysisEnum, HydrologydcEnum, @@ -1131,6 +1134,4 @@ SealevelriseStericRateEnum, SealevelUmotionEnum, - SedimentHeadStackedEnum, - SedimentHeadEnum, SegEnum, SegInputEnum, @@ -1179,5 +1180,4 @@ SubelementMelt1Enum, SubelementMelt2Enum, - SurfaceCrevasseEnum, SurfaceSlopeSolutionEnum, TaylorHoodEnum, Index: /issm/trunk-jpl/src/c/shared/Enum/EnumToStringx.cpp =================================================================== --- /issm/trunk-jpl/src/c/shared/Enum/EnumToStringx.cpp (revision 23856) +++ /issm/trunk-jpl/src/c/shared/Enum/EnumToStringx.cpp (revision 23857) @@ -535,4 +535,5 @@ case GradientEnum : return "Gradient"; case GroundinglineHeightEnum : return "GroundinglineHeight"; + case HydrologyBasalFluxEnum : return "HydrologyBasalFlux"; case HydrologyBumpHeightEnum : return "HydrologyBumpHeight"; case HydrologyBumpSpacingEnum : return "HydrologyBumpSpacing"; @@ -612,4 +613,6 @@ case SealevelNGiaRateEnum : return "SealevelNGiaRate"; case SealevelUGiaRateEnum : return "SealevelUGiaRate"; + case SedimentHeadStackedEnum : return "SedimentHeadStacked"; + case SedimentHeadEnum : return "SedimentHead"; case SedimentHeadHydrostepEnum : return "SedimentHeadHydrostep"; case SedimentHeadOldEnum : return "SedimentHeadOld"; @@ -724,4 +727,5 @@ case SurfaceAreaEnum : return "SurfaceArea"; case SurfaceAverageVelMisfitEnum : return "SurfaceAverageVelMisfit"; + case SurfaceCrevasseEnum : return "SurfaceCrevasse"; case SurfaceEnum : return "Surface"; case SurfaceLogVelMisfitEnum : return "SurfaceLogVelMisfit"; @@ -891,5 +895,4 @@ case HOFSApproximationEnum : return "HOFSApproximation"; case HookEnum : return "Hook"; - case HydrologyBasalFluxEnum : return "HydrologyBasalFlux"; case HydrologyDCEfficientAnalysisEnum : return "HydrologyDCEfficientAnalysis"; case HydrologydcEnum : return "Hydrologydc"; @@ -1135,6 +1138,4 @@ case SealevelriseStericRateEnum : return "SealevelriseStericRate"; case SealevelUmotionEnum : return "SealevelUmotion"; - case SedimentHeadStackedEnum : return "SedimentHeadStacked"; - case SedimentHeadEnum : return "SedimentHead"; case SegEnum : return "Seg"; case SegInputEnum : return "SegInput"; @@ -1183,5 +1184,4 @@ case SubelementMelt1Enum : return "SubelementMelt1"; case SubelementMelt2Enum : return "SubelementMelt2"; - case SurfaceCrevasseEnum : return "SurfaceCrevasse"; case SurfaceSlopeSolutionEnum : return "SurfaceSlopeSolution"; case TaylorHoodEnum : return "TaylorHood"; Index: /issm/trunk-jpl/src/c/shared/Enum/StringToEnumx.cpp =================================================================== --- /issm/trunk-jpl/src/c/shared/Enum/StringToEnumx.cpp (revision 23856) +++ /issm/trunk-jpl/src/c/shared/Enum/StringToEnumx.cpp (revision 23857) @@ -547,4 +547,5 @@ else if (strcmp(name,"Gradient")==0) return GradientEnum; else if (strcmp(name,"GroundinglineHeight")==0) return GroundinglineHeightEnum; + else if (strcmp(name,"HydrologyBasalFlux")==0) return HydrologyBasalFluxEnum; else if (strcmp(name,"HydrologyBumpHeight")==0) return HydrologyBumpHeightEnum; else if (strcmp(name,"HydrologyBumpSpacing")==0) return HydrologyBumpSpacingEnum; @@ -624,13 +625,15 @@ else if (strcmp(name,"SealevelNGiaRate")==0) return SealevelNGiaRateEnum; else if (strcmp(name,"SealevelUGiaRate")==0) return SealevelUGiaRateEnum; + 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,"SigmaNN")==0) return SigmaNNEnum; - else if (strcmp(name,"SigmaVM")==0) return SigmaVMEnum; else stage=6; } if(stage==6){ - if (strcmp(name,"SmbAccumulation")==0) return SmbAccumulationEnum; + if (strcmp(name,"SedimentHeadResidual")==0) return SedimentHeadResidualEnum; + else if (strcmp(name,"SigmaNN")==0) return SigmaNNEnum; + else if (strcmp(name,"SigmaVM")==0) return SigmaVMEnum; + else if (strcmp(name,"SmbAccumulation")==0) return SmbAccumulationEnum; else if (strcmp(name,"SmbA")==0) return SmbAEnum; else if (strcmp(name,"SmbAini")==0) return SmbAiniEnum; @@ -739,4 +742,5 @@ else if (strcmp(name,"SurfaceArea")==0) return SurfaceAreaEnum; else if (strcmp(name,"SurfaceAverageVelMisfit")==0) return SurfaceAverageVelMisfitEnum; + else if (strcmp(name,"SurfaceCrevasse")==0) return SurfaceCrevasseEnum; else if (strcmp(name,"Surface")==0) return SurfaceEnum; else if (strcmp(name,"SurfaceLogVelMisfit")==0) return SurfaceLogVelMisfitEnum; @@ -748,12 +752,12 @@ else if (strcmp(name,"Temperature")==0) return TemperatureEnum; else if (strcmp(name,"TemperaturePicard")==0) return TemperaturePicardEnum; - else if (strcmp(name,"TemperaturePDD")==0) return TemperaturePDDEnum; + else stage=7; + } + if(stage==7){ + if (strcmp(name,"TemperaturePDD")==0) return TemperaturePDDEnum; else if (strcmp(name,"TemperatureSEMIC")==0) return TemperatureSEMICEnum; else if (strcmp(name,"ThermalSpctemperature")==0) return ThermalSpctemperatureEnum; else if (strcmp(name,"ThicknessAbsGradient")==0) return ThicknessAbsGradientEnum; - else stage=7; - } - if(stage==7){ - if (strcmp(name,"ThicknessAbsMisfit")==0) return ThicknessAbsMisfitEnum; + else if (strcmp(name,"ThicknessAbsMisfit")==0) return ThicknessAbsMisfitEnum; else if (strcmp(name,"ThicknessAcrossGradient")==0) return ThicknessAcrossGradientEnum; else if (strcmp(name,"ThicknessAlongGradient")==0) return ThicknessAlongGradientEnum; @@ -871,12 +875,12 @@ else if (strcmp(name,"ExtrapolationAnalysis")==0) return ExtrapolationAnalysisEnum; else if (strcmp(name,"ExtrudeFromBaseAnalysis")==0) return ExtrudeFromBaseAnalysisEnum; - else if (strcmp(name,"ExtrudeFromTopAnalysis")==0) return ExtrudeFromTopAnalysisEnum; + else stage=8; + } + if(stage==8){ + if (strcmp(name,"ExtrudeFromTopAnalysis")==0) return ExtrudeFromTopAnalysisEnum; else if (strcmp(name,"FemModel")==0) return FemModelEnum; else if (strcmp(name,"FileParam")==0) return FileParamEnum; else if (strcmp(name,"FixedTimestepping")==0) return FixedTimesteppingEnum; - else stage=8; - } - if(stage==8){ - if (strcmp(name,"FloatingArea")==0) return FloatingAreaEnum; + else if (strcmp(name,"FloatingArea")==0) return FloatingAreaEnum; else if (strcmp(name,"FloatingAreaScaled")==0) return FloatingAreaScaledEnum; else if (strcmp(name,"FloatingMeltRate")==0) return FloatingMeltRateEnum; @@ -912,5 +916,4 @@ else if (strcmp(name,"HOFSApproximation")==0) return HOFSApproximationEnum; else if (strcmp(name,"Hook")==0) return HookEnum; - else if (strcmp(name,"HydrologyBasalFlux")==0) return HydrologyBasalFluxEnum; else if (strcmp(name,"HydrologyDCEfficientAnalysis")==0) return HydrologyDCEfficientAnalysisEnum; else if (strcmp(name,"Hydrologydc")==0) return HydrologydcEnum; @@ -995,11 +998,11 @@ else if (strcmp(name,"MeshY")==0) return MeshYEnum; else if (strcmp(name,"MINIcondensed")==0) return MINIcondensedEnum; - else if (strcmp(name,"MINI")==0) return MINIEnum; - else if (strcmp(name,"MinVel")==0) return MinVelEnum; - else if (strcmp(name,"MinVx")==0) return MinVxEnum; else stage=9; } if(stage==9){ - if (strcmp(name,"MinVy")==0) return MinVyEnum; + if (strcmp(name,"MINI")==0) return MINIEnum; + else if (strcmp(name,"MinVel")==0) return MinVelEnum; + else if (strcmp(name,"MinVx")==0) return MinVxEnum; + else if (strcmp(name,"MinVy")==0) return MinVyEnum; else if (strcmp(name,"MinVz")==0) return MinVzEnum; else if (strcmp(name,"MismipFloatingMeltRate")==0) return MismipFloatingMeltRateEnum; @@ -1118,11 +1121,11 @@ else if (strcmp(name,"Outputdefinition96")==0) return Outputdefinition96Enum; else if (strcmp(name,"Outputdefinition97")==0) return Outputdefinition97Enum; - else if (strcmp(name,"Outputdefinition98")==0) return Outputdefinition98Enum; - else if (strcmp(name,"Outputdefinition99")==0) return Outputdefinition99Enum; - else if (strcmp(name,"Outputdefinition9")==0) return Outputdefinition9Enum; else stage=10; } if(stage==10){ - if (strcmp(name,"Outputdefinition100")==0) return Outputdefinition100Enum; + if (strcmp(name,"Outputdefinition98")==0) return Outputdefinition98Enum; + else if (strcmp(name,"Outputdefinition99")==0) return Outputdefinition99Enum; + else if (strcmp(name,"Outputdefinition9")==0) return Outputdefinition9Enum; + else if (strcmp(name,"Outputdefinition100")==0) return Outputdefinition100Enum; else if (strcmp(name,"P0Array")==0) return P0ArrayEnum; else if (strcmp(name,"P1bubblecondensed")==0) return P1bubblecondensedEnum; @@ -1162,6 +1165,4 @@ else if (strcmp(name,"SealevelriseStericRate")==0) return SealevelriseStericRateEnum; else if (strcmp(name,"SealevelUmotion")==0) return SealevelUmotionEnum; - else if (strcmp(name,"SedimentHeadStacked")==0) return SedimentHeadStackedEnum; - else if (strcmp(name,"SedimentHead")==0) return SedimentHeadEnum; else if (strcmp(name,"Seg")==0) return SegEnum; else if (strcmp(name,"SegInput")==0) return SegInputEnum; @@ -1210,5 +1211,4 @@ else if (strcmp(name,"SubelementMelt1")==0) return SubelementMelt1Enum; else if (strcmp(name,"SubelementMelt2")==0) return SubelementMelt2Enum; - else if (strcmp(name,"SurfaceCrevasse")==0) return SurfaceCrevasseEnum; else if (strcmp(name,"SurfaceSlopeSolution")==0) return SurfaceSlopeSolutionEnum; else if (strcmp(name,"TaylorHood")==0) return TaylorHoodEnum;