diff --git a/coupled_AM2_LM3_SIS2/AM2_SIS2_MOM6i_1deg/MOM_parameter_doc.all b/coupled_AM2_LM3_SIS2/AM2_SIS2_MOM6i_1deg/MOM_parameter_doc.all index cf4e0e364..4ef3c092f 100644 --- a/coupled_AM2_LM3_SIS2/AM2_SIS2_MOM6i_1deg/MOM_parameter_doc.all +++ b/coupled_AM2_LM3_SIS2/AM2_SIS2_MOM6i_1deg/MOM_parameter_doc.all @@ -1948,6 +1948,15 @@ RECALC_NEUTRAL_SURF = False ! [Boolean] default = False ! If true, then recalculate the neutral surfaces if the ! diffusive CFL is exceeded. If false, assume that the ! positions of the surfaces do not change +HOR_DIFF_ANSWER_DATE = 20240101 ! default = 20240101 + ! The vintage of the order of arithmetic to use for the tracer diffusion. + ! Values of 20240330 or below recover the answers from the original form of the + ! along-isopycnal mixed layer to interior mixing code, while higher values use + ! mathematically equivalent expressions that recover rotational symmetry when + ! DIFFUSE_ML_TO_INTERIOR is true. +HOR_DIFF_LIMIT_BUG = True ! [Boolean] default = True + ! If true and the answer date is 20240330 or below, use a rotational symmetry + ! breaking bug when limiting the tracer properties in tracer_epipycnal_ML_diff. ML_KHTR_SCALE = 0.0 ! [nondim] default = 1.0 ! With Diffuse_ML_interior, the ratio of the truly horizontal diffusivity in the ! mixed layer to the epipycnal diffusivity. The valid range is 0 to 1. diff --git a/coupled_AM2_LM3_SIS2/Concurrent_ice_1deg/MOM_parameter_doc.all b/coupled_AM2_LM3_SIS2/Concurrent_ice_1deg/MOM_parameter_doc.all index 960db6045..a7552565b 100644 --- a/coupled_AM2_LM3_SIS2/Concurrent_ice_1deg/MOM_parameter_doc.all +++ b/coupled_AM2_LM3_SIS2/Concurrent_ice_1deg/MOM_parameter_doc.all @@ -1948,6 +1948,15 @@ RECALC_NEUTRAL_SURF = False ! [Boolean] default = False ! If true, then recalculate the neutral surfaces if the ! diffusive CFL is exceeded. If false, assume that the ! positions of the surfaces do not change +HOR_DIFF_ANSWER_DATE = 20240101 ! default = 20240101 + ! The vintage of the order of arithmetic to use for the tracer diffusion. + ! Values of 20240330 or below recover the answers from the original form of the + ! along-isopycnal mixed layer to interior mixing code, while higher values use + ! mathematically equivalent expressions that recover rotational symmetry when + ! DIFFUSE_ML_TO_INTERIOR is true. +HOR_DIFF_LIMIT_BUG = True ! [Boolean] default = True + ! If true and the answer date is 20240330 or below, use a rotational symmetry + ! breaking bug when limiting the tracer properties in tracer_epipycnal_ML_diff. ML_KHTR_SCALE = 0.0 ! [nondim] default = 1.0 ! With Diffuse_ML_interior, the ratio of the truly horizontal diffusivity in the ! mixed layer to the epipycnal diffusivity. The valid range is 0 to 1. diff --git a/coupled_AM2_LM3_SIS2/Intersperse_ice_1deg/MOM_parameter_doc.all b/coupled_AM2_LM3_SIS2/Intersperse_ice_1deg/MOM_parameter_doc.all index de5f9346f..17fb09306 100644 --- a/coupled_AM2_LM3_SIS2/Intersperse_ice_1deg/MOM_parameter_doc.all +++ b/coupled_AM2_LM3_SIS2/Intersperse_ice_1deg/MOM_parameter_doc.all @@ -1948,6 +1948,15 @@ RECALC_NEUTRAL_SURF = False ! [Boolean] default = False ! If true, then recalculate the neutral surfaces if the ! diffusive CFL is exceeded. If false, assume that the ! positions of the surfaces do not change +HOR_DIFF_ANSWER_DATE = 20240101 ! default = 20240101 + ! The vintage of the order of arithmetic to use for the tracer diffusion. + ! Values of 20240330 or below recover the answers from the original form of the + ! along-isopycnal mixed layer to interior mixing code, while higher values use + ! mathematically equivalent expressions that recover rotational symmetry when + ! DIFFUSE_ML_TO_INTERIOR is true. +HOR_DIFF_LIMIT_BUG = True ! [Boolean] default = True + ! If true and the answer date is 20240330 or below, use a rotational symmetry + ! breaking bug when limiting the tracer properties in tracer_epipycnal_ML_diff. ML_KHTR_SCALE = 0.0 ! [nondim] default = 1.0 ! With Diffuse_ML_interior, the ratio of the truly horizontal diffusivity in the ! mixed layer to the epipycnal diffusivity. The valid range is 0 to 1. diff --git a/ice_ocean_SIS2/Baltic/MOM_parameter_doc.all b/ice_ocean_SIS2/Baltic/MOM_parameter_doc.all index 4dfe99d1a..6f88ba48e 100644 --- a/ice_ocean_SIS2/Baltic/MOM_parameter_doc.all +++ b/ice_ocean_SIS2/Baltic/MOM_parameter_doc.all @@ -1948,6 +1948,15 @@ RECALC_NEUTRAL_SURF = False ! [Boolean] default = False ! If true, then recalculate the neutral surfaces if the ! diffusive CFL is exceeded. If false, assume that the ! positions of the surfaces do not change +HOR_DIFF_ANSWER_DATE = 20240101 ! default = 20240101 + ! The vintage of the order of arithmetic to use for the tracer diffusion. + ! Values of 20240330 or below recover the answers from the original form of the + ! along-isopycnal mixed layer to interior mixing code, while higher values use + ! mathematically equivalent expressions that recover rotational symmetry when + ! DIFFUSE_ML_TO_INTERIOR is true. +HOR_DIFF_LIMIT_BUG = True ! [Boolean] default = True + ! If true and the answer date is 20240330 or below, use a rotational symmetry + ! breaking bug when limiting the tracer properties in tracer_epipycnal_ML_diff. ML_KHTR_SCALE = 0.0 ! [nondim] default = 1.0 ! With Diffuse_ML_interior, the ratio of the truly horizontal diffusivity in the ! mixed layer to the epipycnal diffusivity. The valid range is 0 to 1. diff --git a/ice_ocean_SIS2/SIS2/MOM_parameter_doc.all b/ice_ocean_SIS2/SIS2/MOM_parameter_doc.all index 98c928284..7fd6b3052 100644 --- a/ice_ocean_SIS2/SIS2/MOM_parameter_doc.all +++ b/ice_ocean_SIS2/SIS2/MOM_parameter_doc.all @@ -1920,6 +1920,15 @@ RECALC_NEUTRAL_SURF = False ! [Boolean] default = False ! If true, then recalculate the neutral surfaces if the ! diffusive CFL is exceeded. If false, assume that the ! positions of the surfaces do not change +HOR_DIFF_ANSWER_DATE = 20240101 ! default = 20240101 + ! The vintage of the order of arithmetic to use for the tracer diffusion. + ! Values of 20240330 or below recover the answers from the original form of the + ! along-isopycnal mixed layer to interior mixing code, while higher values use + ! mathematically equivalent expressions that recover rotational symmetry when + ! DIFFUSE_ML_TO_INTERIOR is true. +HOR_DIFF_LIMIT_BUG = True ! [Boolean] default = True + ! If true and the answer date is 20240330 or below, use a rotational symmetry + ! breaking bug when limiting the tracer properties in tracer_epipycnal_ML_diff. ML_KHTR_SCALE = 0.0 ! [nondim] default = 1.0 ! With Diffuse_ML_interior, the ratio of the truly horizontal diffusivity in the ! mixed layer to the epipycnal diffusivity. The valid range is 0 to 1. diff --git a/ice_ocean_SIS2/SIS2_bergs_cgrid/MOM_parameter_doc.all b/ice_ocean_SIS2/SIS2_bergs_cgrid/MOM_parameter_doc.all index 9abe82be9..e0dd9ed80 100644 --- a/ice_ocean_SIS2/SIS2_bergs_cgrid/MOM_parameter_doc.all +++ b/ice_ocean_SIS2/SIS2_bergs_cgrid/MOM_parameter_doc.all @@ -1924,6 +1924,15 @@ RECALC_NEUTRAL_SURF = False ! [Boolean] default = False ! If true, then recalculate the neutral surfaces if the ! diffusive CFL is exceeded. If false, assume that the ! positions of the surfaces do not change +HOR_DIFF_ANSWER_DATE = 20240101 ! default = 20240101 + ! The vintage of the order of arithmetic to use for the tracer diffusion. + ! Values of 20240330 or below recover the answers from the original form of the + ! along-isopycnal mixed layer to interior mixing code, while higher values use + ! mathematically equivalent expressions that recover rotational symmetry when + ! DIFFUSE_ML_TO_INTERIOR is true. +HOR_DIFF_LIMIT_BUG = True ! [Boolean] default = True + ! If true and the answer date is 20240330 or below, use a rotational symmetry + ! breaking bug when limiting the tracer properties in tracer_epipycnal_ML_diff. ML_KHTR_SCALE = 0.0 ! [nondim] default = 1.0 ! With Diffuse_ML_interior, the ratio of the truly horizontal diffusivity in the ! mixed layer to the epipycnal diffusivity. The valid range is 0 to 1. diff --git a/ice_ocean_SIS2/SIS2_cgrid/MOM_parameter_doc.all b/ice_ocean_SIS2/SIS2_cgrid/MOM_parameter_doc.all index d584768f1..9db3f0508 100644 --- a/ice_ocean_SIS2/SIS2_cgrid/MOM_parameter_doc.all +++ b/ice_ocean_SIS2/SIS2_cgrid/MOM_parameter_doc.all @@ -1920,6 +1920,15 @@ RECALC_NEUTRAL_SURF = False ! [Boolean] default = False ! If true, then recalculate the neutral surfaces if the ! diffusive CFL is exceeded. If false, assume that the ! positions of the surfaces do not change +HOR_DIFF_ANSWER_DATE = 20240101 ! default = 20240101 + ! The vintage of the order of arithmetic to use for the tracer diffusion. + ! Values of 20240330 or below recover the answers from the original form of the + ! along-isopycnal mixed layer to interior mixing code, while higher values use + ! mathematically equivalent expressions that recover rotational symmetry when + ! DIFFUSE_ML_TO_INTERIOR is true. +HOR_DIFF_LIMIT_BUG = True ! [Boolean] default = True + ! If true and the answer date is 20240330 or below, use a rotational symmetry + ! breaking bug when limiting the tracer properties in tracer_epipycnal_ML_diff. ML_KHTR_SCALE = 0.0 ! [nondim] default = 1.0 ! With Diffuse_ML_interior, the ratio of the truly horizontal diffusivity in the ! mixed layer to the epipycnal diffusivity. The valid range is 0 to 1. diff --git a/ocean_only/benchmark/MOM_parameter_doc.all b/ocean_only/benchmark/MOM_parameter_doc.all index 0018d694a..cf51d8ada 100644 --- a/ocean_only/benchmark/MOM_parameter_doc.all +++ b/ocean_only/benchmark/MOM_parameter_doc.all @@ -1717,6 +1717,15 @@ RECALC_NEUTRAL_SURF = False ! [Boolean] default = False ! If true, then recalculate the neutral surfaces if the ! diffusive CFL is exceeded. If false, assume that the ! positions of the surfaces do not change +HOR_DIFF_ANSWER_DATE = 20240101 ! default = 20240101 + ! The vintage of the order of arithmetic to use for the tracer diffusion. + ! Values of 20240330 or below recover the answers from the original form of the + ! along-isopycnal mixed layer to interior mixing code, while higher values use + ! mathematically equivalent expressions that recover rotational symmetry when + ! DIFFUSE_ML_TO_INTERIOR is true. +HOR_DIFF_LIMIT_BUG = True ! [Boolean] default = True + ! If true and the answer date is 20240330 or below, use a rotational symmetry + ! breaking bug when limiting the tracer properties in tracer_epipycnal_ML_diff. ML_KHTR_SCALE = 0.0 ! [nondim] default = 1.0 ! With Diffuse_ML_interior, the ratio of the truly horizontal diffusivity in the ! mixed layer to the epipycnal diffusivity. The valid range is 0 to 1. diff --git a/ocean_only/nonBous_global/MOM_parameter_doc.all b/ocean_only/nonBous_global/MOM_parameter_doc.all index 29fb37573..5b1ba5afb 100644 --- a/ocean_only/nonBous_global/MOM_parameter_doc.all +++ b/ocean_only/nonBous_global/MOM_parameter_doc.all @@ -1899,6 +1899,15 @@ RECALC_NEUTRAL_SURF = False ! [Boolean] default = False ! If true, then recalculate the neutral surfaces if the ! diffusive CFL is exceeded. If false, assume that the ! positions of the surfaces do not change +HOR_DIFF_ANSWER_DATE = 20240101 ! default = 20240101 + ! The vintage of the order of arithmetic to use for the tracer diffusion. + ! Values of 20240330 or below recover the answers from the original form of the + ! along-isopycnal mixed layer to interior mixing code, while higher values use + ! mathematically equivalent expressions that recover rotational symmetry when + ! DIFFUSE_ML_TO_INTERIOR is true. +HOR_DIFF_LIMIT_BUG = True ! [Boolean] default = True + ! If true and the answer date is 20240330 or below, use a rotational symmetry + ! breaking bug when limiting the tracer properties in tracer_epipycnal_ML_diff. ML_KHTR_SCALE = 0.0 ! [nondim] default = 1.0 ! With Diffuse_ML_interior, the ratio of the truly horizontal diffusivity in the ! mixed layer to the epipycnal diffusivity. The valid range is 0 to 1. diff --git a/src/MOM6 b/src/MOM6 index 37ff301a6..a3fd1f3a7 160000 --- a/src/MOM6 +++ b/src/MOM6 @@ -1 +1 @@ -Subproject commit 37ff301a65817e7212cd7743c66fb406fc2b9223 +Subproject commit a3fd1f3a7466e886b45af116ae93db6111e4c644