Index: /issm/trunk-jpl/src/c/shared/Enum/Enum.vim =================================================================== --- /issm/trunk-jpl/src/c/shared/Enum/Enum.vim (revision 26001) +++ /issm/trunk-jpl/src/c/shared/Enum/Enum.vim (revision 26002) @@ -332,4 +332,11 @@ syn keyword cConstant RootPathEnum syn keyword cConstant ModelnameEnum +syn keyword cConstant SamplingAlphaEnum +syn keyword cConstant SamplingPhiEnum +syn keyword cConstant SamplingNumRequestedOutputsEnum +syn keyword cConstant SamplingRequestedOutputsEnum +syn keyword cConstant SamplingRobinEnum +syn keyword cConstant SamplingSeedEnum +syn keyword cConstant SamplingTauEnum syn keyword cConstant SaveResultsEnum syn keyword cConstant SolidearthPartitionIceEnum @@ -488,4 +495,5 @@ syn keyword cConstant TransientIsmovingfrontEnum syn keyword cConstant TransientIsoceancouplingEnum +syn keyword cConstant TransientIssamplingEnum syn keyword cConstant TransientIsslcEnum syn keyword cConstant TransientIssmbEnum @@ -715,4 +723,7 @@ syn keyword cConstant RheologyBInitialguessMisfitEnum syn keyword cConstant RheologyBbarAbsGradientEnum +syn keyword cConstant SampleEnum +syn keyword cConstant SamplingBetaEnum +syn keyword cConstant SamplingKappaEnum syn keyword cConstant SealevelEnum syn keyword cConstant SealevelBarystaticMaskEnum @@ -1562,4 +1573,5 @@ syn keyword cType MasstransportAnalysis syn keyword cType MeltingAnalysis +syn keyword cType SamplingAnalysis syn keyword cType SealevelchangeAnalysis syn keyword cType SmbAnalysis Index: /issm/trunk-jpl/src/c/shared/Enum/EnumDefinitions.h =================================================================== --- /issm/trunk-jpl/src/c/shared/Enum/EnumDefinitions.h (revision 26001) +++ /issm/trunk-jpl/src/c/shared/Enum/EnumDefinitions.h (revision 26002) @@ -326,4 +326,11 @@ RootPathEnum, ModelnameEnum, + SamplingAlphaEnum, + SamplingPhiEnum, + SamplingNumRequestedOutputsEnum, + SamplingRequestedOutputsEnum, + SamplingRobinEnum, + SamplingSeedEnum, + SamplingTauEnum, SaveResultsEnum, SolidearthPartitionIceEnum, @@ -482,4 +489,5 @@ TransientIsmovingfrontEnum, TransientIsoceancouplingEnum, + TransientIssamplingEnum, TransientIsslcEnum, TransientIssmbEnum, @@ -711,4 +719,7 @@ RheologyBInitialguessMisfitEnum, RheologyBbarAbsGradientEnum, + SampleEnum, + SamplingBetaEnum, + SamplingKappaEnum, SealevelEnum, SealevelBarystaticMaskEnum, Index: /issm/trunk-jpl/src/c/shared/Enum/EnumToStringx.cpp =================================================================== --- /issm/trunk-jpl/src/c/shared/Enum/EnumToStringx.cpp (revision 26001) +++ /issm/trunk-jpl/src/c/shared/Enum/EnumToStringx.cpp (revision 26002) @@ -334,4 +334,11 @@ case RootPathEnum : return "RootPath"; case ModelnameEnum : return "Modelname"; + case SamplingAlphaEnum : return "SamplingAlpha"; + case SamplingPhiEnum : return "SamplingPhi"; + case SamplingNumRequestedOutputsEnum : return "SamplingNumRequestedOutputs"; + case SamplingRequestedOutputsEnum : return "SamplingRequestedOutputs"; + case SamplingRobinEnum : return "SamplingRobin"; + case SamplingSeedEnum : return "SamplingSeed"; + case SamplingTauEnum : return "SamplingTau"; case SaveResultsEnum : return "SaveResults"; case SolidearthPartitionIceEnum : return "SolidearthPartitionIce"; @@ -490,4 +497,5 @@ case TransientIsmovingfrontEnum : return "TransientIsmovingfront"; case TransientIsoceancouplingEnum : return "TransientIsoceancoupling"; + case TransientIssamplingEnum : return "TransientIssampling"; case TransientIsslcEnum : return "TransientIsslc"; case TransientIssmbEnum : return "TransientIssmb"; @@ -717,4 +725,7 @@ case RheologyBInitialguessMisfitEnum : return "RheologyBInitialguessMisfit"; case RheologyBbarAbsGradientEnum : return "RheologyBbarAbsGradient"; + case SampleEnum : return "Sample"; + case SamplingBetaEnum : return "SamplingBeta"; + case SamplingKappaEnum : return "SamplingKappa"; case SealevelEnum : return "Sealevel"; case SealevelBarystaticMaskEnum : return "SealevelBarystaticMask"; Index: /issm/trunk-jpl/src/c/shared/Enum/StringToEnumx.cpp =================================================================== --- /issm/trunk-jpl/src/c/shared/Enum/StringToEnumx.cpp (revision 26001) +++ /issm/trunk-jpl/src/c/shared/Enum/StringToEnumx.cpp (revision 26002) @@ -340,4 +340,11 @@ else if (strcmp(name,"RootPath")==0) return RootPathEnum; else if (strcmp(name,"Modelname")==0) return ModelnameEnum; + else if (strcmp(name,"SamplingAlpha")==0) return SamplingAlphaEnum; + else if (strcmp(name,"SamplingPhi")==0) return SamplingPhiEnum; + else if (strcmp(name,"SamplingNumRequestedOutputs")==0) return SamplingNumRequestedOutputsEnum; + else if (strcmp(name,"SamplingRequestedOutputs")==0) return SamplingRequestedOutputsEnum; + else if (strcmp(name,"SamplingRobin")==0) return SamplingRobinEnum; + else if (strcmp(name,"SamplingSeed")==0) return SamplingSeedEnum; + else if (strcmp(name,"SamplingTau")==0) return SamplingTauEnum; else if (strcmp(name,"SaveResults")==0) return SaveResultsEnum; else if (strcmp(name,"SolidearthPartitionIce")==0) return SolidearthPartitionIceEnum; @@ -376,5 +383,8 @@ else if (strcmp(name,"SealevelchangeRunCount")==0) return SealevelchangeRunCountEnum; else if (strcmp(name,"SealevelchangeTransitions")==0) return SealevelchangeTransitionsEnum; - else if (strcmp(name,"SealevelchangeUElastic")==0) return SealevelchangeUElasticEnum; + else stage=4; + } + if(stage==4){ + if (strcmp(name,"SealevelchangeUElastic")==0) return SealevelchangeUElasticEnum; else if (strcmp(name,"SettingsIoGather")==0) return SettingsIoGatherEnum; else if (strcmp(name,"SettingsNumResultsOnNodes")==0) return SettingsNumResultsOnNodesEnum; @@ -383,8 +393,5 @@ else if (strcmp(name,"SettingsResultsOnNodes")==0) return SettingsResultsOnNodesEnum; else if (strcmp(name,"SettingsSbCouplingFrequency")==0) return SettingsSbCouplingFrequencyEnum; - else stage=4; - } - if(stage==4){ - if (strcmp(name,"SettingsSolverResidueThreshold")==0) return SettingsSolverResidueThresholdEnum; + else if (strcmp(name,"SettingsSolverResidueThreshold")==0) return SettingsSolverResidueThresholdEnum; else if (strcmp(name,"SettingsWaitonlock")==0) return SettingsWaitonlockEnum; else if (strcmp(name,"SmbAIce")==0) return SmbAIceEnum; @@ -499,4 +506,8 @@ else if (strcmp(name,"TransientIsmovingfront")==0) return TransientIsmovingfrontEnum; else if (strcmp(name,"TransientIsoceancoupling")==0) return TransientIsoceancouplingEnum; + else stage=5; + } + if(stage==5){ + if (strcmp(name,"TransientIssampling")==0) return TransientIssamplingEnum; else if (strcmp(name,"TransientIsslc")==0) return TransientIsslcEnum; else if (strcmp(name,"TransientIssmb")==0) return TransientIssmbEnum; @@ -506,8 +517,5 @@ else if (strcmp(name,"TransientRequestedOutputs")==0) return TransientRequestedOutputsEnum; else if (strcmp(name,"Velocity")==0) return VelocityEnum; - else stage=5; - } - if(stage==5){ - if (strcmp(name,"WorldComm")==0) return WorldCommEnum; + else if (strcmp(name,"WorldComm")==0) return WorldCommEnum; else if (strcmp(name,"ParametersEND")==0) return ParametersENDEnum; else if (strcmp(name,"InputsSTART")==0) return InputsSTARTEnum; @@ -621,5 +629,8 @@ else if (strcmp(name,"EsaXmotion")==0) return EsaXmotionEnum; else if (strcmp(name,"EsaYmotion")==0) return EsaYmotionEnum; - else if (strcmp(name,"EtaDiff")==0) return EtaDiffEnum; + else stage=6; + } + if(stage==6){ + if (strcmp(name,"EtaDiff")==0) return EtaDiffEnum; else if (strcmp(name,"FlowequationBorderFS")==0) return FlowequationBorderFSEnum; else if (strcmp(name,"FrictionAs")==0) return FrictionAsEnum; @@ -629,8 +640,5 @@ else if (strcmp(name,"FrictionCoefficientcoulomb")==0) return FrictionCoefficientcoulombEnum; else if (strcmp(name,"FrictionEffectivePressure")==0) return FrictionEffectivePressureEnum; - else stage=6; - } - if(stage==6){ - if (strcmp(name,"FrictionM")==0) return FrictionMEnum; + else if (strcmp(name,"FrictionM")==0) return FrictionMEnum; else if (strcmp(name,"FrictionP")==0) return FrictionPEnum; else if (strcmp(name,"FrictionPressureAdjustedTemperature")==0) return FrictionPressureAdjustedTemperatureEnum; @@ -732,4 +740,7 @@ else if (strcmp(name,"RheologyBInitialguessMisfit")==0) return RheologyBInitialguessMisfitEnum; else if (strcmp(name,"RheologyBbarAbsGradient")==0) return RheologyBbarAbsGradientEnum; + else if (strcmp(name,"Sample")==0) return SampleEnum; + else if (strcmp(name,"SamplingBeta")==0) return SamplingBetaEnum; + else if (strcmp(name,"SamplingKappa")==0) return SamplingKappaEnum; else if (strcmp(name,"Sealevel")==0) return SealevelEnum; else if (strcmp(name,"SealevelBarystaticMask")==0) return SealevelBarystaticMaskEnum; @@ -741,5 +752,8 @@ else if (strcmp(name,"BslcIce")==0) return BslcIceEnum; else if (strcmp(name,"BslcHydro")==0) return BslcHydroEnum; - else if (strcmp(name,"BslcRate")==0) return BslcRateEnum; + else stage=7; + } + if(stage==7){ + if (strcmp(name,"BslcRate")==0) return BslcRateEnum; else if (strcmp(name,"Gmtslc")==0) return GmtslcEnum; else if (strcmp(name,"SealevelRSLBarystatic")==0) return SealevelRSLBarystaticEnum; @@ -752,8 +766,5 @@ else if (strcmp(name,"SealevelchangeCumDeltathicknessOld")==0) return SealevelchangeCumDeltathicknessOldEnum; else if (strcmp(name,"SurfaceloadRate")==0) return SurfaceloadRateEnum; - else stage=7; - } - if(stage==7){ - if (strcmp(name,"SurfaceloadIceThicknessRate")==0) return SurfaceloadIceThicknessRateEnum; + else if (strcmp(name,"SurfaceloadIceThicknessRate")==0) return SurfaceloadIceThicknessRateEnum; else if (strcmp(name,"SurfaceloadWaterHeightRate")==0) return SurfaceloadWaterHeightRateEnum; else if (strcmp(name,"SurfaceloadOtherRate")==0) return SurfaceloadOtherRateEnum; @@ -864,5 +875,8 @@ else if (strcmp(name,"SmbTemperaturesPresentday")==0) return SmbTemperaturesPresentdayEnum; else if (strcmp(name,"SmbTemperaturesReconstructed")==0) return SmbTemperaturesReconstructedEnum; - else if (strcmp(name,"SmbTini")==0) return SmbTiniEnum; + else stage=8; + } + if(stage==8){ + if (strcmp(name,"SmbTini")==0) return SmbTiniEnum; else if (strcmp(name,"SmbTmean")==0) return SmbTmeanEnum; else if (strcmp(name,"SmbTz")==0) return SmbTzEnum; @@ -875,8 +889,5 @@ else if (strcmp(name,"SmbZMax")==0) return SmbZMaxEnum; else if (strcmp(name,"SmbZMin")==0) return SmbZMinEnum; - else stage=8; - } - if(stage==8){ - if (strcmp(name,"SmbZTop")==0) return SmbZTopEnum; + else if (strcmp(name,"SmbZTop")==0) return SmbZTopEnum; else if (strcmp(name,"SmbZY")==0) return SmbZYEnum; else if (strcmp(name,"SolidearthExternalDisplacementEastRate")==0) return SolidearthExternalDisplacementEastRateEnum; @@ -987,5 +998,8 @@ else if (strcmp(name,"Outputdefinition42")==0) return Outputdefinition42Enum; else if (strcmp(name,"Outputdefinition43")==0) return Outputdefinition43Enum; - else if (strcmp(name,"Outputdefinition44")==0) return Outputdefinition44Enum; + else stage=9; + } + if(stage==9){ + if (strcmp(name,"Outputdefinition44")==0) return Outputdefinition44Enum; else if (strcmp(name,"Outputdefinition45")==0) return Outputdefinition45Enum; else if (strcmp(name,"Outputdefinition46")==0) return Outputdefinition46Enum; @@ -998,8 +1012,5 @@ else if (strcmp(name,"Outputdefinition52")==0) return Outputdefinition52Enum; else if (strcmp(name,"Outputdefinition53")==0) return Outputdefinition53Enum; - else stage=9; - } - if(stage==9){ - if (strcmp(name,"Outputdefinition54")==0) return Outputdefinition54Enum; + else if (strcmp(name,"Outputdefinition54")==0) return Outputdefinition54Enum; else if (strcmp(name,"Outputdefinition55")==0) return Outputdefinition55Enum; else if (strcmp(name,"Outputdefinition56")==0) return Outputdefinition56Enum; @@ -1110,5 +1121,8 @@ 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=10; + } + if(stage==10){ + if (strcmp(name,"DamageEvolutionAnalysis")==0) return DamageEvolutionAnalysisEnum; else if (strcmp(name,"DamageEvolutionSolution")==0) return DamageEvolutionSolutionEnum; else if (strcmp(name,"DataSet")==0) return DataSetEnum; @@ -1121,8 +1135,5 @@ else if (strcmp(name,"DepthAverageAnalysis")==0) return DepthAverageAnalysisEnum; else if (strcmp(name,"DeviatoricStressErrorEstimator")==0) return DeviatoricStressErrorEstimatorEnum; - else stage=10; - } - if(stage==10){ - if (strcmp(name,"Divergence")==0) return DivergenceEnum; + else if (strcmp(name,"Divergence")==0) return DivergenceEnum; else if (strcmp(name,"Domain3Dsurface")==0) return Domain3DsurfaceEnum; else if (strcmp(name,"DoubleArrayInput")==0) return DoubleArrayInputEnum; @@ -1233,5 +1244,8 @@ else if (strcmp(name,"LoveHi")==0) return LoveHiEnum; else if (strcmp(name,"LoveHr")==0) return LoveHrEnum; - else if (strcmp(name,"LoveKernelsImag")==0) return LoveKernelsImagEnum; + else stage=11; + } + if(stage==11){ + if (strcmp(name,"LoveKernelsImag")==0) return LoveKernelsImagEnum; else if (strcmp(name,"LoveKernelsReal")==0) return LoveKernelsRealEnum; else if (strcmp(name,"LoveKi")==0) return LoveKiEnum; @@ -1244,8 +1258,5 @@ else if (strcmp(name,"MantlePlumeGeothermalFlux")==0) return MantlePlumeGeothermalFluxEnum; else if (strcmp(name,"MassFlux")==0) return MassFluxEnum; - else stage=11; - } - if(stage==11){ - if (strcmp(name,"Masscon")==0) return MassconEnum; + else if (strcmp(name,"Masscon")==0) return MassconEnum; else if (strcmp(name,"Massconaxpby")==0) return MassconaxpbyEnum; else if (strcmp(name,"Massfluxatgate")==0) return MassfluxatgateEnum; @@ -1356,5 +1367,8 @@ else if (strcmp(name,"SealevelchangeSolution")==0) return SealevelchangeSolutionEnum; else if (strcmp(name,"Seg")==0) return SegEnum; - else if (strcmp(name,"SegInput")==0) return SegInputEnum; + else stage=12; + } + if(stage==12){ + if (strcmp(name,"SegInput")==0) return SegInputEnum; else if (strcmp(name,"Segment")==0) return SegmentEnum; else if (strcmp(name,"SegmentRiftfront")==0) return SegmentRiftfrontEnum; @@ -1367,8 +1381,5 @@ else if (strcmp(name,"SpatialLinearFloatingMeltRate")==0) return SpatialLinearFloatingMeltRateEnum; else if (strcmp(name,"SpcDynamic")==0) return SpcDynamicEnum; - else stage=12; - } - if(stage==12){ - if (strcmp(name,"SpcStatic")==0) return SpcStaticEnum; + else if (strcmp(name,"SpcStatic")==0) return SpcStaticEnum; else if (strcmp(name,"SpcTransient")==0) return SpcTransientEnum; else if (strcmp(name,"Sset")==0) return SsetEnum;