Index: /issm/branches/trunk-larour-SLPS2022/src/c/cores/sealevelchange_core.cpp =================================================================== --- /issm/branches/trunk-larour-SLPS2022/src/c/cores/sealevelchange_core.cpp (revision 27264) +++ /issm/branches/trunk-larour-SLPS2022/src/c/cores/sealevelchange_core.cpp (revision 27265) @@ -68,4 +68,7 @@ /*Run coupler output transfer: */ coupleroutput_core(femmodel); + + /*Add additional diagnostics:*/ + femmodel->inputs->ZAXPY(-1, BedEnum,SealevelEnum,RelativeSealevelEnum); /*Save results: */ Index: /issm/branches/trunk-larour-SLPS2022/src/c/shared/Enum/Enum.vim =================================================================== --- /issm/branches/trunk-larour-SLPS2022/src/c/shared/Enum/Enum.vim (revision 27264) +++ /issm/branches/trunk-larour-SLPS2022/src/c/shared/Enum/Enum.vim (revision 27265) @@ -857,4 +857,5 @@ syn keyword cConstant SamplingPhiEnum syn keyword cConstant SamplingTauEnum +syn keyword cConstant RelativeSealevelEnum syn keyword cConstant SealevelEnum syn keyword cConstant SealevelGRDEnum Index: /issm/branches/trunk-larour-SLPS2022/src/c/shared/Enum/EnumDefinitions.h =================================================================== --- /issm/branches/trunk-larour-SLPS2022/src/c/shared/Enum/EnumDefinitions.h (revision 27264) +++ /issm/branches/trunk-larour-SLPS2022/src/c/shared/Enum/EnumDefinitions.h (revision 27265) @@ -853,4 +853,5 @@ SamplingPhiEnum, SamplingTauEnum, + RelativeSealevelEnum, SealevelEnum, SealevelGRDEnum, Index: /issm/branches/trunk-larour-SLPS2022/src/c/shared/Enum/EnumToStringx.cpp =================================================================== --- /issm/branches/trunk-larour-SLPS2022/src/c/shared/Enum/EnumToStringx.cpp (revision 27264) +++ /issm/branches/trunk-larour-SLPS2022/src/c/shared/Enum/EnumToStringx.cpp (revision 27265) @@ -859,4 +859,5 @@ case SamplingPhiEnum : return "SamplingPhi"; case SamplingTauEnum : return "SamplingTau"; + case RelativeSealevelEnum : return "RelativeSealevel"; case SealevelEnum : return "Sealevel"; case SealevelGRDEnum : return "SealevelGRD"; Index: /issm/branches/trunk-larour-SLPS2022/src/c/shared/Enum/Enumjl.vim =================================================================== --- /issm/branches/trunk-larour-SLPS2022/src/c/shared/Enum/Enumjl.vim (revision 27264) +++ /issm/branches/trunk-larour-SLPS2022/src/c/shared/Enum/Enumjl.vim (revision 27265) @@ -850,4 +850,5 @@ syn keyword juliaConstC SamplingPhiEnum syn keyword juliaConstC SamplingTauEnum +syn keyword juliaConstC RelativeSealevelEnum syn keyword juliaConstC SealevelEnum syn keyword juliaConstC SealevelGRDEnum Index: /issm/branches/trunk-larour-SLPS2022/src/c/shared/Enum/StringToEnumx.cpp =================================================================== --- /issm/branches/trunk-larour-SLPS2022/src/c/shared/Enum/StringToEnumx.cpp (revision 27264) +++ /issm/branches/trunk-larour-SLPS2022/src/c/shared/Enum/StringToEnumx.cpp (revision 27265) @@ -880,4 +880,5 @@ if (strcmp(name,"SamplingPhi")==0) return SamplingPhiEnum; else if (strcmp(name,"SamplingTau")==0) return SamplingTauEnum; + else if (strcmp(name,"RelativeSealevel")==0) return RelativeSealevelEnum; else if (strcmp(name,"Sealevel")==0) return SealevelEnum; else if (strcmp(name,"SealevelGRD")==0) return SealevelGRDEnum; @@ -997,9 +998,9 @@ else if (strcmp(name,"SmbDzini")==0) return SmbDziniEnum; else if (strcmp(name,"SmbEAir")==0) return SmbEAirEnum; - else if (strcmp(name,"SmbEC")==0) return SmbECEnum; else stage=9; } if(stage==9){ - if (strcmp(name,"SmbECDt")==0) return SmbECDtEnum; + if (strcmp(name,"SmbEC")==0) return SmbECEnum; + else if (strcmp(name,"SmbECDt")==0) return SmbECDtEnum; else if (strcmp(name,"SmbECini")==0) return SmbECiniEnum; else if (strcmp(name,"SmbEla")==0) return SmbElaEnum; @@ -1120,9 +1121,9 @@ else if (strcmp(name,"ThicknessResidual")==0) return ThicknessResidualEnum; else if (strcmp(name,"TransientAccumulatedDeltaIceThickness")==0) return TransientAccumulatedDeltaIceThicknessEnum; - else if (strcmp(name,"Vel")==0) return VelEnum; else stage=10; } if(stage==10){ - if (strcmp(name,"VxAverage")==0) return VxAverageEnum; + if (strcmp(name,"Vel")==0) return VelEnum; + else if (strcmp(name,"VxAverage")==0) return VxAverageEnum; else if (strcmp(name,"VxBase")==0) return VxBaseEnum; else if (strcmp(name,"Vx")==0) return VxEnum; @@ -1243,9 +1244,9 @@ else if (strcmp(name,"Outputdefinition88")==0) return Outputdefinition88Enum; else if (strcmp(name,"Outputdefinition89")==0) return Outputdefinition89Enum; - else if (strcmp(name,"Outputdefinition8")==0) return Outputdefinition8Enum; else stage=11; } if(stage==11){ - if (strcmp(name,"Outputdefinition90")==0) return Outputdefinition90Enum; + if (strcmp(name,"Outputdefinition8")==0) return Outputdefinition8Enum; + else if (strcmp(name,"Outputdefinition90")==0) return Outputdefinition90Enum; else if (strcmp(name,"Outputdefinition91")==0) return Outputdefinition91Enum; else if (strcmp(name,"Outputdefinition92")==0) return Outputdefinition92Enum; @@ -1366,9 +1367,9 @@ else if (strcmp(name,"FreeSurfaceTopAnalysis")==0) return FreeSurfaceTopAnalysisEnum; else if (strcmp(name,"FrontalForcingsDefault")==0) return FrontalForcingsDefaultEnum; - else if (strcmp(name,"FrontalForcingsRignot")==0) return FrontalForcingsRignotEnum; else stage=12; } if(stage==12){ - if (strcmp(name,"FrontalForcingsRignotAutoregression")==0) return FrontalForcingsRignotAutoregressionEnum; + if (strcmp(name,"FrontalForcingsRignot")==0) return FrontalForcingsRignotEnum; + else if (strcmp(name,"FrontalForcingsRignotAutoregression")==0) return FrontalForcingsRignotAutoregressionEnum; else if (strcmp(name,"Fset")==0) return FsetEnum; else if (strcmp(name,"FullMeltOnPartiallyFloating")==0) return FullMeltOnPartiallyFloatingEnum; @@ -1489,9 +1490,9 @@ else if (strcmp(name,"MinVx")==0) return MinVxEnum; else if (strcmp(name,"MinVy")==0) return MinVyEnum; - else if (strcmp(name,"MinVz")==0) return MinVzEnum; else stage=13; } if(stage==13){ - if (strcmp(name,"MismipFloatingMeltRate")==0) return MismipFloatingMeltRateEnum; + if (strcmp(name,"MinVz")==0) return MinVzEnum; + else if (strcmp(name,"MismipFloatingMeltRate")==0) return MismipFloatingMeltRateEnum; else if (strcmp(name,"Moulin")==0) return MoulinEnum; else if (strcmp(name,"MpiDense")==0) return MpiDenseEnum; @@ -1612,9 +1613,9 @@ else if (strcmp(name,"TetraInput")==0) return TetraInputEnum; else if (strcmp(name,"ThermalAnalysis")==0) return ThermalAnalysisEnum; - else if (strcmp(name,"ThermalSolution")==0) return ThermalSolutionEnum; else stage=14; } if(stage==14){ - if (strcmp(name,"ThicknessErrorEstimator")==0) return ThicknessErrorEstimatorEnum; + if (strcmp(name,"ThermalSolution")==0) return ThermalSolutionEnum; + else if (strcmp(name,"ThicknessErrorEstimator")==0) return ThicknessErrorEstimatorEnum; else if (strcmp(name,"TotalCalvingFluxLevelset")==0) return TotalCalvingFluxLevelsetEnum; else if (strcmp(name,"TotalCalvingMeltingFluxLevelset")==0) return TotalCalvingMeltingFluxLevelsetEnum; Index: /issm/branches/trunk-larour-SLPS2022/src/c/shared/Enum/issmenums.jl =================================================================== --- /issm/branches/trunk-larour-SLPS2022/src/c/shared/Enum/issmenums.jl (revision 27264) +++ /issm/branches/trunk-larour-SLPS2022/src/c/shared/Enum/issmenums.jl (revision 27265) @@ -846,4 +846,5 @@ SamplingPhiEnum SamplingTauEnum + RelativeSealevelEnum SealevelEnum SealevelGRDEnum @@ -2454,4 +2455,5 @@ if(enum==SamplingPhiEnum) return "SamplingPhi" end if(enum==SamplingTauEnum) return "SamplingTau" end + if(enum==RelativeSealevelEnum) return "RelativeSealevel" end if(enum==SealevelEnum) return "Sealevel" end if(enum==SealevelGRDEnum) return "SealevelGRD" end