Index: /issm/trunk-jpl/src/c/shared/Enum/Enum.vim =================================================================== --- /issm/trunk-jpl/src/c/shared/Enum/Enum.vim (revision 27468) +++ /issm/trunk-jpl/src/c/shared/Enum/Enum.vim (revision 27469) @@ -209,4 +209,5 @@ syn keyword cConstant FrictionGammaEnum syn keyword cConstant FrictionLawEnum +syn keyword cConstant FrictionLinearizeEnum syn keyword cConstant FrictionPseudoplasticityExponentEnum syn keyword cConstant FrictionThresholdSpeedEnum @@ -1723,5 +1724,4 @@ syn keyword cType Cfsurfacesquare syn keyword cType Channel -syn keyword cType classes syn keyword cType Constraint syn keyword cType Constraints @@ -1730,6 +1730,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 @@ -1744,6 +1744,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 @@ -1752,10 +1752,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 @@ -1774,5 +1773,4 @@ syn keyword cType IssmDirectApplicInterface syn keyword cType IssmParallelDirectApplicInterface -syn keyword cType krigingobjects syn keyword cType Load syn keyword cType Loads @@ -1785,5 +1783,4 @@ syn keyword cType Matice syn keyword cType Matlitho -syn keyword cType matrixobjects syn keyword cType MatrixParam syn keyword cType Misfit @@ -1798,6 +1795,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 @@ -1813,11 +1810,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 @@ -1838,4 +1835,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 27468) +++ /issm/trunk-jpl/src/c/shared/Enum/EnumDefinitions.h (revision 27469) @@ -203,4 +203,5 @@ FrictionGammaEnum, FrictionLawEnum, + FrictionLinearizeEnum, FrictionPseudoplasticityExponentEnum, FrictionThresholdSpeedEnum, Index: /issm/trunk-jpl/src/c/shared/Enum/EnumToStringx.cpp =================================================================== --- /issm/trunk-jpl/src/c/shared/Enum/EnumToStringx.cpp (revision 27468) +++ /issm/trunk-jpl/src/c/shared/Enum/EnumToStringx.cpp (revision 27469) @@ -211,4 +211,5 @@ case FrictionGammaEnum : return "FrictionGamma"; case FrictionLawEnum : return "FrictionLaw"; + case FrictionLinearizeEnum : return "FrictionLinearize"; case FrictionPseudoplasticityExponentEnum : return "FrictionPseudoplasticityExponent"; case FrictionThresholdSpeedEnum : return "FrictionThresholdSpeed"; Index: /issm/trunk-jpl/src/c/shared/Enum/Enumjl.vim =================================================================== --- /issm/trunk-jpl/src/c/shared/Enum/Enumjl.vim (revision 27468) +++ /issm/trunk-jpl/src/c/shared/Enum/Enumjl.vim (revision 27469) @@ -202,4 +202,5 @@ syn keyword juliaConstC FrictionGammaEnum syn keyword juliaConstC FrictionLawEnum +syn keyword juliaConstC FrictionLinearizeEnum syn keyword juliaConstC FrictionPseudoplasticityExponentEnum syn keyword juliaConstC FrictionThresholdSpeedEnum Index: /issm/trunk-jpl/src/c/shared/Enum/StringToEnumx.cpp =================================================================== --- /issm/trunk-jpl/src/c/shared/Enum/StringToEnumx.cpp (revision 27468) +++ /issm/trunk-jpl/src/c/shared/Enum/StringToEnumx.cpp (revision 27469) @@ -214,4 +214,5 @@ else if (strcmp(name,"FrictionGamma")==0) return FrictionGammaEnum; else if (strcmp(name,"FrictionLaw")==0) return FrictionLawEnum; + else if (strcmp(name,"FrictionLinearize")==0) return FrictionLinearizeEnum; else if (strcmp(name,"FrictionPseudoplasticityExponent")==0) return FrictionPseudoplasticityExponentEnum; else if (strcmp(name,"FrictionThresholdSpeed")==0) return FrictionThresholdSpeedEnum; @@ -259,9 +260,9 @@ else if (strcmp(name,"HydrologyarmaNumParams")==0) return HydrologyarmaNumParamsEnum; else if (strcmp(name,"Hydrologyarmapolyparams")==0) return HydrologyarmapolyparamsEnum; - else if (strcmp(name,"HydrologyarmaTimestep")==0) return HydrologyarmaTimestepEnum; else stage=3; } if(stage==3){ - if (strcmp(name,"HydrologyAveraging")==0) return HydrologyAveragingEnum; + if (strcmp(name,"HydrologyarmaTimestep")==0) return HydrologyarmaTimestepEnum; + else if (strcmp(name,"HydrologyAveraging")==0) return HydrologyAveragingEnum; else if (strcmp(name,"HydrologyCavitySpacing")==0) return HydrologyCavitySpacingEnum; else if (strcmp(name,"HydrologyChannelSheetWidth")==0) return HydrologyChannelSheetWidthEnum; @@ -382,9 +383,9 @@ else if (strcmp(name,"MaterialsEffectiveconductivityAveraging")==0) return MaterialsEffectiveconductivityAveragingEnum; else if (strcmp(name,"MaterialsHeatcapacity")==0) return MaterialsHeatcapacityEnum; - else if (strcmp(name,"MaterialsLatentheat")==0) return MaterialsLatentheatEnum; else stage=4; } if(stage==4){ - if (strcmp(name,"MaterialsMeltingpoint")==0) return MaterialsMeltingpointEnum; + if (strcmp(name,"MaterialsLatentheat")==0) return MaterialsLatentheatEnum; + else if (strcmp(name,"MaterialsMeltingpoint")==0) return MaterialsMeltingpointEnum; else if (strcmp(name,"MaterialsMixedLayerCapacity")==0) return MaterialsMixedLayerCapacityEnum; else if (strcmp(name,"MaterialsMuWater")==0) return MaterialsMuWaterEnum; @@ -505,9 +506,9 @@ else if (strcmp(name,"StochasticForcingCovariance")==0) return StochasticForcingCovarianceEnum; else if (strcmp(name,"StochasticForcingDefaultDimension")==0) return StochasticForcingDefaultDimensionEnum; - else if (strcmp(name,"StochasticForcingDimensions")==0) return StochasticForcingDimensionsEnum; else stage=5; } if(stage==5){ - if (strcmp(name,"StochasticForcingFields")==0) return StochasticForcingFieldsEnum; + if (strcmp(name,"StochasticForcingDimensions")==0) return StochasticForcingDimensionsEnum; + else if (strcmp(name,"StochasticForcingFields")==0) return StochasticForcingFieldsEnum; else if (strcmp(name,"StochasticForcingIsEffectivePressure")==0) return StochasticForcingIsEffectivePressureEnum; else if (strcmp(name,"StochasticForcingIsStochasticForcing")==0) return StochasticForcingIsStochasticForcingEnum; @@ -628,9 +629,9 @@ else if (strcmp(name,"ThermalPenaltyFactor")==0) return ThermalPenaltyFactorEnum; else if (strcmp(name,"ThermalPenaltyLock")==0) return ThermalPenaltyLockEnum; - else if (strcmp(name,"ThermalPenaltyThreshold")==0) return ThermalPenaltyThresholdEnum; else stage=6; } if(stage==6){ - if (strcmp(name,"ThermalReltol")==0) return ThermalReltolEnum; + if (strcmp(name,"ThermalPenaltyThreshold")==0) return ThermalPenaltyThresholdEnum; + else if (strcmp(name,"ThermalReltol")==0) return ThermalReltolEnum; else if (strcmp(name,"ThermalRequestedOutputs")==0) return ThermalRequestedOutputsEnum; else if (strcmp(name,"ThermalStabilization")==0) return ThermalStabilizationEnum; @@ -751,9 +752,9 @@ else if (strcmp(name,"CalvingCalvingrate")==0) return CalvingCalvingrateEnum; else if (strcmp(name,"CalvingHabFraction")==0) return CalvingHabFractionEnum; - else if (strcmp(name,"CalvingAblationrate")==0) return CalvingAblationrateEnum; else stage=7; } if(stage==7){ - if (strcmp(name,"CalvingMeltingrate")==0) return CalvingMeltingrateEnum; + if (strcmp(name,"CalvingAblationrate")==0) return CalvingAblationrateEnum; + else if (strcmp(name,"CalvingMeltingrate")==0) return CalvingMeltingrateEnum; else if (strcmp(name,"CalvingStressThresholdFloatingice")==0) return CalvingStressThresholdFloatingiceEnum; else if (strcmp(name,"CalvingStressThresholdGroundedice")==0) return CalvingStressThresholdGroundediceEnum; @@ -874,9 +875,9 @@ else if (strcmp(name,"HydrologyHead")==0) return HydrologyHeadEnum; else if (strcmp(name,"HydrologyHeadOld")==0) return HydrologyHeadOldEnum; - else if (strcmp(name,"HydrologyMoulinInput")==0) return HydrologyMoulinInputEnum; else stage=8; } if(stage==8){ - if (strcmp(name,"HydrologyNeumannflux")==0) return HydrologyNeumannfluxEnum; + if (strcmp(name,"HydrologyMoulinInput")==0) return HydrologyMoulinInputEnum; + else if (strcmp(name,"HydrologyNeumannflux")==0) return HydrologyNeumannfluxEnum; else if (strcmp(name,"HydrologyReynolds")==0) return HydrologyReynoldsEnum; else if (strcmp(name,"HydrologySheetConductivity")==0) return HydrologySheetConductivityEnum; @@ -997,9 +998,9 @@ else if (strcmp(name,"SealevelchangeConvolutionVertices")==0) return SealevelchangeConvolutionVerticesEnum; else if (strcmp(name,"SealevelchangeAlphaIndex")==0) return SealevelchangeAlphaIndexEnum; - else if (strcmp(name,"SealevelchangeAzimuthIndex")==0) return SealevelchangeAzimuthIndexEnum; else stage=9; } if(stage==9){ - if (strcmp(name,"SealevelchangeGrot")==0) return SealevelchangeGrotEnum; + if (strcmp(name,"SealevelchangeAzimuthIndex")==0) return SealevelchangeAzimuthIndexEnum; + else if (strcmp(name,"SealevelchangeGrot")==0) return SealevelchangeGrotEnum; else if (strcmp(name,"SealevelchangeGSatGravirot")==0) return SealevelchangeGSatGravirotEnum; else if (strcmp(name,"SealevelchangeGUrot")==0) return SealevelchangeGUrotEnum; @@ -1120,9 +1121,9 @@ else if (strcmp(name,"SmbTa")==0) return SmbTaEnum; else if (strcmp(name,"SmbTeValue")==0) return SmbTeValueEnum; - else if (strcmp(name,"SmbTemperaturesAnomaly")==0) return SmbTemperaturesAnomalyEnum; else stage=10; } if(stage==10){ - if (strcmp(name,"SmbTemperaturesLgm")==0) return SmbTemperaturesLgmEnum; + if (strcmp(name,"SmbTemperaturesAnomaly")==0) return SmbTemperaturesAnomalyEnum; + else if (strcmp(name,"SmbTemperaturesLgm")==0) return SmbTemperaturesLgmEnum; else if (strcmp(name,"SmbTemperaturesPresentday")==0) return SmbTemperaturesPresentdayEnum; else if (strcmp(name,"SmbTemperaturesReconstructed")==0) return SmbTemperaturesReconstructedEnum; @@ -1243,9 +1244,9 @@ else if (strcmp(name,"Outputdefinition15")==0) return Outputdefinition15Enum; else if (strcmp(name,"Outputdefinition16")==0) return Outputdefinition16Enum; - else if (strcmp(name,"Outputdefinition17")==0) return Outputdefinition17Enum; else stage=11; } if(stage==11){ - if (strcmp(name,"Outputdefinition18")==0) return Outputdefinition18Enum; + if (strcmp(name,"Outputdefinition17")==0) return Outputdefinition17Enum; + else if (strcmp(name,"Outputdefinition18")==0) return Outputdefinition18Enum; else if (strcmp(name,"Outputdefinition19")==0) return Outputdefinition19Enum; else if (strcmp(name,"Outputdefinition20")==0) return Outputdefinition20Enum; @@ -1366,9 +1367,9 @@ else if (strcmp(name,"BoolExternalResult")==0) return BoolExternalResultEnum; else if (strcmp(name,"BoolInput")==0) return BoolInputEnum; - else if (strcmp(name,"IntInput")==0) return IntInputEnum; else stage=12; } if(stage==12){ - if (strcmp(name,"DoubleInput")==0) return DoubleInputEnum; + if (strcmp(name,"IntInput")==0) return IntInputEnum; + else if (strcmp(name,"DoubleInput")==0) return DoubleInputEnum; else if (strcmp(name,"BoolParam")==0) return BoolParamEnum; else if (strcmp(name,"Boundary")==0) return BoundaryEnum; @@ -1489,9 +1490,9 @@ else if (strcmp(name,"HydrologySubsteps")==0) return HydrologySubstepsEnum; else if (strcmp(name,"HydrologySubTime")==0) return HydrologySubTimeEnum; - else if (strcmp(name,"Hydrologydc")==0) return HydrologydcEnum; else stage=13; } if(stage==13){ - if (strcmp(name,"Hydrologypism")==0) return HydrologypismEnum; + if (strcmp(name,"Hydrologydc")==0) return HydrologydcEnum; + else if (strcmp(name,"Hydrologypism")==0) return HydrologypismEnum; else if (strcmp(name,"Hydrologyshakti")==0) return HydrologyshaktiEnum; else if (strcmp(name,"Hydrologyshreve")==0) return HydrologyshreveEnum; @@ -1612,9 +1613,9 @@ else if (strcmp(name,"P1P1GLS")==0) return P1P1GLSEnum; else if (strcmp(name,"P1bubble")==0) return P1bubbleEnum; - else if (strcmp(name,"P1bubblecondensed")==0) return P1bubblecondensedEnum; else stage=14; } if(stage==14){ - if (strcmp(name,"P1xP2")==0) return P1xP2Enum; + if (strcmp(name,"P1bubblecondensed")==0) return P1bubblecondensedEnum; + else if (strcmp(name,"P1xP2")==0) return P1xP2Enum; else if (strcmp(name,"P1xP3")==0) return P1xP3Enum; else if (strcmp(name,"P1xP4")==0) return P1xP4Enum; @@ -1735,9 +1736,9 @@ else if (strcmp(name,"BalancethicknessDiffusionCoefficient")==0) return BalancethicknessDiffusionCoefficientEnum; else if (strcmp(name,"BilinearInterp")==0) return BilinearInterpEnum; - else if (strcmp(name,"CalvingdevCoeff")==0) return CalvingdevCoeffEnum; else stage=15; } if(stage==15){ - if (strcmp(name,"DeviatoricStress")==0) return DeviatoricStressEnum; + if (strcmp(name,"CalvingdevCoeff")==0) return CalvingdevCoeffEnum; + else if (strcmp(name,"DeviatoricStress")==0) return DeviatoricStressEnum; else if (strcmp(name,"EtaAbsGradient")==0) return EtaAbsGradientEnum; else if (strcmp(name,"MeshZ")==0) return MeshZEnum;