Index: /issm/branches/trunk-larour-SLPS2022/src/c/shared/Enum/Enum.vim =================================================================== --- /issm/branches/trunk-larour-SLPS2022/src/c/shared/Enum/Enum.vim (revision 27093) +++ /issm/branches/trunk-larour-SLPS2022/src/c/shared/Enum/Enum.vim (revision 27094) @@ -306,6 +306,8 @@ syn keyword cConstant MasstransportMinThicknessEnum syn keyword cConstant MasstransportNumRequestedOutputsEnum +syn keyword cConstant MmemasstransportNumRequestedOutputsEnum syn keyword cConstant MasstransportPenaltyFactorEnum syn keyword cConstant MasstransportRequestedOutputsEnum +syn keyword cConstant MmemasstransportRequestedOutputsEnum syn keyword cConstant MasstransportStabilizationEnum syn keyword cConstant MmemasstransportModelidsEnum @@ -808,5 +810,5 @@ syn keyword cConstant MaskIceRefLevelsetEnum syn keyword cConstant MasstransportSpcthicknessEnum -syn keyword cConstant MmemasstransportDeltathicknessEnum +syn keyword cConstant MmemasstransportThicknessEnum syn keyword cConstant MaterialsRheologyBEnum syn keyword cConstant MaterialsRheologyBbarEnum @@ -1776,4 +1778,5 @@ syn keyword cType MasstransportAnalysis syn keyword cType MeltingAnalysis +syn keyword cType MmemasstransportAnalysis syn keyword cType OceantransportAnalysis syn keyword cType SamplingAnalysis Index: /issm/branches/trunk-larour-SLPS2022/src/c/shared/Enum/EnumDefinitions.h =================================================================== --- /issm/branches/trunk-larour-SLPS2022/src/c/shared/Enum/EnumDefinitions.h (revision 27093) +++ /issm/branches/trunk-larour-SLPS2022/src/c/shared/Enum/EnumDefinitions.h (revision 27094) @@ -300,6 +300,8 @@ MasstransportMinThicknessEnum, MasstransportNumRequestedOutputsEnum, + MmemasstransportNumRequestedOutputsEnum, MasstransportPenaltyFactorEnum, MasstransportRequestedOutputsEnum, + MmemasstransportRequestedOutputsEnum, MasstransportStabilizationEnum, MmemasstransportModelidsEnum, @@ -804,5 +806,5 @@ MaskIceRefLevelsetEnum, MasstransportSpcthicknessEnum, - MmemasstransportDeltathicknessEnum, + MmemasstransportThicknessEnum, MaterialsRheologyBEnum, MaterialsRheologyBbarEnum, Index: /issm/branches/trunk-larour-SLPS2022/src/c/shared/Enum/EnumToStringx.cpp =================================================================== --- /issm/branches/trunk-larour-SLPS2022/src/c/shared/Enum/EnumToStringx.cpp (revision 27093) +++ /issm/branches/trunk-larour-SLPS2022/src/c/shared/Enum/EnumToStringx.cpp (revision 27094) @@ -308,6 +308,8 @@ case MasstransportMinThicknessEnum : return "MasstransportMinThickness"; case MasstransportNumRequestedOutputsEnum : return "MasstransportNumRequestedOutputs"; + case MmemasstransportNumRequestedOutputsEnum : return "MmemasstransportNumRequestedOutputs"; case MasstransportPenaltyFactorEnum : return "MasstransportPenaltyFactor"; case MasstransportRequestedOutputsEnum : return "MasstransportRequestedOutputs"; + case MmemasstransportRequestedOutputsEnum : return "MmemasstransportRequestedOutputs"; case MasstransportStabilizationEnum : return "MasstransportStabilization"; case MmemasstransportModelidsEnum : return "MmemasstransportModelids"; @@ -810,5 +812,5 @@ case MaskIceRefLevelsetEnum : return "MaskIceRefLevelset"; case MasstransportSpcthicknessEnum : return "MasstransportSpcthickness"; - case MmemasstransportDeltathicknessEnum : return "MmemasstransportDeltathickness"; + case MmemasstransportThicknessEnum : return "MmemasstransportThickness"; case MaterialsRheologyBEnum : return "MaterialsRheologyB"; case MaterialsRheologyBbarEnum : return "MaterialsRheologyBbar"; Index: /issm/branches/trunk-larour-SLPS2022/src/c/shared/Enum/Enumjl.vim =================================================================== --- /issm/branches/trunk-larour-SLPS2022/src/c/shared/Enum/Enumjl.vim (revision 27093) +++ /issm/branches/trunk-larour-SLPS2022/src/c/shared/Enum/Enumjl.vim (revision 27094) @@ -299,6 +299,8 @@ syn keyword juliaConstC MasstransportMinThicknessEnum syn keyword juliaConstC MasstransportNumRequestedOutputsEnum +syn keyword juliaConstC MmemasstransportNumRequestedOutputsEnum syn keyword juliaConstC MasstransportPenaltyFactorEnum syn keyword juliaConstC MasstransportRequestedOutputsEnum +syn keyword juliaConstC MmemasstransportRequestedOutputsEnum syn keyword juliaConstC MasstransportStabilizationEnum syn keyword juliaConstC MmemasstransportModelidsEnum @@ -801,5 +803,5 @@ syn keyword juliaConstC MaskIceRefLevelsetEnum syn keyword juliaConstC MasstransportSpcthicknessEnum -syn keyword juliaConstC MmemasstransportDeltathicknessEnum +syn keyword juliaConstC MmemasstransportThicknessEnum syn keyword juliaConstC MaterialsRheologyBEnum syn keyword juliaConstC MaterialsRheologyBbarEnum Index: /issm/branches/trunk-larour-SLPS2022/src/c/shared/Enum/StringToEnumx.cpp =================================================================== --- /issm/branches/trunk-larour-SLPS2022/src/c/shared/Enum/StringToEnumx.cpp (revision 27093) +++ /issm/branches/trunk-larour-SLPS2022/src/c/shared/Enum/StringToEnumx.cpp (revision 27094) @@ -314,6 +314,8 @@ else if (strcmp(name,"MasstransportMinThickness")==0) return MasstransportMinThicknessEnum; else if (strcmp(name,"MasstransportNumRequestedOutputs")==0) return MasstransportNumRequestedOutputsEnum; + else if (strcmp(name,"MmemasstransportNumRequestedOutputs")==0) return MmemasstransportNumRequestedOutputsEnum; else if (strcmp(name,"MasstransportPenaltyFactor")==0) return MasstransportPenaltyFactorEnum; else if (strcmp(name,"MasstransportRequestedOutputs")==0) return MasstransportRequestedOutputsEnum; + else if (strcmp(name,"MmemasstransportRequestedOutputs")==0) return MmemasstransportRequestedOutputsEnum; else if (strcmp(name,"MasstransportStabilization")==0) return MasstransportStabilizationEnum; else if (strcmp(name,"MmemasstransportModelids")==0) return MmemasstransportModelidsEnum; @@ -381,10 +383,10 @@ 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 stage=4; } if(stage==4){ - if (strcmp(name,"SaveResults")==0) return SaveResultsEnum; + if (strcmp(name,"SamplingRobin")==0) return SamplingRobinEnum; + else if (strcmp(name,"SamplingSeed")==0) return SamplingSeedEnum; + else if (strcmp(name,"SaveResults")==0) return SaveResultsEnum; else if (strcmp(name,"SolidearthPartitionIce")==0) return SolidearthPartitionIceEnum; else if (strcmp(name,"SolidearthPartitionHydro")==0) return SolidearthPartitionHydroEnum; @@ -504,10 +506,10 @@ else if (strcmp(name,"SmbIstemperaturescaled")==0) return SmbIstemperaturescaledEnum; else if (strcmp(name,"SmbIsthermal")==0) return SmbIsthermalEnum; - else if (strcmp(name,"SmbIsturbulentflux")==0) return SmbIsturbulentfluxEnum; - else if (strcmp(name,"SmbK")==0) return SmbKEnum; else stage=5; } if(stage==5){ - if (strcmp(name,"SmbLapseRates")==0) return SmbLapseRatesEnum; + if (strcmp(name,"SmbIsturbulentflux")==0) return SmbIsturbulentfluxEnum; + else if (strcmp(name,"SmbK")==0) return SmbKEnum; + else if (strcmp(name,"SmbLapseRates")==0) return SmbLapseRatesEnum; else if (strcmp(name,"SmbNumBasins")==0) return SmbNumBasinsEnum; else if (strcmp(name,"SmbNumElevationBins")==0) return SmbNumElevationBinsEnum; @@ -627,10 +629,10 @@ else if (strcmp(name,"BasalCrevasse")==0) return BasalCrevasseEnum; else if (strcmp(name,"BasalforcingsDeepwaterMeltingRateAutoregression")==0) return BasalforcingsDeepwaterMeltingRateAutoregressionEnum; - else if (strcmp(name,"BasalforcingsDeepwaterMeltingRateNoise")==0) return BasalforcingsDeepwaterMeltingRateNoiseEnum; - else if (strcmp(name,"BasalforcingsDeepwaterMeltingRateValuesAutoregression")==0) return BasalforcingsDeepwaterMeltingRateValuesAutoregressionEnum; else stage=6; } if(stage==6){ - if (strcmp(name,"BasalforcingsFloatingiceMeltingRate")==0) return BasalforcingsFloatingiceMeltingRateEnum; + if (strcmp(name,"BasalforcingsDeepwaterMeltingRateNoise")==0) return BasalforcingsDeepwaterMeltingRateNoiseEnum; + else if (strcmp(name,"BasalforcingsDeepwaterMeltingRateValuesAutoregression")==0) return BasalforcingsDeepwaterMeltingRateValuesAutoregressionEnum; + else if (strcmp(name,"BasalforcingsFloatingiceMeltingRate")==0) return BasalforcingsFloatingiceMeltingRateEnum; else if (strcmp(name,"BasalforcingsGeothermalflux")==0) return BasalforcingsGeothermalfluxEnum; else if (strcmp(name,"BasalforcingsGroundediceMeltingRate")==0) return BasalforcingsGroundediceMeltingRateEnum; @@ -750,10 +752,10 @@ else if (strcmp(name,"FrictionCmax")==0) return FrictionCmaxEnum; else if (strcmp(name,"FrictionCoefficient")==0) return FrictionCoefficientEnum; - else if (strcmp(name,"FrictionCoefficientcoulomb")==0) return FrictionCoefficientcoulombEnum; - else if (strcmp(name,"FrictionEffectivePressure")==0) return FrictionEffectivePressureEnum; else stage=7; } if(stage==7){ - if (strcmp(name,"FrictionM")==0) return FrictionMEnum; + if (strcmp(name,"FrictionCoefficientcoulomb")==0) return FrictionCoefficientcoulombEnum; + else if (strcmp(name,"FrictionEffectivePressure")==0) return FrictionEffectivePressureEnum; + else if (strcmp(name,"FrictionM")==0) return FrictionMEnum; else if (strcmp(name,"FrictionP")==0) return FrictionPEnum; else if (strcmp(name,"FrictionPressureAdjustedTemperature")==0) return FrictionPressureAdjustedTemperatureEnum; @@ -828,5 +830,5 @@ else if (strcmp(name,"MaskIceRefLevelset")==0) return MaskIceRefLevelsetEnum; else if (strcmp(name,"MasstransportSpcthickness")==0) return MasstransportSpcthicknessEnum; - else if (strcmp(name,"MmemasstransportDeltathickness")==0) return MmemasstransportDeltathicknessEnum; + else if (strcmp(name,"MmemasstransportThickness")==0) return MmemasstransportThicknessEnum; else if (strcmp(name,"MaterialsRheologyB")==0) return MaterialsRheologyBEnum; else if (strcmp(name,"MaterialsRheologyBbar")==0) return MaterialsRheologyBbarEnum; @@ -873,10 +875,10 @@ else if (strcmp(name,"SamplingPhi")==0) return SamplingPhiEnum; else if (strcmp(name,"SamplingTau")==0) return SamplingTauEnum; - else if (strcmp(name,"Sealevel")==0) return SealevelEnum; - else if (strcmp(name,"SealevelGRD")==0) return SealevelGRDEnum; else stage=8; } if(stage==8){ - if (strcmp(name,"SealevelBarystaticMask")==0) return SealevelBarystaticMaskEnum; + if (strcmp(name,"Sealevel")==0) return SealevelEnum; + else if (strcmp(name,"SealevelGRD")==0) return SealevelGRDEnum; + else if (strcmp(name,"SealevelBarystaticMask")==0) return SealevelBarystaticMaskEnum; else if (strcmp(name,"SealevelBarystaticIceMask")==0) return SealevelBarystaticIceMaskEnum; else if (strcmp(name,"SealevelBarystaticIceWeights")==0) return SealevelBarystaticIceWeightsEnum; @@ -996,10 +998,10 @@ else if (strcmp(name,"SmbECDt")==0) return SmbECDtEnum; else if (strcmp(name,"SmbECini")==0) return SmbECiniEnum; - else if (strcmp(name,"SmbEla")==0) return SmbElaEnum; - else if (strcmp(name,"SmbEvaporation")==0) return SmbEvaporationEnum; else stage=9; } if(stage==9){ - if (strcmp(name,"SmbFAC")==0) return SmbFACEnum; + if (strcmp(name,"SmbEla")==0) return SmbElaEnum; + else if (strcmp(name,"SmbEvaporation")==0) return SmbEvaporationEnum; + else if (strcmp(name,"SmbFAC")==0) return SmbFACEnum; else if (strcmp(name,"SmbGdn")==0) return SmbGdnEnum; else if (strcmp(name,"SmbGdnini")==0) return SmbGdniniEnum; @@ -1119,10 +1121,10 @@ else if (strcmp(name,"VxAverage")==0) return VxAverageEnum; else if (strcmp(name,"VxBase")==0) return VxBaseEnum; - else if (strcmp(name,"Vx")==0) return VxEnum; - else if (strcmp(name,"VxMesh")==0) return VxMeshEnum; else stage=10; } if(stage==10){ - if (strcmp(name,"VxObs")==0) return VxObsEnum; + if (strcmp(name,"Vx")==0) return VxEnum; + else if (strcmp(name,"VxMesh")==0) return VxMeshEnum; + else if (strcmp(name,"VxObs")==0) return VxObsEnum; else if (strcmp(name,"VxShear")==0) return VxShearEnum; else if (strcmp(name,"VxSurface")==0) return VxSurfaceEnum; @@ -1242,10 +1244,10 @@ else if (strcmp(name,"Outputdefinition90")==0) return Outputdefinition90Enum; else if (strcmp(name,"Outputdefinition91")==0) return Outputdefinition91Enum; - else if (strcmp(name,"Outputdefinition92")==0) return Outputdefinition92Enum; - else if (strcmp(name,"Outputdefinition93")==0) return Outputdefinition93Enum; else stage=11; } if(stage==11){ - if (strcmp(name,"Outputdefinition94")==0) return Outputdefinition94Enum; + if (strcmp(name,"Outputdefinition92")==0) return Outputdefinition92Enum; + else if (strcmp(name,"Outputdefinition93")==0) return Outputdefinition93Enum; + else if (strcmp(name,"Outputdefinition94")==0) return Outputdefinition94Enum; else if (strcmp(name,"Outputdefinition95")==0) return Outputdefinition95Enum; else if (strcmp(name,"Outputdefinition96")==0) return Outputdefinition96Enum; @@ -1365,10 +1367,10 @@ else if (strcmp(name,"FrontalForcingsRignotAutoregression")==0) return FrontalForcingsRignotAutoregressionEnum; else if (strcmp(name,"Fset")==0) return FsetEnum; - else if (strcmp(name,"FullMeltOnPartiallyFloating")==0) return FullMeltOnPartiallyFloatingEnum; - else if (strcmp(name,"GLheightadvectionAnalysis")==0) return GLheightadvectionAnalysisEnum; else stage=12; } if(stage==12){ - if (strcmp(name,"GaussPenta")==0) return GaussPentaEnum; + if (strcmp(name,"FullMeltOnPartiallyFloating")==0) return FullMeltOnPartiallyFloatingEnum; + else if (strcmp(name,"GLheightadvectionAnalysis")==0) return GLheightadvectionAnalysisEnum; + else if (strcmp(name,"GaussPenta")==0) return GaussPentaEnum; else if (strcmp(name,"GaussSeg")==0) return GaussSegEnum; else if (strcmp(name,"GaussTetra")==0) return GaussTetraEnum; @@ -1488,10 +1490,10 @@ else if (strcmp(name,"MismipFloatingMeltRate")==0) return MismipFloatingMeltRateEnum; else if (strcmp(name,"Moulin")==0) return MoulinEnum; - else if (strcmp(name,"MpiDense")==0) return MpiDenseEnum; - else if (strcmp(name,"Mpi")==0) return MpiEnum; else stage=13; } if(stage==13){ - if (strcmp(name,"MpiSparse")==0) return MpiSparseEnum; + if (strcmp(name,"MpiDense")==0) return MpiDenseEnum; + else if (strcmp(name,"Mpi")==0) return MpiEnum; + else if (strcmp(name,"MpiSparse")==0) return MpiSparseEnum; else if (strcmp(name,"Mumps")==0) return MumpsEnum; else if (strcmp(name,"NoFrictionOnPartiallyFloating")==0) return NoFrictionOnPartiallyFloatingEnum; @@ -1611,10 +1613,10 @@ else if (strcmp(name,"ThicknessErrorEstimator")==0) return ThicknessErrorEstimatorEnum; else if (strcmp(name,"TotalCalvingFluxLevelset")==0) return TotalCalvingFluxLevelsetEnum; - else if (strcmp(name,"TotalCalvingMeltingFluxLevelset")==0) return TotalCalvingMeltingFluxLevelsetEnum; - else if (strcmp(name,"TotalFloatingBmb")==0) return TotalFloatingBmbEnum; else stage=14; } if(stage==14){ - if (strcmp(name,"TotalFloatingBmbScaled")==0) return TotalFloatingBmbScaledEnum; + if (strcmp(name,"TotalCalvingMeltingFluxLevelset")==0) return TotalCalvingMeltingFluxLevelsetEnum; + else if (strcmp(name,"TotalFloatingBmb")==0) return TotalFloatingBmbEnum; + else if (strcmp(name,"TotalFloatingBmbScaled")==0) return TotalFloatingBmbScaledEnum; else if (strcmp(name,"TotalGroundedBmb")==0) return TotalGroundedBmbEnum; else if (strcmp(name,"TotalGroundedBmbScaled")==0) return TotalGroundedBmbScaledEnum; Index: /issm/branches/trunk-larour-SLPS2022/src/c/shared/Enum/issmenums.jl =================================================================== --- /issm/branches/trunk-larour-SLPS2022/src/c/shared/Enum/issmenums.jl (revision 27093) +++ /issm/branches/trunk-larour-SLPS2022/src/c/shared/Enum/issmenums.jl (revision 27094) @@ -295,6 +295,8 @@ MasstransportMinThicknessEnum MasstransportNumRequestedOutputsEnum + MmemasstransportNumRequestedOutputsEnum MasstransportPenaltyFactorEnum MasstransportRequestedOutputsEnum + MmemasstransportRequestedOutputsEnum MasstransportStabilizationEnum MmemasstransportModelidsEnum @@ -797,5 +799,5 @@ MaskIceRefLevelsetEnum MasstransportSpcthicknessEnum - MmemasstransportDeltathicknessEnum + MmemasstransportThicknessEnum MaterialsRheologyBEnum MaterialsRheologyBbarEnum @@ -1899,6 +1901,8 @@ if(enum==MasstransportMinThicknessEnum) return "MasstransportMinThickness" end if(enum==MasstransportNumRequestedOutputsEnum) return "MasstransportNumRequestedOutputs" end + if(enum==MmemasstransportNumRequestedOutputsEnum) return "MmemasstransportNumRequestedOutputs" end if(enum==MasstransportPenaltyFactorEnum) return "MasstransportPenaltyFactor" end if(enum==MasstransportRequestedOutputsEnum) return "MasstransportRequestedOutputs" end + if(enum==MmemasstransportRequestedOutputsEnum) return "MmemasstransportRequestedOutputs" end if(enum==MasstransportStabilizationEnum) return "MasstransportStabilization" end if(enum==MmemasstransportModelidsEnum) return "MmemasstransportModelids" end @@ -2401,5 +2405,5 @@ if(enum==MaskIceRefLevelsetEnum) return "MaskIceRefLevelset" end if(enum==MasstransportSpcthicknessEnum) return "MasstransportSpcthickness" end - if(enum==MmemasstransportDeltathicknessEnum) return "MmemasstransportDeltathickness" end + if(enum==MmemasstransportThicknessEnum) return "MmemasstransportThickness" end if(enum==MaterialsRheologyBEnum) return "MaterialsRheologyB" end if(enum==MaterialsRheologyBbarEnum) return "MaterialsRheologyBbar" end