Index: /issm/trunk-jpl/src/c/shared/Enum/Enum.vim =================================================================== --- /issm/trunk-jpl/src/c/shared/Enum/Enum.vim (revision 27683) +++ /issm/trunk-jpl/src/c/shared/Enum/Enum.vim (revision 27684) @@ -708,6 +708,8 @@ syn keyword cConstant BasalforcingsDeepwaterMeltingRateValuesMovingaverageEnum syn keyword cConstant BasalforcingsFloatingiceMeltingRateEnum +syn keyword cConstant BasalforcingsFloatingiceMeltingRateObsEnum syn keyword cConstant BasalforcingsGeothermalfluxEnum syn keyword cConstant BasalforcingsGroundediceMeltingRateEnum +syn keyword cConstant BasalforcingsGroundediceMeltingRateObsEnum syn keyword cConstant BasalforcingsLinearBasinIdEnum syn keyword cConstant BasalforcingsPerturbationMeltingRateEnum @@ -1238,4 +1240,7 @@ syn keyword cConstant WaterPressureValuesMovingaverageEnum syn keyword cConstant WeightsLevelsetObservationEnum +syn keyword cConstant WeightsMeltObservationEnum +syn keyword cConstant WeightsVxObservationEnum +syn keyword cConstant WeightsVyObservationEnum syn keyword cConstant WeightsSurfaceObservationEnum syn keyword cConstant OldAccumulatedDeltaBottomPressureEnum Index: /issm/trunk-jpl/src/c/shared/Enum/EnumDefinitions.h =================================================================== --- /issm/trunk-jpl/src/c/shared/Enum/EnumDefinitions.h (revision 27683) +++ /issm/trunk-jpl/src/c/shared/Enum/EnumDefinitions.h (revision 27684) @@ -704,6 +704,8 @@ BasalforcingsDeepwaterMeltingRateValuesMovingaverageEnum, BasalforcingsFloatingiceMeltingRateEnum, + BasalforcingsFloatingiceMeltingRateObsEnum, BasalforcingsGeothermalfluxEnum, BasalforcingsGroundediceMeltingRateEnum, + BasalforcingsGroundediceMeltingRateObsEnum, BasalforcingsLinearBasinIdEnum, BasalforcingsPerturbationMeltingRateEnum, @@ -1235,4 +1237,7 @@ WaterPressureValuesMovingaverageEnum, WeightsLevelsetObservationEnum, + WeightsMeltObservationEnum, + WeightsVxObservationEnum, + WeightsVyObservationEnum, WeightsSurfaceObservationEnum, OldAccumulatedDeltaBottomPressureEnum, Index: /issm/trunk-jpl/src/c/shared/Enum/EnumToStringx.cpp =================================================================== --- /issm/trunk-jpl/src/c/shared/Enum/EnumToStringx.cpp (revision 27683) +++ /issm/trunk-jpl/src/c/shared/Enum/EnumToStringx.cpp (revision 27684) @@ -710,6 +710,8 @@ case BasalforcingsDeepwaterMeltingRateValuesMovingaverageEnum : return "BasalforcingsDeepwaterMeltingRateValuesMovingaverage"; case BasalforcingsFloatingiceMeltingRateEnum : return "BasalforcingsFloatingiceMeltingRate"; + case BasalforcingsFloatingiceMeltingRateObsEnum : return "BasalforcingsFloatingiceMeltingRateObs"; case BasalforcingsGeothermalfluxEnum : return "BasalforcingsGeothermalflux"; case BasalforcingsGroundediceMeltingRateEnum : return "BasalforcingsGroundediceMeltingRate"; + case BasalforcingsGroundediceMeltingRateObsEnum : return "BasalforcingsGroundediceMeltingRateObs"; case BasalforcingsLinearBasinIdEnum : return "BasalforcingsLinearBasinId"; case BasalforcingsPerturbationMeltingRateEnum : return "BasalforcingsPerturbationMeltingRate"; @@ -1240,4 +1242,7 @@ case WaterPressureValuesMovingaverageEnum : return "WaterPressureValuesMovingaverage"; case WeightsLevelsetObservationEnum : return "WeightsLevelsetObservation"; + case WeightsMeltObservationEnum : return "WeightsMeltObservation"; + case WeightsVxObservationEnum : return "WeightsVxObservation"; + case WeightsVyObservationEnum : return "WeightsVyObservation"; case WeightsSurfaceObservationEnum : return "WeightsSurfaceObservation"; case OldAccumulatedDeltaBottomPressureEnum : return "OldAccumulatedDeltaBottomPressure"; Index: /issm/trunk-jpl/src/c/shared/Enum/Enumjl.vim =================================================================== --- /issm/trunk-jpl/src/c/shared/Enum/Enumjl.vim (revision 27683) +++ /issm/trunk-jpl/src/c/shared/Enum/Enumjl.vim (revision 27684) @@ -701,6 +701,8 @@ syn keyword juliaConstC BasalforcingsDeepwaterMeltingRateValuesMovingaverageEnum syn keyword juliaConstC BasalforcingsFloatingiceMeltingRateEnum +syn keyword juliaConstC BasalforcingsFloatingiceMeltingRateObsEnum syn keyword juliaConstC BasalforcingsGeothermalfluxEnum syn keyword juliaConstC BasalforcingsGroundediceMeltingRateEnum +syn keyword juliaConstC BasalforcingsGroundediceMeltingRateObsEnum syn keyword juliaConstC BasalforcingsLinearBasinIdEnum syn keyword juliaConstC BasalforcingsPerturbationMeltingRateEnum @@ -1231,4 +1233,7 @@ syn keyword juliaConstC WaterPressureValuesMovingaverageEnum syn keyword juliaConstC WeightsLevelsetObservationEnum +syn keyword juliaConstC WeightsMeltObservationEnum +syn keyword juliaConstC WeightsVxObservationEnum +syn keyword juliaConstC WeightsVyObservationEnum syn keyword juliaConstC WeightsSurfaceObservationEnum syn keyword juliaConstC OldAccumulatedDeltaBottomPressureEnum Index: /issm/trunk-jpl/src/c/shared/Enum/StringToEnumx.cpp =================================================================== --- /issm/trunk-jpl/src/c/shared/Enum/StringToEnumx.cpp (revision 27683) +++ /issm/trunk-jpl/src/c/shared/Enum/StringToEnumx.cpp (revision 27684) @@ -725,6 +725,8 @@ else if (strcmp(name,"BasalforcingsDeepwaterMeltingRateValuesMovingaverage")==0) return BasalforcingsDeepwaterMeltingRateValuesMovingaverageEnum; else if (strcmp(name,"BasalforcingsFloatingiceMeltingRate")==0) return BasalforcingsFloatingiceMeltingRateEnum; + else if (strcmp(name,"BasalforcingsFloatingiceMeltingRateObs")==0) return BasalforcingsFloatingiceMeltingRateObsEnum; else if (strcmp(name,"BasalforcingsGeothermalflux")==0) return BasalforcingsGeothermalfluxEnum; else if (strcmp(name,"BasalforcingsGroundediceMeltingRate")==0) return BasalforcingsGroundediceMeltingRateEnum; + else if (strcmp(name,"BasalforcingsGroundediceMeltingRateObs")==0) return BasalforcingsGroundediceMeltingRateObsEnum; else if (strcmp(name,"BasalforcingsLinearBasinId")==0) return BasalforcingsLinearBasinIdEnum; else if (strcmp(name,"BasalforcingsPerturbationMeltingRate")==0) return BasalforcingsPerturbationMeltingRateEnum; @@ -832,5 +834,9 @@ else if (strcmp(name,"EsaEmotion")==0) return EsaEmotionEnum; else if (strcmp(name,"EsaNmotion")==0) return EsaNmotionEnum; - else if (strcmp(name,"EsaRotationrate")==0) return EsaRotationrateEnum; + else if (strcmp(name,"EsaStrainratexy")==0) return EsaStrainratexyEnum; + else stage=7; + } + if(stage==7){ + if (strcmp(name,"EsaRotationrate")==0) return EsaRotationrateEnum; else if (strcmp(name,"EsaStrainratexx")==0) return EsaStrainratexxEnum; else if (strcmp(name,"EsaStrainratexy")==0) return EsaStrainratexyEnum; @@ -960,5 +966,9 @@ else if (strcmp(name,"RadarAttenuationMacGregor")==0) return RadarAttenuationMacGregorEnum; else if (strcmp(name,"RadarAttenuationWolff")==0) return RadarAttenuationWolffEnum; - else if (strcmp(name,"RadarIcePeriod")==0) return RadarIcePeriodEnum; + else if (strcmp(name,"RadarPowerWolff")==0) return RadarPowerWolffEnum; + else stage=8; + } + if(stage==8){ + if (strcmp(name,"RadarIcePeriod")==0) return RadarIcePeriodEnum; else if (strcmp(name,"RadarPowerMacGregor")==0) return RadarPowerMacGregorEnum; else if (strcmp(name,"RadarPowerWolff")==0) return RadarPowerWolffEnum; @@ -1089,5 +1099,9 @@ else if (strcmp(name,"SmbDswrf")==0) return SmbDswrfEnum; else if (strcmp(name,"SmbDswdiffrf")==0) return SmbDswdiffrfEnum; - else if (strcmp(name,"SmbDzAdd")==0) return SmbDzAddEnum; + else if (strcmp(name,"SmbDzMin")==0) return SmbDzMinEnum; + else stage=9; + } + if(stage==9){ + if (strcmp(name,"SmbDzAdd")==0) return SmbDzAddEnum; else if (strcmp(name,"SmbDz")==0) return SmbDzEnum; else if (strcmp(name,"SmbDzMin")==0) return SmbDzMinEnum; @@ -1229,5 +1243,9 @@ else if (strcmp(name,"ThicknessAbsMisfit")==0) return ThicknessAbsMisfitEnum; else if (strcmp(name,"ThicknessAcrossGradient")==0) return ThicknessAcrossGradientEnum; - else if (strcmp(name,"ThicknessAlongGradient")==0) return ThicknessAlongGradientEnum; + else if (strcmp(name,"ThicknessOld")==0) return ThicknessOldEnum; + else stage=10; + } + if(stage==10){ + if (strcmp(name,"ThicknessAlongGradient")==0) return ThicknessAlongGradientEnum; else if (strcmp(name,"Thickness")==0) return ThicknessEnum; else if (strcmp(name,"ThicknessOld")==0) return ThicknessOldEnum; @@ -1270,4 +1288,7 @@ else if (strcmp(name,"WaterPressureValuesMovingaverage")==0) return WaterPressureValuesMovingaverageEnum; else if (strcmp(name,"WeightsLevelsetObservation")==0) return WeightsLevelsetObservationEnum; + else if (strcmp(name,"WeightsMeltObservation")==0) return WeightsMeltObservationEnum; + else if (strcmp(name,"WeightsVxObservation")==0) return WeightsVxObservationEnum; + else if (strcmp(name,"WeightsVyObservation")==0) return WeightsVyObservationEnum; else if (strcmp(name,"WeightsSurfaceObservation")==0) return WeightsSurfaceObservationEnum; else if (strcmp(name,"OldAccumulatedDeltaBottomPressure")==0) return OldAccumulatedDeltaBottomPressureEnum; @@ -1354,5 +1375,8 @@ else if (strcmp(name,"Outputdefinition81")==0) return Outputdefinition81Enum; else if (strcmp(name,"Outputdefinition82")==0) return Outputdefinition82Enum; - else if (strcmp(name,"Outputdefinition83")==0) return Outputdefinition83Enum; + else stage=11; + } + if(stage==11){ + if (strcmp(name,"Outputdefinition83")==0) return Outputdefinition83Enum; else if (strcmp(name,"Outputdefinition84")==0) return Outputdefinition84Enum; else if (strcmp(name,"Outputdefinition85")==0) return Outputdefinition85Enum; @@ -1479,5 +1503,8 @@ else if (strcmp(name,"FSvelocity")==0) return FSvelocityEnum; else if (strcmp(name,"FemModel")==0) return FemModelEnum; - else if (strcmp(name,"FileParam")==0) return FileParamEnum; + else stage=12; + } + if(stage==12){ + if (strcmp(name,"FileParam")==0) return FileParamEnum; else if (strcmp(name,"FixedTimestepping")==0) return FixedTimesteppingEnum; else if (strcmp(name,"FloatingArea")==0) return FloatingAreaEnum; @@ -1607,5 +1634,8 @@ else if (strcmp(name,"MaxVx")==0) return MaxVxEnum; else if (strcmp(name,"MaxVy")==0) return MaxVyEnum; - else if (strcmp(name,"MaxVz")==0) return MaxVzEnum; + else stage=13; + } + if(stage==13){ + if (strcmp(name,"MaxVz")==0) return MaxVzEnum; else if (strcmp(name,"Melange")==0) return MelangeEnum; else if (strcmp(name,"MeltingAnalysis")==0) return MeltingAnalysisEnum; @@ -1731,5 +1761,8 @@ else if (strcmp(name,"StringParam")==0) return StringParamEnum; else if (strcmp(name,"SubelementFriction1")==0) return SubelementFriction1Enum; - else if (strcmp(name,"SubelementFriction2")==0) return SubelementFriction2Enum; + else stage=14; + } + if(stage==14){ + if (strcmp(name,"SubelementFriction2")==0) return SubelementFriction2Enum; else if (strcmp(name,"SubelementMelt1")==0) return SubelementMelt1Enum; else if (strcmp(name,"SubelementMelt2")==0) return SubelementMelt2Enum;