Index: /issm/trunk-jpl/src/c/shared/Enum/EnumDefinitions.h =================================================================== --- /issm/trunk-jpl/src/c/shared/Enum/EnumDefinitions.h (revision 23858) +++ /issm/trunk-jpl/src/c/shared/Enum/EnumDefinitions.h (revision 23859) @@ -442,4 +442,5 @@ BalancethicknessOmegaEnum, BalancethicknessThickeningRateEnum, + BasalCrevasseEnum, BasalforcingsFloatingiceMeltingRateEnum, BasalforcingsGeothermalfluxEnum, @@ -474,4 +475,5 @@ DamageDEnum, DamageFEnum, + DegreeOfChannelizationEnum, DeviatoricStresseffectiveEnum, DeviatoricStressxxEnum, @@ -494,4 +496,6 @@ EnthalpyEnum, EnthalpyPicardEnum, + EplHeadStackedEnum, + EplHeadEnum, EplHeadHydrostepEnum, EplHeadOldEnum, @@ -785,5 +789,4 @@ BalancevelocityAnalysisEnum, BalancevelocitySolutionEnum, - BasalCrevasseEnum, BasalforcingsIsmip6Enum, BasalforcingsPicoEnum, @@ -822,5 +825,4 @@ DefaultAnalysisEnum, DefaultCalvingEnum, - DegreeOfChannelizationEnum, DenseEnum, DependentObjectEnum, @@ -841,6 +843,4 @@ ElementSIdEnum, EnthalpyAnalysisEnum, - EplHeadStackedEnum, - EplHeadEnum, EsaAnalysisEnum, EsaRotationrateEnum, Index: /issm/trunk-jpl/src/c/shared/Enum/EnumToStringx.cpp =================================================================== --- /issm/trunk-jpl/src/c/shared/Enum/EnumToStringx.cpp (revision 23858) +++ /issm/trunk-jpl/src/c/shared/Enum/EnumToStringx.cpp (revision 23859) @@ -448,4 +448,5 @@ case BalancethicknessOmegaEnum : return "BalancethicknessOmega"; case BalancethicknessThickeningRateEnum : return "BalancethicknessThickeningRate"; + case BasalCrevasseEnum : return "BasalCrevasse"; case BasalforcingsFloatingiceMeltingRateEnum : return "BasalforcingsFloatingiceMeltingRate"; case BasalforcingsGeothermalfluxEnum : return "BasalforcingsGeothermalflux"; @@ -480,4 +481,5 @@ case DamageDEnum : return "DamageD"; case DamageFEnum : return "DamageF"; + case DegreeOfChannelizationEnum : return "DegreeOfChannelization"; case DeviatoricStresseffectiveEnum : return "DeviatoricStresseffective"; case DeviatoricStressxxEnum : return "DeviatoricStressxx"; @@ -500,4 +502,6 @@ case EnthalpyEnum : return "Enthalpy"; case EnthalpyPicardEnum : return "EnthalpyPicard"; + case EplHeadStackedEnum : return "EplHeadStacked"; + case EplHeadEnum : return "EplHead"; case EplHeadHydrostepEnum : return "EplHeadHydrostep"; case EplHeadOldEnum : return "EplHeadOld"; @@ -789,5 +793,4 @@ case BalancevelocityAnalysisEnum : return "BalancevelocityAnalysis"; case BalancevelocitySolutionEnum : return "BalancevelocitySolution"; - case BasalCrevasseEnum : return "BasalCrevasse"; case BasalforcingsIsmip6Enum : return "BasalforcingsIsmip6"; case BasalforcingsPicoEnum : return "BasalforcingsPico"; @@ -826,5 +829,4 @@ case DefaultAnalysisEnum : return "DefaultAnalysis"; case DefaultCalvingEnum : return "DefaultCalving"; - case DegreeOfChannelizationEnum : return "DegreeOfChannelization"; case DenseEnum : return "Dense"; case DependentObjectEnum : return "DependentObject"; @@ -845,6 +847,4 @@ case ElementSIdEnum : return "ElementSId"; case EnthalpyAnalysisEnum : return "EnthalpyAnalysis"; - case EplHeadStackedEnum : return "EplHeadStacked"; - case EplHeadEnum : return "EplHead"; case EsaAnalysisEnum : return "EsaAnalysis"; case EsaRotationrateEnum : return "EsaRotationrate"; Index: /issm/trunk-jpl/src/c/shared/Enum/StringToEnumx.cpp =================================================================== --- /issm/trunk-jpl/src/c/shared/Enum/StringToEnumx.cpp (revision 23858) +++ /issm/trunk-jpl/src/c/shared/Enum/StringToEnumx.cpp (revision 23859) @@ -457,4 +457,5 @@ else if (strcmp(name,"BalancethicknessOmega")==0) return BalancethicknessOmegaEnum; else if (strcmp(name,"BalancethicknessThickeningRate")==0) return BalancethicknessThickeningRateEnum; + else if (strcmp(name,"BasalCrevasse")==0) return BasalCrevasseEnum; else if (strcmp(name,"BasalforcingsFloatingiceMeltingRate")==0) return BasalforcingsFloatingiceMeltingRateEnum; else if (strcmp(name,"BasalforcingsGeothermalflux")==0) return BasalforcingsGeothermalfluxEnum; @@ -489,4 +490,5 @@ else if (strcmp(name,"DamageD")==0) return DamageDEnum; else if (strcmp(name,"DamageF")==0) return DamageFEnum; + else if (strcmp(name,"DegreeOfChannelization")==0) return DegreeOfChannelizationEnum; else if (strcmp(name,"DeviatoricStresseffective")==0) return DeviatoricStresseffectiveEnum; else if (strcmp(name,"DeviatoricStressxx")==0) return DeviatoricStressxxEnum; @@ -504,12 +506,14 @@ else if (strcmp(name,"DrivingStressX")==0) return DrivingStressXEnum; else if (strcmp(name,"DrivingStressY")==0) return DrivingStressYEnum; - 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; + 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; else if (strcmp(name,"EplHeadOld")==0) return EplHeadOldEnum; @@ -625,12 +629,12 @@ 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 stage=6; + } + if(stage==6){ + 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 stage=6; - } - if(stage==6){ - if (strcmp(name,"SedimentHeadResidual")==0) return SedimentHeadResidualEnum; + else if (strcmp(name,"SedimentHeadResidual")==0) return SedimentHeadResidualEnum; else if (strcmp(name,"SigmaNN")==0) return SigmaNNEnum; else if (strcmp(name,"SigmaVM")==0) return SigmaVMEnum; @@ -748,12 +752,12 @@ else if (strcmp(name,"SurfaceObservation")==0) return SurfaceObservationEnum; else if (strcmp(name,"SurfaceRelVelMisfit")==0) return SurfaceRelVelMisfitEnum; - else if (strcmp(name,"SurfaceSlopeX")==0) return SurfaceSlopeXEnum; + else stage=7; + } + if(stage==7){ + if (strcmp(name,"SurfaceSlopeX")==0) return SurfaceSlopeXEnum; else if (strcmp(name,"SurfaceSlopeY")==0) return SurfaceSlopeYEnum; else if (strcmp(name,"Temperature")==0) return TemperatureEnum; else if (strcmp(name,"TemperaturePicard")==0) return TemperaturePicardEnum; - else stage=7; - } - if(stage==7){ - if (strcmp(name,"TemperaturePDD")==0) return TemperaturePDDEnum; + else if (strcmp(name,"TemperaturePDD")==0) return TemperaturePDDEnum; else if (strcmp(name,"TemperatureSEMIC")==0) return TemperatureSEMICEnum; else if (strcmp(name,"ThermalSpctemperature")==0) return ThermalSpctemperatureEnum; @@ -807,5 +811,4 @@ else if (strcmp(name,"BalancevelocityAnalysis")==0) return BalancevelocityAnalysisEnum; else if (strcmp(name,"BalancevelocitySolution")==0) return BalancevelocitySolutionEnum; - else if (strcmp(name,"BasalCrevasse")==0) return BasalCrevasseEnum; else if (strcmp(name,"BasalforcingsIsmip6")==0) return BasalforcingsIsmip6Enum; else if (strcmp(name,"BasalforcingsPico")==0) return BasalforcingsPicoEnum; @@ -844,5 +847,4 @@ else if (strcmp(name,"DefaultAnalysis")==0) return DefaultAnalysisEnum; else if (strcmp(name,"DefaultCalving")==0) return DefaultCalvingEnum; - else if (strcmp(name,"DegreeOfChannelization")==0) return DegreeOfChannelizationEnum; else if (strcmp(name,"Dense")==0) return DenseEnum; else if (strcmp(name,"DependentObject")==0) return DependentObjectEnum; @@ -863,6 +865,4 @@ else if (strcmp(name,"ElementSId")==0) return ElementSIdEnum; else if (strcmp(name,"EnthalpyAnalysis")==0) return EnthalpyAnalysisEnum; - else if (strcmp(name,"EplHeadStacked")==0) return EplHeadStackedEnum; - else if (strcmp(name,"EplHead")==0) return EplHeadEnum; else if (strcmp(name,"EsaAnalysis")==0) return EsaAnalysisEnum; else if (strcmp(name,"EsaRotationrate")==0) return EsaRotationrateEnum;