diff --git a/ice_ocean_SIS2/Baltic_ALE_z_offline_tracers/MOM_parameter_doc.all b/ice_ocean_SIS2/Baltic_ALE_z_offline_tracers/MOM_parameter_doc.all index 43376d8ac..63760fb9a 100644 --- a/ice_ocean_SIS2/Baltic_ALE_z_offline_tracers/MOM_parameter_doc.all +++ b/ice_ocean_SIS2/Baltic_ALE_z_offline_tracers/MOM_parameter_doc.all @@ -1866,6 +1866,11 @@ LOTW_BBL_USE_OMEGA = True ! [Boolean] default = True ! Otherwise, N is N. VON_KARMAN_BBL = 0.41 ! [nondim] default = 0.41 ! The value the von Karman constant as used in calculating the BBL diffusivity. +LOTW_BBL_ANSWER_DATE = 20190101 ! default = 20190101 + ! The vintage of the order of arithmetic and expressions in the LOTW_BBL + ! calculations. Values below 20240630 recover the original answers, while + ! higher values use more accurate expressions. This only applies when + ! USE_LOTW_BBL_DIFFUSIVITY is true. DZ_BBL_AVG_MIN = 0.0 ! [m] default = 0.0 ! A minimal distance over which to average to determine the average bottom ! boundary layer density. diff --git a/ice_ocean_SIS2/Baltic_OM4_025/MOM_parameter_doc.all b/ice_ocean_SIS2/Baltic_OM4_025/MOM_parameter_doc.all index 4c904f1bf..2657e580d 100644 --- a/ice_ocean_SIS2/Baltic_OM4_025/MOM_parameter_doc.all +++ b/ice_ocean_SIS2/Baltic_OM4_025/MOM_parameter_doc.all @@ -1912,6 +1912,11 @@ LOTW_BBL_USE_OMEGA = True ! [Boolean] default = True ! Otherwise, N is N. VON_KARMAN_BBL = 0.41 ! [nondim] default = 0.41 ! The value the von Karman constant as used in calculating the BBL diffusivity. +LOTW_BBL_ANSWER_DATE = 20190101 ! default = 20190101 + ! The vintage of the order of arithmetic and expressions in the LOTW_BBL + ! calculations. Values below 20240630 recover the original answers, while + ! higher values use more accurate expressions. This only applies when + ! USE_LOTW_BBL_DIFFUSIVITY is true. DZ_BBL_AVG_MIN = 0.0 ! [m] default = 0.0 ! A minimal distance over which to average to determine the average bottom ! boundary layer density. diff --git a/ice_ocean_SIS2/Baltic_OM4_05/MOM_parameter_doc.all b/ice_ocean_SIS2/Baltic_OM4_05/MOM_parameter_doc.all index e3380f439..b91e6c829 100644 --- a/ice_ocean_SIS2/Baltic_OM4_05/MOM_parameter_doc.all +++ b/ice_ocean_SIS2/Baltic_OM4_05/MOM_parameter_doc.all @@ -1931,6 +1931,11 @@ LOTW_BBL_USE_OMEGA = True ! [Boolean] default = True ! Otherwise, N is N. VON_KARMAN_BBL = 0.41 ! [nondim] default = 0.41 ! The value the von Karman constant as used in calculating the BBL diffusivity. +LOTW_BBL_ANSWER_DATE = 20190101 ! default = 20190101 + ! The vintage of the order of arithmetic and expressions in the LOTW_BBL + ! calculations. Values below 20240630 recover the original answers, while + ! higher values use more accurate expressions. This only applies when + ! USE_LOTW_BBL_DIFFUSIVITY is true. DZ_BBL_AVG_MIN = 0.0 ! [m] default = 0.0 ! A minimal distance over which to average to determine the average bottom ! boundary layer density. diff --git a/ice_ocean_SIS2/OM4_025/MOM_parameter_doc.all b/ice_ocean_SIS2/OM4_025/MOM_parameter_doc.all index 752e87d9e..718909d49 100644 --- a/ice_ocean_SIS2/OM4_025/MOM_parameter_doc.all +++ b/ice_ocean_SIS2/OM4_025/MOM_parameter_doc.all @@ -1912,6 +1912,11 @@ LOTW_BBL_USE_OMEGA = True ! [Boolean] default = True ! Otherwise, N is N. VON_KARMAN_BBL = 0.41 ! [nondim] default = 0.41 ! The value the von Karman constant as used in calculating the BBL diffusivity. +LOTW_BBL_ANSWER_DATE = 20190101 ! default = 20190101 + ! The vintage of the order of arithmetic and expressions in the LOTW_BBL + ! calculations. Values below 20240630 recover the original answers, while + ! higher values use more accurate expressions. This only applies when + ! USE_LOTW_BBL_DIFFUSIVITY is true. DZ_BBL_AVG_MIN = 0.0 ! [m] default = 0.0 ! A minimal distance over which to average to determine the average bottom ! boundary layer density. diff --git a/ice_ocean_SIS2/OM4_05/MOM_parameter_doc.all b/ice_ocean_SIS2/OM4_05/MOM_parameter_doc.all index 80380f586..844b38d10 100644 --- a/ice_ocean_SIS2/OM4_05/MOM_parameter_doc.all +++ b/ice_ocean_SIS2/OM4_05/MOM_parameter_doc.all @@ -1931,6 +1931,11 @@ LOTW_BBL_USE_OMEGA = True ! [Boolean] default = True ! Otherwise, N is N. VON_KARMAN_BBL = 0.41 ! [nondim] default = 0.41 ! The value the von Karman constant as used in calculating the BBL diffusivity. +LOTW_BBL_ANSWER_DATE = 20190101 ! default = 20190101 + ! The vintage of the order of arithmetic and expressions in the LOTW_BBL + ! calculations. Values below 20240630 recover the original answers, while + ! higher values use more accurate expressions. This only applies when + ! USE_LOTW_BBL_DIFFUSIVITY is true. DZ_BBL_AVG_MIN = 0.0 ! [m] default = 0.0 ! A minimal distance over which to average to determine the average bottom ! boundary layer density. diff --git a/ice_ocean_SIS2/OM_1deg/MOM_parameter_doc.all b/ice_ocean_SIS2/OM_1deg/MOM_parameter_doc.all index 141694ed7..601b1945b 100644 --- a/ice_ocean_SIS2/OM_1deg/MOM_parameter_doc.all +++ b/ice_ocean_SIS2/OM_1deg/MOM_parameter_doc.all @@ -1890,6 +1890,11 @@ LOTW_BBL_USE_OMEGA = True ! [Boolean] default = True ! Otherwise, N is N. VON_KARMAN_BBL = 0.41 ! [nondim] default = 0.41 ! The value the von Karman constant as used in calculating the BBL diffusivity. +LOTW_BBL_ANSWER_DATE = 20190101 ! default = 20190101 + ! The vintage of the order of arithmetic and expressions in the LOTW_BBL + ! calculations. Values below 20240630 recover the original answers, while + ! higher values use more accurate expressions. This only applies when + ! USE_LOTW_BBL_DIFFUSIVITY is true. DZ_BBL_AVG_MIN = 0.0 ! [m] default = 0.0 ! A minimal distance over which to average to determine the average bottom ! boundary layer density. diff --git a/ocean_only/global_ALE/hycom/MOM_parameter_doc.all b/ocean_only/global_ALE/hycom/MOM_parameter_doc.all index 374fe8ecd..04dc1031d 100644 --- a/ocean_only/global_ALE/hycom/MOM_parameter_doc.all +++ b/ocean_only/global_ALE/hycom/MOM_parameter_doc.all @@ -1916,6 +1916,11 @@ LOTW_BBL_USE_OMEGA = True ! [Boolean] default = True ! Otherwise, N is N. VON_KARMAN_BBL = 0.41 ! [nondim] default = 0.41 ! The value the von Karman constant as used in calculating the BBL diffusivity. +LOTW_BBL_ANSWER_DATE = 20190101 ! default = 20190101 + ! The vintage of the order of arithmetic and expressions in the LOTW_BBL + ! calculations. Values below 20240630 recover the original answers, while + ! higher values use more accurate expressions. This only applies when + ! USE_LOTW_BBL_DIFFUSIVITY is true. DZ_BBL_AVG_MIN = 0.0 ! [m] default = 0.0 ! A minimal distance over which to average to determine the average bottom ! boundary layer density. diff --git a/ocean_only/global_ALE/layer/MOM_parameter_doc.all b/ocean_only/global_ALE/layer/MOM_parameter_doc.all index b346c92e5..c803d99e5 100644 --- a/ocean_only/global_ALE/layer/MOM_parameter_doc.all +++ b/ocean_only/global_ALE/layer/MOM_parameter_doc.all @@ -1769,6 +1769,11 @@ LOTW_BBL_USE_OMEGA = True ! [Boolean] default = True ! Otherwise, N is N. VON_KARMAN_BBL = 0.41 ! [nondim] default = 0.41 ! The value the von Karman constant as used in calculating the BBL diffusivity. +LOTW_BBL_ANSWER_DATE = 20190101 ! default = 20190101 + ! The vintage of the order of arithmetic and expressions in the LOTW_BBL + ! calculations. Values below 20240630 recover the original answers, while + ! higher values use more accurate expressions. This only applies when + ! USE_LOTW_BBL_DIFFUSIVITY is true. DZ_BBL_AVG_MIN = 0.0 ! [m] default = 0.0 ! A minimal distance over which to average to determine the average bottom ! boundary layer density. diff --git a/ocean_only/global_ALE/z/MOM_parameter_doc.all b/ocean_only/global_ALE/z/MOM_parameter_doc.all index 0ad36e452..97126c824 100644 --- a/ocean_only/global_ALE/z/MOM_parameter_doc.all +++ b/ocean_only/global_ALE/z/MOM_parameter_doc.all @@ -1863,6 +1863,11 @@ LOTW_BBL_USE_OMEGA = True ! [Boolean] default = True ! Otherwise, N is N. VON_KARMAN_BBL = 0.41 ! [nondim] default = 0.41 ! The value the von Karman constant as used in calculating the BBL diffusivity. +LOTW_BBL_ANSWER_DATE = 20190101 ! default = 20190101 + ! The vintage of the order of arithmetic and expressions in the LOTW_BBL + ! calculations. Values below 20240630 recover the original answers, while + ! higher values use more accurate expressions. This only applies when + ! USE_LOTW_BBL_DIFFUSIVITY is true. DZ_BBL_AVG_MIN = 0.0 ! [m] default = 0.0 ! A minimal distance over which to average to determine the average bottom ! boundary layer density. diff --git a/src/MOM6 b/src/MOM6 index 88d9eb79f..c4a72dfb0 160000 --- a/src/MOM6 +++ b/src/MOM6 @@ -1 +1 @@ -Subproject commit 88d9eb79fc60ddd07269aa5fd641c9c101df9515 +Subproject commit c4a72dfb0535b13bc995ddd7bb560dc4d268bb81