Index: /issm/trunk-jpl/src/c/shared/Enum/Enum.vim =================================================================== --- /issm/trunk-jpl/src/c/shared/Enum/Enum.vim (revision 26487) +++ /issm/trunk-jpl/src/c/shared/Enum/Enum.vim (revision 26488) @@ -709,4 +709,8 @@ syn keyword cConstant HydrologyEnglacialInputEnum syn keyword cConstant HydrologyGapHeightEnum +syn keyword cConstant HydrologyGapHeightXEnum +syn keyword cConstant HydrologyGapHeightXXEnum +syn keyword cConstant HydrologyGapHeightYEnum +syn keyword cConstant HydrologyGapHeightYYEnum syn keyword cConstant HydrologyHeadEnum syn keyword cConstant HydrologyHeadOldEnum @@ -1549,5 +1553,4 @@ syn keyword cType Cfsurfacesquare syn keyword cType Channel -syn keyword cType classes syn keyword cType Constraint syn keyword cType Constraints @@ -1556,6 +1559,6 @@ syn keyword cType ControlInput syn keyword cType Covertree +syn keyword cType DataSetParam syn keyword cType DatasetInput -syn keyword cType DataSetParam syn keyword cType Definition syn keyword cType DependentObject @@ -1570,6 +1573,6 @@ syn keyword cType ElementInput syn keyword cType ElementMatrix +syn keyword cType ElementVector syn keyword cType Elements -syn keyword cType ElementVector syn keyword cType ExponentialVariogram syn keyword cType ExternalResult @@ -1578,10 +1581,9 @@ syn keyword cType Friction syn keyword cType Gauss -syn keyword cType GaussianVariogram -syn keyword cType gaussobjects syn keyword cType GaussPenta syn keyword cType GaussSeg syn keyword cType GaussTetra syn keyword cType GaussTria +syn keyword cType GaussianVariogram syn keyword cType GenericExternalResult syn keyword cType GenericOption @@ -1599,5 +1601,4 @@ syn keyword cType IssmDirectApplicInterface syn keyword cType IssmParallelDirectApplicInterface -syn keyword cType krigingobjects syn keyword cType Load syn keyword cType Loads @@ -1610,5 +1611,4 @@ syn keyword cType Matice syn keyword cType Matlitho -syn keyword cType matrixobjects syn keyword cType MatrixParam syn keyword cType Misfit @@ -1623,6 +1623,6 @@ syn keyword cType Observations syn keyword cType Option +syn keyword cType OptionUtilities syn keyword cType Options -syn keyword cType OptionUtilities syn keyword cType Param syn keyword cType Parameters @@ -1638,11 +1638,11 @@ syn keyword cType Regionaloutput syn keyword cType Results +syn keyword cType RiftStruct syn keyword cType Riftfront -syn keyword cType RiftStruct syn keyword cType SealevelGeometry syn keyword cType Seg syn keyword cType SegInput +syn keyword cType SegRef syn keyword cType Segment -syn keyword cType SegRef syn keyword cType SpcDynamic syn keyword cType SpcStatic @@ -1663,4 +1663,8 @@ syn keyword cType Vertex syn keyword cType Vertices +syn keyword cType classes +syn keyword cType gaussobjects +syn keyword cType krigingobjects +syn keyword cType matrixobjects syn keyword cType AdjointBalancethickness2Analysis syn keyword cType AdjointBalancethicknessAnalysis Index: /issm/trunk-jpl/src/c/shared/Enum/EnumDefinitions.h =================================================================== --- /issm/trunk-jpl/src/c/shared/Enum/EnumDefinitions.h (revision 26487) +++ /issm/trunk-jpl/src/c/shared/Enum/EnumDefinitions.h (revision 26488) @@ -705,4 +705,8 @@ HydrologyEnglacialInputEnum, HydrologyGapHeightEnum, + HydrologyGapHeightXEnum, + HydrologyGapHeightXXEnum, + HydrologyGapHeightYEnum, + HydrologyGapHeightYYEnum, HydrologyHeadEnum, HydrologyHeadOldEnum, Index: /issm/trunk-jpl/src/c/shared/Enum/EnumToStringx.cpp =================================================================== --- /issm/trunk-jpl/src/c/shared/Enum/EnumToStringx.cpp (revision 26487) +++ /issm/trunk-jpl/src/c/shared/Enum/EnumToStringx.cpp (revision 26488) @@ -711,4 +711,8 @@ case HydrologyEnglacialInputEnum : return "HydrologyEnglacialInput"; case HydrologyGapHeightEnum : return "HydrologyGapHeight"; + case HydrologyGapHeightXEnum : return "HydrologyGapHeightX"; + case HydrologyGapHeightXXEnum : return "HydrologyGapHeightXX"; + case HydrologyGapHeightYEnum : return "HydrologyGapHeightY"; + case HydrologyGapHeightYYEnum : return "HydrologyGapHeightYY"; case HydrologyHeadEnum : return "HydrologyHead"; case HydrologyHeadOldEnum : return "HydrologyHeadOld"; Index: /issm/trunk-jpl/src/c/shared/Enum/StringToEnumx.cpp =================================================================== --- /issm/trunk-jpl/src/c/shared/Enum/StringToEnumx.cpp (revision 26487) +++ /issm/trunk-jpl/src/c/shared/Enum/StringToEnumx.cpp (revision 26488) @@ -726,4 +726,8 @@ else if (strcmp(name,"HydrologyEnglacialInput")==0) return HydrologyEnglacialInputEnum; else if (strcmp(name,"HydrologyGapHeight")==0) return HydrologyGapHeightEnum; + else if (strcmp(name,"HydrologyGapHeightX")==0) return HydrologyGapHeightXEnum; + else if (strcmp(name,"HydrologyGapHeightXX")==0) return HydrologyGapHeightXXEnum; + else if (strcmp(name,"HydrologyGapHeightY")==0) return HydrologyGapHeightYEnum; + else if (strcmp(name,"HydrologyGapHeightYY")==0) return HydrologyGapHeightYYEnum; else if (strcmp(name,"HydrologyHead")==0) return HydrologyHeadEnum; else if (strcmp(name,"HydrologyHeadOld")==0) return HydrologyHeadOldEnum; @@ -748,12 +752,12 @@ else if (strcmp(name,"InversionVelObs")==0) return InversionVelObsEnum; else if (strcmp(name,"InversionVxObs")==0) return InversionVxObsEnum; - else if (strcmp(name,"InversionVyObs")==0) return InversionVyObsEnum; + else stage=7; + } + if(stage==7){ + if (strcmp(name,"InversionVyObs")==0) return InversionVyObsEnum; else if (strcmp(name,"LevelsetfunctionSlopeX")==0) return LevelsetfunctionSlopeXEnum; else if (strcmp(name,"LevelsetfunctionSlopeY")==0) return LevelsetfunctionSlopeYEnum; else if (strcmp(name,"LevelsetObservation")==0) return LevelsetObservationEnum; - else stage=7; - } - if(stage==7){ - if (strcmp(name,"LoadingforceX")==0) return LoadingforceXEnum; + else if (strcmp(name,"LoadingforceX")==0) return LoadingforceXEnum; else if (strcmp(name,"LoadingforceY")==0) return LoadingforceYEnum; else if (strcmp(name,"LoadingforceZ")==0) return LoadingforceZEnum; @@ -871,12 +875,12 @@ else if (strcmp(name,"SealevelchangeGEsubelHydro")==0) return SealevelchangeGEsubelHydroEnum; else if (strcmp(name,"SealevelchangeGNsubelHydro")==0) return SealevelchangeGNsubelHydroEnum; - else if (strcmp(name,"SealevelchangeViscousRSL")==0) return SealevelchangeViscousRSLEnum; + else stage=8; + } + if(stage==8){ + if (strcmp(name,"SealevelchangeViscousRSL")==0) return SealevelchangeViscousRSLEnum; else if (strcmp(name,"SealevelchangeViscousU")==0) return SealevelchangeViscousUEnum; else if (strcmp(name,"SealevelchangeViscousN")==0) return SealevelchangeViscousNEnum; else if (strcmp(name,"SealevelchangeViscousE")==0) return SealevelchangeViscousEEnum; - else stage=8; - } - if(stage==8){ - if (strcmp(name,"SedimentHead")==0) return SedimentHeadEnum; + else if (strcmp(name,"SedimentHead")==0) return SedimentHeadEnum; else if (strcmp(name,"SedimentHeadOld")==0) return SedimentHeadOldEnum; else if (strcmp(name,"SedimentHeadSubstep")==0) return SedimentHeadSubstepEnum; @@ -994,12 +998,12 @@ else if (strcmp(name,"SmbZMax")==0) return SmbZMaxEnum; else if (strcmp(name,"SmbZMin")==0) return SmbZMinEnum; - else if (strcmp(name,"SmbZTop")==0) return SmbZTopEnum; + else stage=9; + } + if(stage==9){ + if (strcmp(name,"SmbZTop")==0) return SmbZTopEnum; else if (strcmp(name,"SmbZY")==0) return SmbZYEnum; else if (strcmp(name,"SolidearthExternalDisplacementEastRate")==0) return SolidearthExternalDisplacementEastRateEnum; else if (strcmp(name,"SolidearthExternalDisplacementNorthRate")==0) return SolidearthExternalDisplacementNorthRateEnum; - else stage=9; - } - if(stage==9){ - if (strcmp(name,"SolidearthExternalDisplacementUpRate")==0) return SolidearthExternalDisplacementUpRateEnum; + else if (strcmp(name,"SolidearthExternalDisplacementUpRate")==0) return SolidearthExternalDisplacementUpRateEnum; else if (strcmp(name,"SolidearthExternalGeoidRate")==0) return SolidearthExternalGeoidRateEnum; else if (strcmp(name,"StrainRateeffective")==0) return StrainRateeffectiveEnum; @@ -1117,12 +1121,12 @@ else if (strcmp(name,"Outputdefinition43")==0) return Outputdefinition43Enum; else if (strcmp(name,"Outputdefinition44")==0) return Outputdefinition44Enum; - else if (strcmp(name,"Outputdefinition45")==0) return Outputdefinition45Enum; + else stage=10; + } + if(stage==10){ + if (strcmp(name,"Outputdefinition45")==0) return Outputdefinition45Enum; else if (strcmp(name,"Outputdefinition46")==0) return Outputdefinition46Enum; else if (strcmp(name,"Outputdefinition47")==0) return Outputdefinition47Enum; else if (strcmp(name,"Outputdefinition48")==0) return Outputdefinition48Enum; - else stage=10; - } - if(stage==10){ - if (strcmp(name,"Outputdefinition49")==0) return Outputdefinition49Enum; + else if (strcmp(name,"Outputdefinition49")==0) return Outputdefinition49Enum; else if (strcmp(name,"Outputdefinition4")==0) return Outputdefinition4Enum; else if (strcmp(name,"Outputdefinition50")==0) return Outputdefinition50Enum; @@ -1240,12 +1244,12 @@ else if (strcmp(name,"Cuffey")==0) return CuffeyEnum; else if (strcmp(name,"CuffeyTemperate")==0) return CuffeyTemperateEnum; - else if (strcmp(name,"DamageEvolutionAnalysis")==0) return DamageEvolutionAnalysisEnum; + else stage=11; + } + if(stage==11){ + if (strcmp(name,"DamageEvolutionAnalysis")==0) return DamageEvolutionAnalysisEnum; 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 stage=11; - } - if(stage==11){ - if (strcmp(name,"DatasetInput")==0) return DatasetInputEnum; + else if (strcmp(name,"DatasetInput")==0) return DatasetInputEnum; else if (strcmp(name,"DefaultAnalysis")==0) return DefaultAnalysisEnum; else if (strcmp(name,"DefaultCalving")==0) return DefaultCalvingEnum; @@ -1363,12 +1367,12 @@ else if (strcmp(name,"LoveKernelsImag")==0) return LoveKernelsImagEnum; else if (strcmp(name,"LoveKernelsReal")==0) return LoveKernelsRealEnum; - else if (strcmp(name,"LoveKi")==0) return LoveKiEnum; + else stage=12; + } + if(stage==12){ + if (strcmp(name,"LoveKi")==0) return LoveKiEnum; else if (strcmp(name,"LoveKr")==0) return LoveKrEnum; else if (strcmp(name,"LoveLi")==0) return LoveLiEnum; else if (strcmp(name,"LoveLr")==0) return LoveLrEnum; - else stage=12; - } - if(stage==12){ - if (strcmp(name,"LoveSolution")==0) return LoveSolutionEnum; + else if (strcmp(name,"LoveSolution")==0) return LoveSolutionEnum; else if (strcmp(name,"MINI")==0) return MINIEnum; else if (strcmp(name,"MINIcondensed")==0) return MINIcondensedEnum; @@ -1486,12 +1490,12 @@ else if (strcmp(name,"SealevelchangePolarMotion")==0) return SealevelchangePolarMotionEnum; else if (strcmp(name,"SealevelNmotion")==0) return SealevelNmotionEnum; - else if (strcmp(name,"SealevelUmotion")==0) return SealevelUmotionEnum; + else stage=13; + } + if(stage==13){ + if (strcmp(name,"SealevelUmotion")==0) return SealevelUmotionEnum; else if (strcmp(name,"SealevelchangeAnalysis")==0) return SealevelchangeAnalysisEnum; else if (strcmp(name,"Seg")==0) return SegEnum; else if (strcmp(name,"SegInput")==0) return SegInputEnum; - else stage=13; - } - if(stage==13){ - if (strcmp(name,"Segment")==0) return SegmentEnum; + else if (strcmp(name,"Segment")==0) return SegmentEnum; else if (strcmp(name,"SegmentRiftfront")==0) return SegmentRiftfrontEnum; else if (strcmp(name,"Separate")==0) return SeparateEnum;