From fc8e4c750581c4f0f6d28db35227fdb860c8e391 Mon Sep 17 00:00:00 2001 From: MOM6 bot Date: Sat, 25 Jan 2025 12:06:23 -0500 Subject: [PATCH] MOM6: +(*)EPBL_BBL_EFFIC_BUG & DRAG_DIFFUSIVITY_ANSWER_DATE - NOAA-GFDL/MOM6@a645328be +(*)EPBL_BBL_EFFIC_BUG & DRAG_DIFFUSIVITY_ANSWER_DATE - NOAA-GFDL/MOM6@4f53784df +Add EPBL_BBL_TIDAL_EFFIC - NOAA-GFDL/MOM6@e856749b3 +Rename fluxes%TKE_tidal to fluxes%BBL_tidal_dis - NOAA-GFDL/MOM6@fcdf8db44 +Rename visc%TKE_BBL to visc%BBL_meanKE_loss - NOAA-GFDL/MOM6@93227b339 Rescale 7 ice shelf variables - NOAA-GFDL/MOM6@2ade89713 Refactor spherical_harmonics_forward - NOAA-GFDL/MOM6@320aac2fa Remove implicit copies in CT_extract_data rotation - NOAA-GFDL/MOM6@094eb5487 Fix rotation in set_coupler_type_data - NOAA-GFDL/MOM6@3be1543a2 Corrected many unit descriptions in comments - NOAA-GFDL/MOM6@83c7119a2 Fix rescaling of internal tide of debugging code - NOAA-GFDL/MOM6@576fb414b Diagnose area integrated fluxes in rescaled units - NOAA-GFDL/MOM6@7a5adc77c +Refactor the spatial mean calculations - NOAA-GFDL/MOM6@30df138d5 Fix dimensional rescaling in predict_MEKE --- .../AM2_SIS2_MOM6i_1deg/MOM_parameter_doc.all | 6 ++++++ .../Concurrent_ice_1deg/MOM_parameter_doc.all | 6 ++++++ .../Intersperse_ice_1deg/MOM_parameter_doc.all | 6 ++++++ ice_ocean_SIS2/Baltic/MOM_parameter_doc.all | 6 ++++++ .../Baltic_ALE_z_offline_tracers/MOM_parameter_doc.all | 5 +++++ ice_ocean_SIS2/Baltic_OM4_025/MOM_parameter_doc.all | 5 +++++ ice_ocean_SIS2/Baltic_OM4_05/MOM_parameter_doc.all | 5 +++++ ice_ocean_SIS2/OM4_025/MOM_parameter_doc.all | 5 +++++ ice_ocean_SIS2/OM4_05/MOM_parameter_doc.all | 5 +++++ ice_ocean_SIS2/OM_1deg/MOM_parameter_doc.all | 5 +++++ ice_ocean_SIS2/SIS2/MOM_parameter_doc.all | 6 ++++++ ice_ocean_SIS2/SIS2_bergs_cgrid/MOM_parameter_doc.all | 6 ++++++ ice_ocean_SIS2/SIS2_cgrid/MOM_parameter_doc.all | 6 ++++++ .../cooling_only/BML/MOM_parameter_doc.all | 6 ++++++ .../cooling_only/EPBL/MOM_parameter_doc.all | 9 +++++++++ .../cooling_only/KPP/MOM_parameter_doc.all | 6 ++++++ .../CVmix_SCM_tests/mech_only/BML/MOM_parameter_doc.all | 6 ++++++ .../CVmix_SCM_tests/mech_only/EPBL/MOM_parameter_doc.all | 9 +++++++++ .../CVmix_SCM_tests/mech_only/KPP/MOM_parameter_doc.all | 6 ++++++ .../skin_warming_wind/BML/MOM_parameter_doc.all | 6 ++++++ .../skin_warming_wind/EPBL/MOM_parameter_doc.all | 9 +++++++++ .../skin_warming_wind/KPP/MOM_parameter_doc.all | 6 ++++++ .../CVmix_SCM_tests/wind_only/BML/MOM_parameter_doc.all | 6 ++++++ .../CVmix_SCM_tests/wind_only/EPBL/MOM_parameter_doc.all | 9 +++++++++ .../CVmix_SCM_tests/wind_only/KPP/MOM_parameter_doc.all | 6 ++++++ ocean_only/DOME/MOM_parameter_doc.all | 6 ++++++ ocean_only/Phillips_2layer/MOM_parameter_doc.all | 6 ++++++ ocean_only/SCM_idealized_hurricane/MOM_parameter_doc.all | 6 ++++++ ocean_only/adjustment2d/layer/MOM_parameter_doc.all | 2 ++ ocean_only/adjustment2d/rho/MOM_parameter_doc.all | 2 ++ ocean_only/adjustment2d/z/MOM_parameter_doc.all | 2 ++ ocean_only/benchmark/MOM_parameter_doc.all | 6 ++++++ ocean_only/circle_obcs/MOM_parameter_doc.all | 6 ++++++ ocean_only/external_gwave/MOM_parameter_doc.all | 2 ++ ocean_only/flow_downslope/layer/MOM_parameter_doc.all | 6 ++++++ ocean_only/flow_downslope/rho/MOM_parameter_doc.all | 6 ++++++ ocean_only/flow_downslope/sigma/MOM_parameter_doc.all | 6 ++++++ ocean_only/flow_downslope/z/MOM_parameter_doc.all | 6 ++++++ ocean_only/global_ALE/hycom/MOM_parameter_doc.all | 5 +++++ ocean_only/global_ALE/layer/MOM_parameter_doc.all | 2 ++ ocean_only/global_ALE/z/MOM_parameter_doc.all | 5 +++++ ocean_only/lock_exchange/MOM_parameter_doc.all | 2 ++ ocean_only/mixed_layer_restrat_2d/MOM_parameter_doc.all | 6 ++++++ ocean_only/nonBous_global/MOM_parameter_doc.all | 4 ++++ ocean_only/resting/layer/MOM_parameter_doc.all | 2 ++ ocean_only/resting/z/MOM_parameter_doc.all | 2 ++ ocean_only/seamount/layer/MOM_parameter_doc.all | 2 ++ ocean_only/seamount/rho/MOM_parameter_doc.all | 2 ++ ocean_only/seamount/sigma/MOM_parameter_doc.all | 2 ++ ocean_only/seamount/z/MOM_parameter_doc.all | 2 ++ ocean_only/single_column/BML/MOM_parameter_doc.all | 6 ++++++ ocean_only/single_column/EPBL/MOM_parameter_doc.all | 9 +++++++++ ocean_only/single_column/KPP/MOM_parameter_doc.all | 6 ++++++ ocean_only/sloshing/layer/MOM_parameter_doc.all | 2 ++ ocean_only/sloshing/rho/MOM_parameter_doc.all | 2 ++ ocean_only/sloshing/z/MOM_parameter_doc.all | 2 ++ ocean_only/torus_advection_test/MOM_parameter_doc.all | 2 ++ ocean_only/tracer_mixing/rho/MOM_parameter_doc.all | 2 ++ ocean_only/tracer_mixing/z/MOM_parameter_doc.all | 2 ++ src/MOM6 | 2 +- 60 files changed, 288 insertions(+), 1 deletion(-) 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 4549550a6..7e77b5e5d 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 @@ -1535,6 +1535,8 @@ SET_DIFF_ANSWER_DATE = 20181231 ! default = 20181231 ! The vintage of the order of arithmetic and expressions in the set diffusivity ! calculations. Values below 20190101 recover the answers from the end of 2018, ! while higher values use updated and more robust forms of the same expressions. + ! Values above 20250301 also use less confusing expressions to set the + ! bottom-drag generated diffusivity when USE_LOTW_BBL_DIFFUSIVITY is false. ! === module MOM_tidal_mixing === ! Vertical Tidal Mixing Parameterization @@ -1642,6 +1644,10 @@ USE_LOTW_BBL_DIFFUSIVITY = False ! [Boolean] default = False ! If true, uses a simple, imprecise but non-coordinate dependent, model of BBL ! mixing diffusivity based on Law of the Wall. Otherwise, uses the original BBL ! scheme. +DRAG_DIFFUSIVITY_ANSWER_DATE = 20250101 ! default = 20250101 + ! The vintage of the order of arithmetic in the drag diffusivity calculations. + ! Values above 20250301 use less confusing expressions to set the bottom-drag + ! generated diffusivity when USE_LOTW_BBL_DIFFUSIVITY is false. 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/coupled_AM2_LM3_SIS2/Concurrent_ice_1deg/MOM_parameter_doc.all b/coupled_AM2_LM3_SIS2/Concurrent_ice_1deg/MOM_parameter_doc.all index f8466ca41..ff1e7ee91 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 @@ -1535,6 +1535,8 @@ SET_DIFF_ANSWER_DATE = 99991231 ! default = 99991231 ! The vintage of the order of arithmetic and expressions in the set diffusivity ! calculations. Values below 20190101 recover the answers from the end of 2018, ! while higher values use updated and more robust forms of the same expressions. + ! Values above 20250301 also use less confusing expressions to set the + ! bottom-drag generated diffusivity when USE_LOTW_BBL_DIFFUSIVITY is false. ! === module MOM_tidal_mixing === ! Vertical Tidal Mixing Parameterization @@ -1642,6 +1644,10 @@ USE_LOTW_BBL_DIFFUSIVITY = False ! [Boolean] default = False ! If true, uses a simple, imprecise but non-coordinate dependent, model of BBL ! mixing diffusivity based on Law of the Wall. Otherwise, uses the original BBL ! scheme. +DRAG_DIFFUSIVITY_ANSWER_DATE = 20250101 ! default = 20250101 + ! The vintage of the order of arithmetic in the drag diffusivity calculations. + ! Values above 20250301 use less confusing expressions to set the bottom-drag + ! generated diffusivity when USE_LOTW_BBL_DIFFUSIVITY is false. 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/coupled_AM2_LM3_SIS2/Intersperse_ice_1deg/MOM_parameter_doc.all b/coupled_AM2_LM3_SIS2/Intersperse_ice_1deg/MOM_parameter_doc.all index b652f6e62..3a27a2d2f 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 @@ -1535,6 +1535,8 @@ SET_DIFF_ANSWER_DATE = 99991231 ! default = 99991231 ! The vintage of the order of arithmetic and expressions in the set diffusivity ! calculations. Values below 20190101 recover the answers from the end of 2018, ! while higher values use updated and more robust forms of the same expressions. + ! Values above 20250301 also use less confusing expressions to set the + ! bottom-drag generated diffusivity when USE_LOTW_BBL_DIFFUSIVITY is false. ! === module MOM_tidal_mixing === ! Vertical Tidal Mixing Parameterization @@ -1642,6 +1644,10 @@ USE_LOTW_BBL_DIFFUSIVITY = False ! [Boolean] default = False ! If true, uses a simple, imprecise but non-coordinate dependent, model of BBL ! mixing diffusivity based on Law of the Wall. Otherwise, uses the original BBL ! scheme. +DRAG_DIFFUSIVITY_ANSWER_DATE = 20250101 ! default = 20250101 + ! The vintage of the order of arithmetic in the drag diffusivity calculations. + ! Values above 20250301 use less confusing expressions to set the bottom-drag + ! generated diffusivity when USE_LOTW_BBL_DIFFUSIVITY is false. 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/MOM_parameter_doc.all b/ice_ocean_SIS2/Baltic/MOM_parameter_doc.all index e48d660ad..e74e7fe35 100644 --- a/ice_ocean_SIS2/Baltic/MOM_parameter_doc.all +++ b/ice_ocean_SIS2/Baltic/MOM_parameter_doc.all @@ -1535,6 +1535,8 @@ SET_DIFF_ANSWER_DATE = 99991231 ! default = 99991231 ! The vintage of the order of arithmetic and expressions in the set diffusivity ! calculations. Values below 20190101 recover the answers from the end of 2018, ! while higher values use updated and more robust forms of the same expressions. + ! Values above 20250301 also use less confusing expressions to set the + ! bottom-drag generated diffusivity when USE_LOTW_BBL_DIFFUSIVITY is false. ! === module MOM_tidal_mixing === ! Vertical Tidal Mixing Parameterization @@ -1642,6 +1644,10 @@ USE_LOTW_BBL_DIFFUSIVITY = False ! [Boolean] default = False ! If true, uses a simple, imprecise but non-coordinate dependent, model of BBL ! mixing diffusivity based on Law of the Wall. Otherwise, uses the original BBL ! scheme. +DRAG_DIFFUSIVITY_ANSWER_DATE = 20250101 ! default = 20250101 + ! The vintage of the order of arithmetic in the drag diffusivity calculations. + ! Values above 20250301 use less confusing expressions to set the bottom-drag + ! generated diffusivity when USE_LOTW_BBL_DIFFUSIVITY is false. 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_ALE_z_offline_tracers/MOM_parameter_doc.all b/ice_ocean_SIS2/Baltic_ALE_z_offline_tracers/MOM_parameter_doc.all index add627981..e541ad66d 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 @@ -1835,6 +1835,8 @@ SET_DIFF_ANSWER_DATE = 99991231 ! default = 99991231 ! The vintage of the order of arithmetic and expressions in the set diffusivity ! calculations. Values below 20190101 recover the answers from the end of 2018, ! while higher values use updated and more robust forms of the same expressions. + ! Values above 20250301 also use less confusing expressions to set the + ! bottom-drag generated diffusivity when USE_LOTW_BBL_DIFFUSIVITY is false. ! === module MOM_tidal_mixing === ! Vertical Tidal Mixing Parameterization @@ -2203,6 +2205,9 @@ VSTAR_SURF_FAC = 1.2 ! [nondim] default = 1.2 EPBL_BBL_EFFIC = 0.0 ! [nondim] default = 0.0 ! The efficiency of bottom boundary layer mixing via ePBL. Setting this to a ! value that is greater than 0 to enable bottom boundary layer mixing from EPBL. +EPBL_BBL_TIDAL_EFFIC = 0.0 ! [nondim] default = 0.0 + ! The efficiency of bottom boundary layer mixing via ePBL driven by the bottom + ! drag dissipation of tides, as provided in fluxes%BBL_tidal_dis. USE_LA_LI2016 = False ! [Boolean] default = False ! A logical to use the Li et al. 2016 (submitted) formula to determine the ! Langmuir number. 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 59657fd0e..c82843db4 100644 --- a/ice_ocean_SIS2/Baltic_OM4_025/MOM_parameter_doc.all +++ b/ice_ocean_SIS2/Baltic_OM4_025/MOM_parameter_doc.all @@ -1829,6 +1829,8 @@ SET_DIFF_ANSWER_DATE = 20181231 ! default = 20181231 ! The vintage of the order of arithmetic and expressions in the set diffusivity ! calculations. Values below 20190101 recover the answers from the end of 2018, ! while higher values use updated and more robust forms of the same expressions. + ! Values above 20250301 also use less confusing expressions to set the + ! bottom-drag generated diffusivity when USE_LOTW_BBL_DIFFUSIVITY is false. ! === module MOM_tidal_mixing === ! Vertical Tidal Mixing Parameterization @@ -2241,6 +2243,9 @@ VSTAR_SURF_FAC = 1.2 ! [nondim] default = 1.2 EPBL_BBL_EFFIC = 0.0 ! [nondim] default = 0.0 ! The efficiency of bottom boundary layer mixing via ePBL. Setting this to a ! value that is greater than 0 to enable bottom boundary layer mixing from EPBL. +EPBL_BBL_TIDAL_EFFIC = 0.0 ! [nondim] default = 0.0 + ! The efficiency of bottom boundary layer mixing via ePBL driven by the bottom + ! drag dissipation of tides, as provided in fluxes%BBL_tidal_dis. USE_LA_LI2016 = True ! [Boolean] default = False ! A logical to use the Li et al. 2016 (submitted) formula to determine the ! Langmuir number. 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 8bd0496b8..3d2e274e6 100644 --- a/ice_ocean_SIS2/Baltic_OM4_05/MOM_parameter_doc.all +++ b/ice_ocean_SIS2/Baltic_OM4_05/MOM_parameter_doc.all @@ -1848,6 +1848,8 @@ SET_DIFF_ANSWER_DATE = 20181231 ! default = 20181231 ! The vintage of the order of arithmetic and expressions in the set diffusivity ! calculations. Values below 20190101 recover the answers from the end of 2018, ! while higher values use updated and more robust forms of the same expressions. + ! Values above 20250301 also use less confusing expressions to set the + ! bottom-drag generated diffusivity when USE_LOTW_BBL_DIFFUSIVITY is false. ! === module MOM_tidal_mixing === ! Vertical Tidal Mixing Parameterization @@ -2260,6 +2262,9 @@ VSTAR_SURF_FAC = 1.2 ! [nondim] default = 1.2 EPBL_BBL_EFFIC = 0.0 ! [nondim] default = 0.0 ! The efficiency of bottom boundary layer mixing via ePBL. Setting this to a ! value that is greater than 0 to enable bottom boundary layer mixing from EPBL. +EPBL_BBL_TIDAL_EFFIC = 0.0 ! [nondim] default = 0.0 + ! The efficiency of bottom boundary layer mixing via ePBL driven by the bottom + ! drag dissipation of tides, as provided in fluxes%BBL_tidal_dis. USE_LA_LI2016 = True ! [Boolean] default = False ! A logical to use the Li et al. 2016 (submitted) formula to determine the ! Langmuir number. diff --git a/ice_ocean_SIS2/OM4_025/MOM_parameter_doc.all b/ice_ocean_SIS2/OM4_025/MOM_parameter_doc.all index d7cb69a3d..be0e79ab5 100644 --- a/ice_ocean_SIS2/OM4_025/MOM_parameter_doc.all +++ b/ice_ocean_SIS2/OM4_025/MOM_parameter_doc.all @@ -1829,6 +1829,8 @@ SET_DIFF_ANSWER_DATE = 20181231 ! default = 20181231 ! The vintage of the order of arithmetic and expressions in the set diffusivity ! calculations. Values below 20190101 recover the answers from the end of 2018, ! while higher values use updated and more robust forms of the same expressions. + ! Values above 20250301 also use less confusing expressions to set the + ! bottom-drag generated diffusivity when USE_LOTW_BBL_DIFFUSIVITY is false. ! === module MOM_tidal_mixing === ! Vertical Tidal Mixing Parameterization @@ -2241,6 +2243,9 @@ VSTAR_SURF_FAC = 1.2 ! [nondim] default = 1.2 EPBL_BBL_EFFIC = 0.0 ! [nondim] default = 0.0 ! The efficiency of bottom boundary layer mixing via ePBL. Setting this to a ! value that is greater than 0 to enable bottom boundary layer mixing from EPBL. +EPBL_BBL_TIDAL_EFFIC = 0.0 ! [nondim] default = 0.0 + ! The efficiency of bottom boundary layer mixing via ePBL driven by the bottom + ! drag dissipation of tides, as provided in fluxes%BBL_tidal_dis. USE_LA_LI2016 = True ! [Boolean] default = False ! A logical to use the Li et al. 2016 (submitted) formula to determine the ! Langmuir number. diff --git a/ice_ocean_SIS2/OM4_05/MOM_parameter_doc.all b/ice_ocean_SIS2/OM4_05/MOM_parameter_doc.all index 89407f48a..2f459b2f7 100644 --- a/ice_ocean_SIS2/OM4_05/MOM_parameter_doc.all +++ b/ice_ocean_SIS2/OM4_05/MOM_parameter_doc.all @@ -1848,6 +1848,8 @@ SET_DIFF_ANSWER_DATE = 20181231 ! default = 20181231 ! The vintage of the order of arithmetic and expressions in the set diffusivity ! calculations. Values below 20190101 recover the answers from the end of 2018, ! while higher values use updated and more robust forms of the same expressions. + ! Values above 20250301 also use less confusing expressions to set the + ! bottom-drag generated diffusivity when USE_LOTW_BBL_DIFFUSIVITY is false. ! === module MOM_tidal_mixing === ! Vertical Tidal Mixing Parameterization @@ -2260,6 +2262,9 @@ VSTAR_SURF_FAC = 1.2 ! [nondim] default = 1.2 EPBL_BBL_EFFIC = 0.0 ! [nondim] default = 0.0 ! The efficiency of bottom boundary layer mixing via ePBL. Setting this to a ! value that is greater than 0 to enable bottom boundary layer mixing from EPBL. +EPBL_BBL_TIDAL_EFFIC = 0.0 ! [nondim] default = 0.0 + ! The efficiency of bottom boundary layer mixing via ePBL driven by the bottom + ! drag dissipation of tides, as provided in fluxes%BBL_tidal_dis. USE_LA_LI2016 = True ! [Boolean] default = False ! A logical to use the Li et al. 2016 (submitted) formula to determine the ! Langmuir number. diff --git a/ice_ocean_SIS2/OM_1deg/MOM_parameter_doc.all b/ice_ocean_SIS2/OM_1deg/MOM_parameter_doc.all index 67f067c17..e5c856a19 100644 --- a/ice_ocean_SIS2/OM_1deg/MOM_parameter_doc.all +++ b/ice_ocean_SIS2/OM_1deg/MOM_parameter_doc.all @@ -1807,6 +1807,8 @@ SET_DIFF_ANSWER_DATE = 20181231 ! default = 20181231 ! The vintage of the order of arithmetic and expressions in the set diffusivity ! calculations. Values below 20190101 recover the answers from the end of 2018, ! while higher values use updated and more robust forms of the same expressions. + ! Values above 20250301 also use less confusing expressions to set the + ! bottom-drag generated diffusivity when USE_LOTW_BBL_DIFFUSIVITY is false. ! === module MOM_tidal_mixing === ! Vertical Tidal Mixing Parameterization @@ -2200,6 +2202,9 @@ VSTAR_SURF_FAC = 1.2 ! [nondim] default = 1.2 EPBL_BBL_EFFIC = 0.0 ! [nondim] default = 0.0 ! The efficiency of bottom boundary layer mixing via ePBL. Setting this to a ! value that is greater than 0 to enable bottom boundary layer mixing from EPBL. +EPBL_BBL_TIDAL_EFFIC = 0.0 ! [nondim] default = 0.0 + ! The efficiency of bottom boundary layer mixing via ePBL driven by the bottom + ! drag dissipation of tides, as provided in fluxes%BBL_tidal_dis. USE_LA_LI2016 = True ! [Boolean] default = False ! A logical to use the Li et al. 2016 (submitted) formula to determine the ! Langmuir number. diff --git a/ice_ocean_SIS2/SIS2/MOM_parameter_doc.all b/ice_ocean_SIS2/SIS2/MOM_parameter_doc.all index da74f693b..38e6c84f0 100644 --- a/ice_ocean_SIS2/SIS2/MOM_parameter_doc.all +++ b/ice_ocean_SIS2/SIS2/MOM_parameter_doc.all @@ -1502,6 +1502,8 @@ SET_DIFF_ANSWER_DATE = 99991231 ! default = 99991231 ! The vintage of the order of arithmetic and expressions in the set diffusivity ! calculations. Values below 20190101 recover the answers from the end of 2018, ! while higher values use updated and more robust forms of the same expressions. + ! Values above 20250301 also use less confusing expressions to set the + ! bottom-drag generated diffusivity when USE_LOTW_BBL_DIFFUSIVITY is false. ! === module MOM_tidal_mixing === ! Vertical Tidal Mixing Parameterization @@ -1609,6 +1611,10 @@ USE_LOTW_BBL_DIFFUSIVITY = False ! [Boolean] default = False ! If true, uses a simple, imprecise but non-coordinate dependent, model of BBL ! mixing diffusivity based on Law of the Wall. Otherwise, uses the original BBL ! scheme. +DRAG_DIFFUSIVITY_ANSWER_DATE = 20250101 ! default = 20250101 + ! The vintage of the order of arithmetic in the drag diffusivity calculations. + ! Values above 20250301 use less confusing expressions to set the bottom-drag + ! generated diffusivity when USE_LOTW_BBL_DIFFUSIVITY is false. 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/SIS2_bergs_cgrid/MOM_parameter_doc.all b/ice_ocean_SIS2/SIS2_bergs_cgrid/MOM_parameter_doc.all index 5f5ad49ec..a5d19b1d3 100644 --- a/ice_ocean_SIS2/SIS2_bergs_cgrid/MOM_parameter_doc.all +++ b/ice_ocean_SIS2/SIS2_bergs_cgrid/MOM_parameter_doc.all @@ -1502,6 +1502,8 @@ SET_DIFF_ANSWER_DATE = 99991231 ! default = 99991231 ! The vintage of the order of arithmetic and expressions in the set diffusivity ! calculations. Values below 20190101 recover the answers from the end of 2018, ! while higher values use updated and more robust forms of the same expressions. + ! Values above 20250301 also use less confusing expressions to set the + ! bottom-drag generated diffusivity when USE_LOTW_BBL_DIFFUSIVITY is false. ! === module MOM_tidal_mixing === ! Vertical Tidal Mixing Parameterization @@ -1609,6 +1611,10 @@ USE_LOTW_BBL_DIFFUSIVITY = False ! [Boolean] default = False ! If true, uses a simple, imprecise but non-coordinate dependent, model of BBL ! mixing diffusivity based on Law of the Wall. Otherwise, uses the original BBL ! scheme. +DRAG_DIFFUSIVITY_ANSWER_DATE = 20250101 ! default = 20250101 + ! The vintage of the order of arithmetic in the drag diffusivity calculations. + ! Values above 20250301 use less confusing expressions to set the bottom-drag + ! generated diffusivity when USE_LOTW_BBL_DIFFUSIVITY is false. 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/SIS2_cgrid/MOM_parameter_doc.all b/ice_ocean_SIS2/SIS2_cgrid/MOM_parameter_doc.all index bf0fee61a..46e83c1da 100644 --- a/ice_ocean_SIS2/SIS2_cgrid/MOM_parameter_doc.all +++ b/ice_ocean_SIS2/SIS2_cgrid/MOM_parameter_doc.all @@ -1502,6 +1502,8 @@ SET_DIFF_ANSWER_DATE = 99991231 ! default = 99991231 ! The vintage of the order of arithmetic and expressions in the set diffusivity ! calculations. Values below 20190101 recover the answers from the end of 2018, ! while higher values use updated and more robust forms of the same expressions. + ! Values above 20250301 also use less confusing expressions to set the + ! bottom-drag generated diffusivity when USE_LOTW_BBL_DIFFUSIVITY is false. ! === module MOM_tidal_mixing === ! Vertical Tidal Mixing Parameterization @@ -1609,6 +1611,10 @@ USE_LOTW_BBL_DIFFUSIVITY = False ! [Boolean] default = False ! If true, uses a simple, imprecise but non-coordinate dependent, model of BBL ! mixing diffusivity based on Law of the Wall. Otherwise, uses the original BBL ! scheme. +DRAG_DIFFUSIVITY_ANSWER_DATE = 20250101 ! default = 20250101 + ! The vintage of the order of arithmetic in the drag diffusivity calculations. + ! Values above 20250301 use less confusing expressions to set the bottom-drag + ! generated diffusivity when USE_LOTW_BBL_DIFFUSIVITY is false. 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/CVmix_SCM_tests/cooling_only/BML/MOM_parameter_doc.all b/ocean_only/CVmix_SCM_tests/cooling_only/BML/MOM_parameter_doc.all index c220ca325..0d79bd7e2 100644 --- a/ocean_only/CVmix_SCM_tests/cooling_only/BML/MOM_parameter_doc.all +++ b/ocean_only/CVmix_SCM_tests/cooling_only/BML/MOM_parameter_doc.all @@ -1090,6 +1090,8 @@ SET_DIFF_ANSWER_DATE = 99991231 ! default = 99991231 ! The vintage of the order of arithmetic and expressions in the set diffusivity ! calculations. Values below 20190101 recover the answers from the end of 2018, ! while higher values use updated and more robust forms of the same expressions. + ! Values above 20250301 also use less confusing expressions to set the + ! bottom-drag generated diffusivity when USE_LOTW_BBL_DIFFUSIVITY is false. ! === module MOM_tidal_mixing === ! Vertical Tidal Mixing Parameterization @@ -1116,6 +1118,10 @@ USE_LOTW_BBL_DIFFUSIVITY = False ! [Boolean] default = False ! If true, uses a simple, imprecise but non-coordinate dependent, model of BBL ! mixing diffusivity based on Law of the Wall. Otherwise, uses the original BBL ! scheme. +DRAG_DIFFUSIVITY_ANSWER_DATE = 20250101 ! default = 20250101 + ! The vintage of the order of arithmetic in the drag diffusivity calculations. + ! Values above 20250301 use less confusing expressions to set the bottom-drag + ! generated diffusivity when USE_LOTW_BBL_DIFFUSIVITY is false. 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/CVmix_SCM_tests/cooling_only/EPBL/MOM_parameter_doc.all b/ocean_only/CVmix_SCM_tests/cooling_only/EPBL/MOM_parameter_doc.all index a1b240b61..7aa6c2501 100644 --- a/ocean_only/CVmix_SCM_tests/cooling_only/EPBL/MOM_parameter_doc.all +++ b/ocean_only/CVmix_SCM_tests/cooling_only/EPBL/MOM_parameter_doc.all @@ -1211,6 +1211,8 @@ SET_DIFF_ANSWER_DATE = 99991231 ! default = 99991231 ! The vintage of the order of arithmetic and expressions in the set diffusivity ! calculations. Values below 20190101 recover the answers from the end of 2018, ! while higher values use updated and more robust forms of the same expressions. + ! Values above 20250301 also use less confusing expressions to set the + ! bottom-drag generated diffusivity when USE_LOTW_BBL_DIFFUSIVITY is false. ! === module MOM_tidal_mixing === ! Vertical Tidal Mixing Parameterization @@ -1237,6 +1239,10 @@ USE_LOTW_BBL_DIFFUSIVITY = False ! [Boolean] default = False ! If true, uses a simple, imprecise but non-coordinate dependent, model of BBL ! mixing diffusivity based on Law of the Wall. Otherwise, uses the original BBL ! scheme. +DRAG_DIFFUSIVITY_ANSWER_DATE = 20250101 ! default = 20250101 + ! The vintage of the order of arithmetic in the drag diffusivity calculations. + ! Values above 20250301 use less confusing expressions to set the bottom-drag + ! generated diffusivity when USE_LOTW_BBL_DIFFUSIVITY is false. 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. @@ -1434,6 +1440,9 @@ VSTAR_SURF_FAC = 1.2 ! [nondim] default = 1.2 EPBL_BBL_EFFIC = 0.0 ! [nondim] default = 0.0 ! The efficiency of bottom boundary layer mixing via ePBL. Setting this to a ! value that is greater than 0 to enable bottom boundary layer mixing from EPBL. +EPBL_BBL_TIDAL_EFFIC = 0.0 ! [nondim] default = 0.0 + ! The efficiency of bottom boundary layer mixing via ePBL driven by the bottom + ! drag dissipation of tides, as provided in fluxes%BBL_tidal_dis. USE_LA_LI2016 = False ! [Boolean] default = False ! A logical to use the Li et al. 2016 (submitted) formula to determine the ! Langmuir number. diff --git a/ocean_only/CVmix_SCM_tests/cooling_only/KPP/MOM_parameter_doc.all b/ocean_only/CVmix_SCM_tests/cooling_only/KPP/MOM_parameter_doc.all index d4706d39f..1ef5a38bc 100644 --- a/ocean_only/CVmix_SCM_tests/cooling_only/KPP/MOM_parameter_doc.all +++ b/ocean_only/CVmix_SCM_tests/cooling_only/KPP/MOM_parameter_doc.all @@ -1296,6 +1296,8 @@ SET_DIFF_ANSWER_DATE = 99991231 ! default = 99991231 ! The vintage of the order of arithmetic and expressions in the set diffusivity ! calculations. Values below 20190101 recover the answers from the end of 2018, ! while higher values use updated and more robust forms of the same expressions. + ! Values above 20250301 also use less confusing expressions to set the + ! bottom-drag generated diffusivity when USE_LOTW_BBL_DIFFUSIVITY is false. ! === module MOM_tidal_mixing === ! Vertical Tidal Mixing Parameterization @@ -1322,6 +1324,10 @@ USE_LOTW_BBL_DIFFUSIVITY = False ! [Boolean] default = False ! If true, uses a simple, imprecise but non-coordinate dependent, model of BBL ! mixing diffusivity based on Law of the Wall. Otherwise, uses the original BBL ! scheme. +DRAG_DIFFUSIVITY_ANSWER_DATE = 20250101 ! default = 20250101 + ! The vintage of the order of arithmetic in the drag diffusivity calculations. + ! Values above 20250301 use less confusing expressions to set the bottom-drag + ! generated diffusivity when USE_LOTW_BBL_DIFFUSIVITY is false. 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/CVmix_SCM_tests/mech_only/BML/MOM_parameter_doc.all b/ocean_only/CVmix_SCM_tests/mech_only/BML/MOM_parameter_doc.all index 66022360e..41c6cbfe9 100644 --- a/ocean_only/CVmix_SCM_tests/mech_only/BML/MOM_parameter_doc.all +++ b/ocean_only/CVmix_SCM_tests/mech_only/BML/MOM_parameter_doc.all @@ -1090,6 +1090,8 @@ SET_DIFF_ANSWER_DATE = 99991231 ! default = 99991231 ! The vintage of the order of arithmetic and expressions in the set diffusivity ! calculations. Values below 20190101 recover the answers from the end of 2018, ! while higher values use updated and more robust forms of the same expressions. + ! Values above 20250301 also use less confusing expressions to set the + ! bottom-drag generated diffusivity when USE_LOTW_BBL_DIFFUSIVITY is false. ! === module MOM_tidal_mixing === ! Vertical Tidal Mixing Parameterization @@ -1116,6 +1118,10 @@ USE_LOTW_BBL_DIFFUSIVITY = False ! [Boolean] default = False ! If true, uses a simple, imprecise but non-coordinate dependent, model of BBL ! mixing diffusivity based on Law of the Wall. Otherwise, uses the original BBL ! scheme. +DRAG_DIFFUSIVITY_ANSWER_DATE = 20250101 ! default = 20250101 + ! The vintage of the order of arithmetic in the drag diffusivity calculations. + ! Values above 20250301 use less confusing expressions to set the bottom-drag + ! generated diffusivity when USE_LOTW_BBL_DIFFUSIVITY is false. 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/CVmix_SCM_tests/mech_only/EPBL/MOM_parameter_doc.all b/ocean_only/CVmix_SCM_tests/mech_only/EPBL/MOM_parameter_doc.all index 499bd6bf9..d0a22a81d 100644 --- a/ocean_only/CVmix_SCM_tests/mech_only/EPBL/MOM_parameter_doc.all +++ b/ocean_only/CVmix_SCM_tests/mech_only/EPBL/MOM_parameter_doc.all @@ -1211,6 +1211,8 @@ SET_DIFF_ANSWER_DATE = 99991231 ! default = 99991231 ! The vintage of the order of arithmetic and expressions in the set diffusivity ! calculations. Values below 20190101 recover the answers from the end of 2018, ! while higher values use updated and more robust forms of the same expressions. + ! Values above 20250301 also use less confusing expressions to set the + ! bottom-drag generated diffusivity when USE_LOTW_BBL_DIFFUSIVITY is false. ! === module MOM_tidal_mixing === ! Vertical Tidal Mixing Parameterization @@ -1237,6 +1239,10 @@ USE_LOTW_BBL_DIFFUSIVITY = False ! [Boolean] default = False ! If true, uses a simple, imprecise but non-coordinate dependent, model of BBL ! mixing diffusivity based on Law of the Wall. Otherwise, uses the original BBL ! scheme. +DRAG_DIFFUSIVITY_ANSWER_DATE = 20250101 ! default = 20250101 + ! The vintage of the order of arithmetic in the drag diffusivity calculations. + ! Values above 20250301 use less confusing expressions to set the bottom-drag + ! generated diffusivity when USE_LOTW_BBL_DIFFUSIVITY is false. 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. @@ -1434,6 +1440,9 @@ VSTAR_SURF_FAC = 1.2 ! [nondim] default = 1.2 EPBL_BBL_EFFIC = 0.0 ! [nondim] default = 0.0 ! The efficiency of bottom boundary layer mixing via ePBL. Setting this to a ! value that is greater than 0 to enable bottom boundary layer mixing from EPBL. +EPBL_BBL_TIDAL_EFFIC = 0.0 ! [nondim] default = 0.0 + ! The efficiency of bottom boundary layer mixing via ePBL driven by the bottom + ! drag dissipation of tides, as provided in fluxes%BBL_tidal_dis. USE_LA_LI2016 = False ! [Boolean] default = False ! A logical to use the Li et al. 2016 (submitted) formula to determine the ! Langmuir number. diff --git a/ocean_only/CVmix_SCM_tests/mech_only/KPP/MOM_parameter_doc.all b/ocean_only/CVmix_SCM_tests/mech_only/KPP/MOM_parameter_doc.all index 5fe4017d8..d6f5132f0 100644 --- a/ocean_only/CVmix_SCM_tests/mech_only/KPP/MOM_parameter_doc.all +++ b/ocean_only/CVmix_SCM_tests/mech_only/KPP/MOM_parameter_doc.all @@ -1296,6 +1296,8 @@ SET_DIFF_ANSWER_DATE = 99991231 ! default = 99991231 ! The vintage of the order of arithmetic and expressions in the set diffusivity ! calculations. Values below 20190101 recover the answers from the end of 2018, ! while higher values use updated and more robust forms of the same expressions. + ! Values above 20250301 also use less confusing expressions to set the + ! bottom-drag generated diffusivity when USE_LOTW_BBL_DIFFUSIVITY is false. ! === module MOM_tidal_mixing === ! Vertical Tidal Mixing Parameterization @@ -1322,6 +1324,10 @@ USE_LOTW_BBL_DIFFUSIVITY = False ! [Boolean] default = False ! If true, uses a simple, imprecise but non-coordinate dependent, model of BBL ! mixing diffusivity based on Law of the Wall. Otherwise, uses the original BBL ! scheme. +DRAG_DIFFUSIVITY_ANSWER_DATE = 20250101 ! default = 20250101 + ! The vintage of the order of arithmetic in the drag diffusivity calculations. + ! Values above 20250301 use less confusing expressions to set the bottom-drag + ! generated diffusivity when USE_LOTW_BBL_DIFFUSIVITY is false. 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/CVmix_SCM_tests/skin_warming_wind/BML/MOM_parameter_doc.all b/ocean_only/CVmix_SCM_tests/skin_warming_wind/BML/MOM_parameter_doc.all index d0bea6f3c..9b04a7147 100644 --- a/ocean_only/CVmix_SCM_tests/skin_warming_wind/BML/MOM_parameter_doc.all +++ b/ocean_only/CVmix_SCM_tests/skin_warming_wind/BML/MOM_parameter_doc.all @@ -1090,6 +1090,8 @@ SET_DIFF_ANSWER_DATE = 99991231 ! default = 99991231 ! The vintage of the order of arithmetic and expressions in the set diffusivity ! calculations. Values below 20190101 recover the answers from the end of 2018, ! while higher values use updated and more robust forms of the same expressions. + ! Values above 20250301 also use less confusing expressions to set the + ! bottom-drag generated diffusivity when USE_LOTW_BBL_DIFFUSIVITY is false. ! === module MOM_tidal_mixing === ! Vertical Tidal Mixing Parameterization @@ -1116,6 +1118,10 @@ USE_LOTW_BBL_DIFFUSIVITY = False ! [Boolean] default = False ! If true, uses a simple, imprecise but non-coordinate dependent, model of BBL ! mixing diffusivity based on Law of the Wall. Otherwise, uses the original BBL ! scheme. +DRAG_DIFFUSIVITY_ANSWER_DATE = 20250101 ! default = 20250101 + ! The vintage of the order of arithmetic in the drag diffusivity calculations. + ! Values above 20250301 use less confusing expressions to set the bottom-drag + ! generated diffusivity when USE_LOTW_BBL_DIFFUSIVITY is false. 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/CVmix_SCM_tests/skin_warming_wind/EPBL/MOM_parameter_doc.all b/ocean_only/CVmix_SCM_tests/skin_warming_wind/EPBL/MOM_parameter_doc.all index dbf9b6a1a..984a10413 100644 --- a/ocean_only/CVmix_SCM_tests/skin_warming_wind/EPBL/MOM_parameter_doc.all +++ b/ocean_only/CVmix_SCM_tests/skin_warming_wind/EPBL/MOM_parameter_doc.all @@ -1211,6 +1211,8 @@ SET_DIFF_ANSWER_DATE = 99991231 ! default = 99991231 ! The vintage of the order of arithmetic and expressions in the set diffusivity ! calculations. Values below 20190101 recover the answers from the end of 2018, ! while higher values use updated and more robust forms of the same expressions. + ! Values above 20250301 also use less confusing expressions to set the + ! bottom-drag generated diffusivity when USE_LOTW_BBL_DIFFUSIVITY is false. ! === module MOM_tidal_mixing === ! Vertical Tidal Mixing Parameterization @@ -1237,6 +1239,10 @@ USE_LOTW_BBL_DIFFUSIVITY = False ! [Boolean] default = False ! If true, uses a simple, imprecise but non-coordinate dependent, model of BBL ! mixing diffusivity based on Law of the Wall. Otherwise, uses the original BBL ! scheme. +DRAG_DIFFUSIVITY_ANSWER_DATE = 20250101 ! default = 20250101 + ! The vintage of the order of arithmetic in the drag diffusivity calculations. + ! Values above 20250301 use less confusing expressions to set the bottom-drag + ! generated diffusivity when USE_LOTW_BBL_DIFFUSIVITY is false. 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. @@ -1434,6 +1440,9 @@ VSTAR_SURF_FAC = 1.2 ! [nondim] default = 1.2 EPBL_BBL_EFFIC = 0.0 ! [nondim] default = 0.0 ! The efficiency of bottom boundary layer mixing via ePBL. Setting this to a ! value that is greater than 0 to enable bottom boundary layer mixing from EPBL. +EPBL_BBL_TIDAL_EFFIC = 0.0 ! [nondim] default = 0.0 + ! The efficiency of bottom boundary layer mixing via ePBL driven by the bottom + ! drag dissipation of tides, as provided in fluxes%BBL_tidal_dis. USE_LA_LI2016 = False ! [Boolean] default = False ! A logical to use the Li et al. 2016 (submitted) formula to determine the ! Langmuir number. diff --git a/ocean_only/CVmix_SCM_tests/skin_warming_wind/KPP/MOM_parameter_doc.all b/ocean_only/CVmix_SCM_tests/skin_warming_wind/KPP/MOM_parameter_doc.all index 4459c0ecd..94454155a 100644 --- a/ocean_only/CVmix_SCM_tests/skin_warming_wind/KPP/MOM_parameter_doc.all +++ b/ocean_only/CVmix_SCM_tests/skin_warming_wind/KPP/MOM_parameter_doc.all @@ -1296,6 +1296,8 @@ SET_DIFF_ANSWER_DATE = 99991231 ! default = 99991231 ! The vintage of the order of arithmetic and expressions in the set diffusivity ! calculations. Values below 20190101 recover the answers from the end of 2018, ! while higher values use updated and more robust forms of the same expressions. + ! Values above 20250301 also use less confusing expressions to set the + ! bottom-drag generated diffusivity when USE_LOTW_BBL_DIFFUSIVITY is false. ! === module MOM_tidal_mixing === ! Vertical Tidal Mixing Parameterization @@ -1322,6 +1324,10 @@ USE_LOTW_BBL_DIFFUSIVITY = False ! [Boolean] default = False ! If true, uses a simple, imprecise but non-coordinate dependent, model of BBL ! mixing diffusivity based on Law of the Wall. Otherwise, uses the original BBL ! scheme. +DRAG_DIFFUSIVITY_ANSWER_DATE = 20250101 ! default = 20250101 + ! The vintage of the order of arithmetic in the drag diffusivity calculations. + ! Values above 20250301 use less confusing expressions to set the bottom-drag + ! generated diffusivity when USE_LOTW_BBL_DIFFUSIVITY is false. 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/CVmix_SCM_tests/wind_only/BML/MOM_parameter_doc.all b/ocean_only/CVmix_SCM_tests/wind_only/BML/MOM_parameter_doc.all index 42b6ec9dd..c23841bb6 100644 --- a/ocean_only/CVmix_SCM_tests/wind_only/BML/MOM_parameter_doc.all +++ b/ocean_only/CVmix_SCM_tests/wind_only/BML/MOM_parameter_doc.all @@ -1090,6 +1090,8 @@ SET_DIFF_ANSWER_DATE = 99991231 ! default = 99991231 ! The vintage of the order of arithmetic and expressions in the set diffusivity ! calculations. Values below 20190101 recover the answers from the end of 2018, ! while higher values use updated and more robust forms of the same expressions. + ! Values above 20250301 also use less confusing expressions to set the + ! bottom-drag generated diffusivity when USE_LOTW_BBL_DIFFUSIVITY is false. ! === module MOM_tidal_mixing === ! Vertical Tidal Mixing Parameterization @@ -1116,6 +1118,10 @@ USE_LOTW_BBL_DIFFUSIVITY = False ! [Boolean] default = False ! If true, uses a simple, imprecise but non-coordinate dependent, model of BBL ! mixing diffusivity based on Law of the Wall. Otherwise, uses the original BBL ! scheme. +DRAG_DIFFUSIVITY_ANSWER_DATE = 20250101 ! default = 20250101 + ! The vintage of the order of arithmetic in the drag diffusivity calculations. + ! Values above 20250301 use less confusing expressions to set the bottom-drag + ! generated diffusivity when USE_LOTW_BBL_DIFFUSIVITY is false. 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/CVmix_SCM_tests/wind_only/EPBL/MOM_parameter_doc.all b/ocean_only/CVmix_SCM_tests/wind_only/EPBL/MOM_parameter_doc.all index 0dff9f528..b475b3dbb 100644 --- a/ocean_only/CVmix_SCM_tests/wind_only/EPBL/MOM_parameter_doc.all +++ b/ocean_only/CVmix_SCM_tests/wind_only/EPBL/MOM_parameter_doc.all @@ -1211,6 +1211,8 @@ SET_DIFF_ANSWER_DATE = 99991231 ! default = 99991231 ! The vintage of the order of arithmetic and expressions in the set diffusivity ! calculations. Values below 20190101 recover the answers from the end of 2018, ! while higher values use updated and more robust forms of the same expressions. + ! Values above 20250301 also use less confusing expressions to set the + ! bottom-drag generated diffusivity when USE_LOTW_BBL_DIFFUSIVITY is false. ! === module MOM_tidal_mixing === ! Vertical Tidal Mixing Parameterization @@ -1237,6 +1239,10 @@ USE_LOTW_BBL_DIFFUSIVITY = False ! [Boolean] default = False ! If true, uses a simple, imprecise but non-coordinate dependent, model of BBL ! mixing diffusivity based on Law of the Wall. Otherwise, uses the original BBL ! scheme. +DRAG_DIFFUSIVITY_ANSWER_DATE = 20250101 ! default = 20250101 + ! The vintage of the order of arithmetic in the drag diffusivity calculations. + ! Values above 20250301 use less confusing expressions to set the bottom-drag + ! generated diffusivity when USE_LOTW_BBL_DIFFUSIVITY is false. 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. @@ -1434,6 +1440,9 @@ VSTAR_SURF_FAC = 1.2 ! [nondim] default = 1.2 EPBL_BBL_EFFIC = 0.0 ! [nondim] default = 0.0 ! The efficiency of bottom boundary layer mixing via ePBL. Setting this to a ! value that is greater than 0 to enable bottom boundary layer mixing from EPBL. +EPBL_BBL_TIDAL_EFFIC = 0.0 ! [nondim] default = 0.0 + ! The efficiency of bottom boundary layer mixing via ePBL driven by the bottom + ! drag dissipation of tides, as provided in fluxes%BBL_tidal_dis. USE_LA_LI2016 = False ! [Boolean] default = False ! A logical to use the Li et al. 2016 (submitted) formula to determine the ! Langmuir number. diff --git a/ocean_only/CVmix_SCM_tests/wind_only/KPP/MOM_parameter_doc.all b/ocean_only/CVmix_SCM_tests/wind_only/KPP/MOM_parameter_doc.all index 5673e4638..147c86bce 100644 --- a/ocean_only/CVmix_SCM_tests/wind_only/KPP/MOM_parameter_doc.all +++ b/ocean_only/CVmix_SCM_tests/wind_only/KPP/MOM_parameter_doc.all @@ -1296,6 +1296,8 @@ SET_DIFF_ANSWER_DATE = 99991231 ! default = 99991231 ! The vintage of the order of arithmetic and expressions in the set diffusivity ! calculations. Values below 20190101 recover the answers from the end of 2018, ! while higher values use updated and more robust forms of the same expressions. + ! Values above 20250301 also use less confusing expressions to set the + ! bottom-drag generated diffusivity when USE_LOTW_BBL_DIFFUSIVITY is false. ! === module MOM_tidal_mixing === ! Vertical Tidal Mixing Parameterization @@ -1322,6 +1324,10 @@ USE_LOTW_BBL_DIFFUSIVITY = False ! [Boolean] default = False ! If true, uses a simple, imprecise but non-coordinate dependent, model of BBL ! mixing diffusivity based on Law of the Wall. Otherwise, uses the original BBL ! scheme. +DRAG_DIFFUSIVITY_ANSWER_DATE = 20250101 ! default = 20250101 + ! The vintage of the order of arithmetic in the drag diffusivity calculations. + ! Values above 20250301 use less confusing expressions to set the bottom-drag + ! generated diffusivity when USE_LOTW_BBL_DIFFUSIVITY is false. 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/DOME/MOM_parameter_doc.all b/ocean_only/DOME/MOM_parameter_doc.all index 774894915..6175ea002 100644 --- a/ocean_only/DOME/MOM_parameter_doc.all +++ b/ocean_only/DOME/MOM_parameter_doc.all @@ -1279,6 +1279,8 @@ SET_DIFF_ANSWER_DATE = 99991231 ! default = 99991231 ! The vintage of the order of arithmetic and expressions in the set diffusivity ! calculations. Values below 20190101 recover the answers from the end of 2018, ! while higher values use updated and more robust forms of the same expressions. + ! Values above 20250301 also use less confusing expressions to set the + ! bottom-drag generated diffusivity when USE_LOTW_BBL_DIFFUSIVITY is false. ! === module MOM_tidal_mixing === ! Vertical Tidal Mixing Parameterization @@ -1305,6 +1307,10 @@ USE_LOTW_BBL_DIFFUSIVITY = False ! [Boolean] default = False ! If true, uses a simple, imprecise but non-coordinate dependent, model of BBL ! mixing diffusivity based on Law of the Wall. Otherwise, uses the original BBL ! scheme. +DRAG_DIFFUSIVITY_ANSWER_DATE = 20250101 ! default = 20250101 + ! The vintage of the order of arithmetic in the drag diffusivity calculations. + ! Values above 20250301 use less confusing expressions to set the bottom-drag + ! generated diffusivity when USE_LOTW_BBL_DIFFUSIVITY is false. 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/Phillips_2layer/MOM_parameter_doc.all b/ocean_only/Phillips_2layer/MOM_parameter_doc.all index cf01b9e1a..a240a6375 100644 --- a/ocean_only/Phillips_2layer/MOM_parameter_doc.all +++ b/ocean_only/Phillips_2layer/MOM_parameter_doc.all @@ -1197,6 +1197,8 @@ SET_DIFF_ANSWER_DATE = 99991231 ! default = 99991231 ! The vintage of the order of arithmetic and expressions in the set diffusivity ! calculations. Values below 20190101 recover the answers from the end of 2018, ! while higher values use updated and more robust forms of the same expressions. + ! Values above 20250301 also use less confusing expressions to set the + ! bottom-drag generated diffusivity when USE_LOTW_BBL_DIFFUSIVITY is false. ! === module MOM_tidal_mixing === ! Vertical Tidal Mixing Parameterization @@ -1223,6 +1225,10 @@ USE_LOTW_BBL_DIFFUSIVITY = False ! [Boolean] default = False ! If true, uses a simple, imprecise but non-coordinate dependent, model of BBL ! mixing diffusivity based on Law of the Wall. Otherwise, uses the original BBL ! scheme. +DRAG_DIFFUSIVITY_ANSWER_DATE = 20250101 ! default = 20250101 + ! The vintage of the order of arithmetic in the drag diffusivity calculations. + ! Values above 20250301 use less confusing expressions to set the bottom-drag + ! generated diffusivity when USE_LOTW_BBL_DIFFUSIVITY is false. 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/SCM_idealized_hurricane/MOM_parameter_doc.all b/ocean_only/SCM_idealized_hurricane/MOM_parameter_doc.all index 82dd17fa6..ab3dc9b15 100644 --- a/ocean_only/SCM_idealized_hurricane/MOM_parameter_doc.all +++ b/ocean_only/SCM_idealized_hurricane/MOM_parameter_doc.all @@ -1296,6 +1296,8 @@ SET_DIFF_ANSWER_DATE = 99991231 ! default = 99991231 ! The vintage of the order of arithmetic and expressions in the set diffusivity ! calculations. Values below 20190101 recover the answers from the end of 2018, ! while higher values use updated and more robust forms of the same expressions. + ! Values above 20250301 also use less confusing expressions to set the + ! bottom-drag generated diffusivity when USE_LOTW_BBL_DIFFUSIVITY is false. ! === module MOM_tidal_mixing === ! Vertical Tidal Mixing Parameterization @@ -1322,6 +1324,10 @@ USE_LOTW_BBL_DIFFUSIVITY = False ! [Boolean] default = False ! If true, uses a simple, imprecise but non-coordinate dependent, model of BBL ! mixing diffusivity based on Law of the Wall. Otherwise, uses the original BBL ! scheme. +DRAG_DIFFUSIVITY_ANSWER_DATE = 20250101 ! default = 20250101 + ! The vintage of the order of arithmetic in the drag diffusivity calculations. + ! Values above 20250301 use less confusing expressions to set the bottom-drag + ! generated diffusivity when USE_LOTW_BBL_DIFFUSIVITY is false. 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/adjustment2d/layer/MOM_parameter_doc.all b/ocean_only/adjustment2d/layer/MOM_parameter_doc.all index 109ae43c6..8f91645c4 100644 --- a/ocean_only/adjustment2d/layer/MOM_parameter_doc.all +++ b/ocean_only/adjustment2d/layer/MOM_parameter_doc.all @@ -1292,6 +1292,8 @@ SET_DIFF_ANSWER_DATE = 99991231 ! default = 99991231 ! The vintage of the order of arithmetic and expressions in the set diffusivity ! calculations. Values below 20190101 recover the answers from the end of 2018, ! while higher values use updated and more robust forms of the same expressions. + ! Values above 20250301 also use less confusing expressions to set the + ! bottom-drag generated diffusivity when USE_LOTW_BBL_DIFFUSIVITY is false. ! === module MOM_tidal_mixing === ! Vertical Tidal Mixing Parameterization diff --git a/ocean_only/adjustment2d/rho/MOM_parameter_doc.all b/ocean_only/adjustment2d/rho/MOM_parameter_doc.all index dc47f79d7..57d814466 100644 --- a/ocean_only/adjustment2d/rho/MOM_parameter_doc.all +++ b/ocean_only/adjustment2d/rho/MOM_parameter_doc.all @@ -1452,6 +1452,8 @@ SET_DIFF_ANSWER_DATE = 99991231 ! default = 99991231 ! The vintage of the order of arithmetic and expressions in the set diffusivity ! calculations. Values below 20190101 recover the answers from the end of 2018, ! while higher values use updated and more robust forms of the same expressions. + ! Values above 20250301 also use less confusing expressions to set the + ! bottom-drag generated diffusivity when USE_LOTW_BBL_DIFFUSIVITY is false. ! === module MOM_tidal_mixing === ! Vertical Tidal Mixing Parameterization diff --git a/ocean_only/adjustment2d/z/MOM_parameter_doc.all b/ocean_only/adjustment2d/z/MOM_parameter_doc.all index 61edefc05..22cd8437c 100644 --- a/ocean_only/adjustment2d/z/MOM_parameter_doc.all +++ b/ocean_only/adjustment2d/z/MOM_parameter_doc.all @@ -1404,6 +1404,8 @@ SET_DIFF_ANSWER_DATE = 99991231 ! default = 99991231 ! The vintage of the order of arithmetic and expressions in the set diffusivity ! calculations. Values below 20190101 recover the answers from the end of 2018, ! while higher values use updated and more robust forms of the same expressions. + ! Values above 20250301 also use less confusing expressions to set the + ! bottom-drag generated diffusivity when USE_LOTW_BBL_DIFFUSIVITY is false. ! === module MOM_tidal_mixing === ! Vertical Tidal Mixing Parameterization diff --git a/ocean_only/benchmark/MOM_parameter_doc.all b/ocean_only/benchmark/MOM_parameter_doc.all index ec88a5707..5107bc8b9 100644 --- a/ocean_only/benchmark/MOM_parameter_doc.all +++ b/ocean_only/benchmark/MOM_parameter_doc.all @@ -1397,6 +1397,8 @@ SET_DIFF_ANSWER_DATE = 99991231 ! default = 99991231 ! The vintage of the order of arithmetic and expressions in the set diffusivity ! calculations. Values below 20190101 recover the answers from the end of 2018, ! while higher values use updated and more robust forms of the same expressions. + ! Values above 20250301 also use less confusing expressions to set the + ! bottom-drag generated diffusivity when USE_LOTW_BBL_DIFFUSIVITY is false. ! === module MOM_tidal_mixing === ! Vertical Tidal Mixing Parameterization @@ -1423,6 +1425,10 @@ USE_LOTW_BBL_DIFFUSIVITY = False ! [Boolean] default = False ! If true, uses a simple, imprecise but non-coordinate dependent, model of BBL ! mixing diffusivity based on Law of the Wall. Otherwise, uses the original BBL ! scheme. +DRAG_DIFFUSIVITY_ANSWER_DATE = 20250101 ! default = 20250101 + ! The vintage of the order of arithmetic in the drag diffusivity calculations. + ! Values above 20250301 use less confusing expressions to set the bottom-drag + ! generated diffusivity when USE_LOTW_BBL_DIFFUSIVITY is false. 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/circle_obcs/MOM_parameter_doc.all b/ocean_only/circle_obcs/MOM_parameter_doc.all index fb34a10e5..a43987e1c 100644 --- a/ocean_only/circle_obcs/MOM_parameter_doc.all +++ b/ocean_only/circle_obcs/MOM_parameter_doc.all @@ -1356,6 +1356,8 @@ SET_DIFF_ANSWER_DATE = 99991231 ! default = 99991231 ! The vintage of the order of arithmetic and expressions in the set diffusivity ! calculations. Values below 20190101 recover the answers from the end of 2018, ! while higher values use updated and more robust forms of the same expressions. + ! Values above 20250301 also use less confusing expressions to set the + ! bottom-drag generated diffusivity when USE_LOTW_BBL_DIFFUSIVITY is false. ! === module MOM_tidal_mixing === ! Vertical Tidal Mixing Parameterization @@ -1382,6 +1384,10 @@ USE_LOTW_BBL_DIFFUSIVITY = False ! [Boolean] default = False ! If true, uses a simple, imprecise but non-coordinate dependent, model of BBL ! mixing diffusivity based on Law of the Wall. Otherwise, uses the original BBL ! scheme. +DRAG_DIFFUSIVITY_ANSWER_DATE = 20250101 ! default = 20250101 + ! The vintage of the order of arithmetic in the drag diffusivity calculations. + ! Values above 20250301 use less confusing expressions to set the bottom-drag + ! generated diffusivity when USE_LOTW_BBL_DIFFUSIVITY is false. 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/external_gwave/MOM_parameter_doc.all b/ocean_only/external_gwave/MOM_parameter_doc.all index 4016fa728..c55b4c2c0 100644 --- a/ocean_only/external_gwave/MOM_parameter_doc.all +++ b/ocean_only/external_gwave/MOM_parameter_doc.all @@ -1278,6 +1278,8 @@ SET_DIFF_ANSWER_DATE = 99991231 ! default = 99991231 ! The vintage of the order of arithmetic and expressions in the set diffusivity ! calculations. Values below 20190101 recover the answers from the end of 2018, ! while higher values use updated and more robust forms of the same expressions. + ! Values above 20250301 also use less confusing expressions to set the + ! bottom-drag generated diffusivity when USE_LOTW_BBL_DIFFUSIVITY is false. ! === module MOM_tidal_mixing === ! Vertical Tidal Mixing Parameterization diff --git a/ocean_only/flow_downslope/layer/MOM_parameter_doc.all b/ocean_only/flow_downslope/layer/MOM_parameter_doc.all index 3a4759bbf..15ff65d05 100644 --- a/ocean_only/flow_downslope/layer/MOM_parameter_doc.all +++ b/ocean_only/flow_downslope/layer/MOM_parameter_doc.all @@ -1289,6 +1289,8 @@ SET_DIFF_ANSWER_DATE = 99991231 ! default = 99991231 ! The vintage of the order of arithmetic and expressions in the set diffusivity ! calculations. Values below 20190101 recover the answers from the end of 2018, ! while higher values use updated and more robust forms of the same expressions. + ! Values above 20250301 also use less confusing expressions to set the + ! bottom-drag generated diffusivity when USE_LOTW_BBL_DIFFUSIVITY is false. ! === module MOM_tidal_mixing === ! Vertical Tidal Mixing Parameterization @@ -1315,6 +1317,10 @@ USE_LOTW_BBL_DIFFUSIVITY = False ! [Boolean] default = False ! If true, uses a simple, imprecise but non-coordinate dependent, model of BBL ! mixing diffusivity based on Law of the Wall. Otherwise, uses the original BBL ! scheme. +DRAG_DIFFUSIVITY_ANSWER_DATE = 20250101 ! default = 20250101 + ! The vintage of the order of arithmetic in the drag diffusivity calculations. + ! Values above 20250301 use less confusing expressions to set the bottom-drag + ! generated diffusivity when USE_LOTW_BBL_DIFFUSIVITY is false. 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/flow_downslope/rho/MOM_parameter_doc.all b/ocean_only/flow_downslope/rho/MOM_parameter_doc.all index 3f81af028..0439fcf55 100644 --- a/ocean_only/flow_downslope/rho/MOM_parameter_doc.all +++ b/ocean_only/flow_downslope/rho/MOM_parameter_doc.all @@ -1451,6 +1451,8 @@ SET_DIFF_ANSWER_DATE = 99991231 ! default = 99991231 ! The vintage of the order of arithmetic and expressions in the set diffusivity ! calculations. Values below 20190101 recover the answers from the end of 2018, ! while higher values use updated and more robust forms of the same expressions. + ! Values above 20250301 also use less confusing expressions to set the + ! bottom-drag generated diffusivity when USE_LOTW_BBL_DIFFUSIVITY is false. ! === module MOM_tidal_mixing === ! Vertical Tidal Mixing Parameterization @@ -1477,6 +1479,10 @@ USE_LOTW_BBL_DIFFUSIVITY = False ! [Boolean] default = False ! If true, uses a simple, imprecise but non-coordinate dependent, model of BBL ! mixing diffusivity based on Law of the Wall. Otherwise, uses the original BBL ! scheme. +DRAG_DIFFUSIVITY_ANSWER_DATE = 20250101 ! default = 20250101 + ! The vintage of the order of arithmetic in the drag diffusivity calculations. + ! Values above 20250301 use less confusing expressions to set the bottom-drag + ! generated diffusivity when USE_LOTW_BBL_DIFFUSIVITY is false. 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/flow_downslope/sigma/MOM_parameter_doc.all b/ocean_only/flow_downslope/sigma/MOM_parameter_doc.all index 6695d0d5b..2d7d9036a 100644 --- a/ocean_only/flow_downslope/sigma/MOM_parameter_doc.all +++ b/ocean_only/flow_downslope/sigma/MOM_parameter_doc.all @@ -1403,6 +1403,8 @@ SET_DIFF_ANSWER_DATE = 99991231 ! default = 99991231 ! The vintage of the order of arithmetic and expressions in the set diffusivity ! calculations. Values below 20190101 recover the answers from the end of 2018, ! while higher values use updated and more robust forms of the same expressions. + ! Values above 20250301 also use less confusing expressions to set the + ! bottom-drag generated diffusivity when USE_LOTW_BBL_DIFFUSIVITY is false. ! === module MOM_tidal_mixing === ! Vertical Tidal Mixing Parameterization @@ -1429,6 +1431,10 @@ USE_LOTW_BBL_DIFFUSIVITY = False ! [Boolean] default = False ! If true, uses a simple, imprecise but non-coordinate dependent, model of BBL ! mixing diffusivity based on Law of the Wall. Otherwise, uses the original BBL ! scheme. +DRAG_DIFFUSIVITY_ANSWER_DATE = 20250101 ! default = 20250101 + ! The vintage of the order of arithmetic in the drag diffusivity calculations. + ! Values above 20250301 use less confusing expressions to set the bottom-drag + ! generated diffusivity when USE_LOTW_BBL_DIFFUSIVITY is false. 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/flow_downslope/z/MOM_parameter_doc.all b/ocean_only/flow_downslope/z/MOM_parameter_doc.all index 7bbf6eb59..7328c21c5 100644 --- a/ocean_only/flow_downslope/z/MOM_parameter_doc.all +++ b/ocean_only/flow_downslope/z/MOM_parameter_doc.all @@ -1403,6 +1403,8 @@ SET_DIFF_ANSWER_DATE = 99991231 ! default = 99991231 ! The vintage of the order of arithmetic and expressions in the set diffusivity ! calculations. Values below 20190101 recover the answers from the end of 2018, ! while higher values use updated and more robust forms of the same expressions. + ! Values above 20250301 also use less confusing expressions to set the + ! bottom-drag generated diffusivity when USE_LOTW_BBL_DIFFUSIVITY is false. ! === module MOM_tidal_mixing === ! Vertical Tidal Mixing Parameterization @@ -1429,6 +1431,10 @@ USE_LOTW_BBL_DIFFUSIVITY = False ! [Boolean] default = False ! If true, uses a simple, imprecise but non-coordinate dependent, model of BBL ! mixing diffusivity based on Law of the Wall. Otherwise, uses the original BBL ! scheme. +DRAG_DIFFUSIVITY_ANSWER_DATE = 20250101 ! default = 20250101 + ! The vintage of the order of arithmetic in the drag diffusivity calculations. + ! Values above 20250301 use less confusing expressions to set the bottom-drag + ! generated diffusivity when USE_LOTW_BBL_DIFFUSIVITY is false. 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 d943a0136..ac958874a 100644 --- a/ocean_only/global_ALE/hycom/MOM_parameter_doc.all +++ b/ocean_only/global_ALE/hycom/MOM_parameter_doc.all @@ -1888,6 +1888,8 @@ SET_DIFF_ANSWER_DATE = 99991231 ! default = 99991231 ! The vintage of the order of arithmetic and expressions in the set diffusivity ! calculations. Values below 20190101 recover the answers from the end of 2018, ! while higher values use updated and more robust forms of the same expressions. + ! Values above 20250301 also use less confusing expressions to set the + ! bottom-drag generated diffusivity when USE_LOTW_BBL_DIFFUSIVITY is false. ! === module MOM_tidal_mixing === ! Vertical Tidal Mixing Parameterization @@ -2256,6 +2258,9 @@ VSTAR_SURF_FAC = 1.2 ! [nondim] default = 1.2 EPBL_BBL_EFFIC = 0.0 ! [nondim] default = 0.0 ! The efficiency of bottom boundary layer mixing via ePBL. Setting this to a ! value that is greater than 0 to enable bottom boundary layer mixing from EPBL. +EPBL_BBL_TIDAL_EFFIC = 0.0 ! [nondim] default = 0.0 + ! The efficiency of bottom boundary layer mixing via ePBL driven by the bottom + ! drag dissipation of tides, as provided in fluxes%BBL_tidal_dis. USE_LA_LI2016 = False ! [Boolean] default = False ! A logical to use the Li et al. 2016 (submitted) formula to determine the ! Langmuir number. diff --git a/ocean_only/global_ALE/layer/MOM_parameter_doc.all b/ocean_only/global_ALE/layer/MOM_parameter_doc.all index 75fd4ced5..1ef061c29 100644 --- a/ocean_only/global_ALE/layer/MOM_parameter_doc.all +++ b/ocean_only/global_ALE/layer/MOM_parameter_doc.all @@ -1739,6 +1739,8 @@ SET_DIFF_ANSWER_DATE = 99991231 ! default = 99991231 ! The vintage of the order of arithmetic and expressions in the set diffusivity ! calculations. Values below 20190101 recover the answers from the end of 2018, ! while higher values use updated and more robust forms of the same expressions. + ! Values above 20250301 also use less confusing expressions to set the + ! bottom-drag generated diffusivity when USE_LOTW_BBL_DIFFUSIVITY is false. ! === module MOM_tidal_mixing === ! Vertical Tidal Mixing Parameterization diff --git a/ocean_only/global_ALE/z/MOM_parameter_doc.all b/ocean_only/global_ALE/z/MOM_parameter_doc.all index 7b0924072..858de6edd 100644 --- a/ocean_only/global_ALE/z/MOM_parameter_doc.all +++ b/ocean_only/global_ALE/z/MOM_parameter_doc.all @@ -1835,6 +1835,8 @@ SET_DIFF_ANSWER_DATE = 99991231 ! default = 99991231 ! The vintage of the order of arithmetic and expressions in the set diffusivity ! calculations. Values below 20190101 recover the answers from the end of 2018, ! while higher values use updated and more robust forms of the same expressions. + ! Values above 20250301 also use less confusing expressions to set the + ! bottom-drag generated diffusivity when USE_LOTW_BBL_DIFFUSIVITY is false. ! === module MOM_tidal_mixing === ! Vertical Tidal Mixing Parameterization @@ -2203,6 +2205,9 @@ VSTAR_SURF_FAC = 1.2 ! [nondim] default = 1.2 EPBL_BBL_EFFIC = 0.0 ! [nondim] default = 0.0 ! The efficiency of bottom boundary layer mixing via ePBL. Setting this to a ! value that is greater than 0 to enable bottom boundary layer mixing from EPBL. +EPBL_BBL_TIDAL_EFFIC = 0.0 ! [nondim] default = 0.0 + ! The efficiency of bottom boundary layer mixing via ePBL driven by the bottom + ! drag dissipation of tides, as provided in fluxes%BBL_tidal_dis. USE_LA_LI2016 = False ! [Boolean] default = False ! A logical to use the Li et al. 2016 (submitted) formula to determine the ! Langmuir number. diff --git a/ocean_only/lock_exchange/MOM_parameter_doc.all b/ocean_only/lock_exchange/MOM_parameter_doc.all index f077854d1..c994050b8 100644 --- a/ocean_only/lock_exchange/MOM_parameter_doc.all +++ b/ocean_only/lock_exchange/MOM_parameter_doc.all @@ -1281,6 +1281,8 @@ SET_DIFF_ANSWER_DATE = 99991231 ! default = 99991231 ! The vintage of the order of arithmetic and expressions in the set diffusivity ! calculations. Values below 20190101 recover the answers from the end of 2018, ! while higher values use updated and more robust forms of the same expressions. + ! Values above 20250301 also use less confusing expressions to set the + ! bottom-drag generated diffusivity when USE_LOTW_BBL_DIFFUSIVITY is false. ! === module MOM_tidal_mixing === ! Vertical Tidal Mixing Parameterization diff --git a/ocean_only/mixed_layer_restrat_2d/MOM_parameter_doc.all b/ocean_only/mixed_layer_restrat_2d/MOM_parameter_doc.all index 6e96d1f03..56974c95a 100644 --- a/ocean_only/mixed_layer_restrat_2d/MOM_parameter_doc.all +++ b/ocean_only/mixed_layer_restrat_2d/MOM_parameter_doc.all @@ -1441,6 +1441,8 @@ SET_DIFF_ANSWER_DATE = 99991231 ! default = 99991231 ! The vintage of the order of arithmetic and expressions in the set diffusivity ! calculations. Values below 20190101 recover the answers from the end of 2018, ! while higher values use updated and more robust forms of the same expressions. + ! Values above 20250301 also use less confusing expressions to set the + ! bottom-drag generated diffusivity when USE_LOTW_BBL_DIFFUSIVITY is false. ! === module MOM_tidal_mixing === ! Vertical Tidal Mixing Parameterization @@ -1467,6 +1469,10 @@ USE_LOTW_BBL_DIFFUSIVITY = False ! [Boolean] default = False ! If true, uses a simple, imprecise but non-coordinate dependent, model of BBL ! mixing diffusivity based on Law of the Wall. Otherwise, uses the original BBL ! scheme. +DRAG_DIFFUSIVITY_ANSWER_DATE = 20250101 ! default = 20250101 + ! The vintage of the order of arithmetic in the drag diffusivity calculations. + ! Values above 20250301 use less confusing expressions to set the bottom-drag + ! generated diffusivity when USE_LOTW_BBL_DIFFUSIVITY is false. 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/nonBous_global/MOM_parameter_doc.all b/ocean_only/nonBous_global/MOM_parameter_doc.all index 09cf5b420..71167f358 100644 --- a/ocean_only/nonBous_global/MOM_parameter_doc.all +++ b/ocean_only/nonBous_global/MOM_parameter_doc.all @@ -1644,6 +1644,10 @@ USE_LOTW_BBL_DIFFUSIVITY = False ! [Boolean] default = False ! If true, uses a simple, imprecise but non-coordinate dependent, model of BBL ! mixing diffusivity based on Law of the Wall. Otherwise, uses the original BBL ! scheme. +DRAG_DIFFUSIVITY_ANSWER_DATE = 20250101 ! default = 20250101 + ! The vintage of the order of arithmetic in the drag diffusivity calculations. + ! Values above 20250301 use less confusing expressions to set the bottom-drag + ! generated diffusivity when USE_LOTW_BBL_DIFFUSIVITY is false. 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/resting/layer/MOM_parameter_doc.all b/ocean_only/resting/layer/MOM_parameter_doc.all index 6458da1d4..e563ce794 100644 --- a/ocean_only/resting/layer/MOM_parameter_doc.all +++ b/ocean_only/resting/layer/MOM_parameter_doc.all @@ -1274,6 +1274,8 @@ SET_DIFF_ANSWER_DATE = 99991231 ! default = 99991231 ! The vintage of the order of arithmetic and expressions in the set diffusivity ! calculations. Values below 20190101 recover the answers from the end of 2018, ! while higher values use updated and more robust forms of the same expressions. + ! Values above 20250301 also use less confusing expressions to set the + ! bottom-drag generated diffusivity when USE_LOTW_BBL_DIFFUSIVITY is false. ! === module MOM_tidal_mixing === ! Vertical Tidal Mixing Parameterization diff --git a/ocean_only/resting/z/MOM_parameter_doc.all b/ocean_only/resting/z/MOM_parameter_doc.all index 00a02d1f9..c63cf6802 100644 --- a/ocean_only/resting/z/MOM_parameter_doc.all +++ b/ocean_only/resting/z/MOM_parameter_doc.all @@ -1388,6 +1388,8 @@ SET_DIFF_ANSWER_DATE = 99991231 ! default = 99991231 ! The vintage of the order of arithmetic and expressions in the set diffusivity ! calculations. Values below 20190101 recover the answers from the end of 2018, ! while higher values use updated and more robust forms of the same expressions. + ! Values above 20250301 also use less confusing expressions to set the + ! bottom-drag generated diffusivity when USE_LOTW_BBL_DIFFUSIVITY is false. ! === module MOM_tidal_mixing === ! Vertical Tidal Mixing Parameterization diff --git a/ocean_only/seamount/layer/MOM_parameter_doc.all b/ocean_only/seamount/layer/MOM_parameter_doc.all index 9546e71cf..b854523c6 100644 --- a/ocean_only/seamount/layer/MOM_parameter_doc.all +++ b/ocean_only/seamount/layer/MOM_parameter_doc.all @@ -1307,6 +1307,8 @@ SET_DIFF_ANSWER_DATE = 99991231 ! default = 99991231 ! The vintage of the order of arithmetic and expressions in the set diffusivity ! calculations. Values below 20190101 recover the answers from the end of 2018, ! while higher values use updated and more robust forms of the same expressions. + ! Values above 20250301 also use less confusing expressions to set the + ! bottom-drag generated diffusivity when USE_LOTW_BBL_DIFFUSIVITY is false. ! === module MOM_tidal_mixing === ! Vertical Tidal Mixing Parameterization diff --git a/ocean_only/seamount/rho/MOM_parameter_doc.all b/ocean_only/seamount/rho/MOM_parameter_doc.all index de63258fc..83698de6b 100644 --- a/ocean_only/seamount/rho/MOM_parameter_doc.all +++ b/ocean_only/seamount/rho/MOM_parameter_doc.all @@ -1467,6 +1467,8 @@ SET_DIFF_ANSWER_DATE = 99991231 ! default = 99991231 ! The vintage of the order of arithmetic and expressions in the set diffusivity ! calculations. Values below 20190101 recover the answers from the end of 2018, ! while higher values use updated and more robust forms of the same expressions. + ! Values above 20250301 also use less confusing expressions to set the + ! bottom-drag generated diffusivity when USE_LOTW_BBL_DIFFUSIVITY is false. ! === module MOM_tidal_mixing === ! Vertical Tidal Mixing Parameterization diff --git a/ocean_only/seamount/sigma/MOM_parameter_doc.all b/ocean_only/seamount/sigma/MOM_parameter_doc.all index 03560032c..644e006ad 100644 --- a/ocean_only/seamount/sigma/MOM_parameter_doc.all +++ b/ocean_only/seamount/sigma/MOM_parameter_doc.all @@ -1416,6 +1416,8 @@ SET_DIFF_ANSWER_DATE = 99991231 ! default = 99991231 ! The vintage of the order of arithmetic and expressions in the set diffusivity ! calculations. Values below 20190101 recover the answers from the end of 2018, ! while higher values use updated and more robust forms of the same expressions. + ! Values above 20250301 also use less confusing expressions to set the + ! bottom-drag generated diffusivity when USE_LOTW_BBL_DIFFUSIVITY is false. ! === module MOM_tidal_mixing === ! Vertical Tidal Mixing Parameterization diff --git a/ocean_only/seamount/z/MOM_parameter_doc.all b/ocean_only/seamount/z/MOM_parameter_doc.all index 54824a83c..4c55d0ca2 100644 --- a/ocean_only/seamount/z/MOM_parameter_doc.all +++ b/ocean_only/seamount/z/MOM_parameter_doc.all @@ -1416,6 +1416,8 @@ SET_DIFF_ANSWER_DATE = 99991231 ! default = 99991231 ! The vintage of the order of arithmetic and expressions in the set diffusivity ! calculations. Values below 20190101 recover the answers from the end of 2018, ! while higher values use updated and more robust forms of the same expressions. + ! Values above 20250301 also use less confusing expressions to set the + ! bottom-drag generated diffusivity when USE_LOTW_BBL_DIFFUSIVITY is false. ! === module MOM_tidal_mixing === ! Vertical Tidal Mixing Parameterization diff --git a/ocean_only/single_column/BML/MOM_parameter_doc.all b/ocean_only/single_column/BML/MOM_parameter_doc.all index 3591a042f..99959b72c 100644 --- a/ocean_only/single_column/BML/MOM_parameter_doc.all +++ b/ocean_only/single_column/BML/MOM_parameter_doc.all @@ -1117,6 +1117,8 @@ SET_DIFF_ANSWER_DATE = 99991231 ! default = 99991231 ! The vintage of the order of arithmetic and expressions in the set diffusivity ! calculations. Values below 20190101 recover the answers from the end of 2018, ! while higher values use updated and more robust forms of the same expressions. + ! Values above 20250301 also use less confusing expressions to set the + ! bottom-drag generated diffusivity when USE_LOTW_BBL_DIFFUSIVITY is false. ! === module MOM_tidal_mixing === ! Vertical Tidal Mixing Parameterization @@ -1169,6 +1171,10 @@ USE_LOTW_BBL_DIFFUSIVITY = False ! [Boolean] default = False ! If true, uses a simple, imprecise but non-coordinate dependent, model of BBL ! mixing diffusivity based on Law of the Wall. Otherwise, uses the original BBL ! scheme. +DRAG_DIFFUSIVITY_ANSWER_DATE = 20250101 ! default = 20250101 + ! The vintage of the order of arithmetic in the drag diffusivity calculations. + ! Values above 20250301 use less confusing expressions to set the bottom-drag + ! generated diffusivity when USE_LOTW_BBL_DIFFUSIVITY is false. 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/single_column/EPBL/MOM_parameter_doc.all b/ocean_only/single_column/EPBL/MOM_parameter_doc.all index 9997fbd14..3ca1f5c4f 100644 --- a/ocean_only/single_column/EPBL/MOM_parameter_doc.all +++ b/ocean_only/single_column/EPBL/MOM_parameter_doc.all @@ -1280,6 +1280,8 @@ SET_DIFF_ANSWER_DATE = 99991231 ! default = 99991231 ! The vintage of the order of arithmetic and expressions in the set diffusivity ! calculations. Values below 20190101 recover the answers from the end of 2018, ! while higher values use updated and more robust forms of the same expressions. + ! Values above 20250301 also use less confusing expressions to set the + ! bottom-drag generated diffusivity when USE_LOTW_BBL_DIFFUSIVITY is false. ! === module MOM_tidal_mixing === ! Vertical Tidal Mixing Parameterization @@ -1332,6 +1334,10 @@ USE_LOTW_BBL_DIFFUSIVITY = False ! [Boolean] default = False ! If true, uses a simple, imprecise but non-coordinate dependent, model of BBL ! mixing diffusivity based on Law of the Wall. Otherwise, uses the original BBL ! scheme. +DRAG_DIFFUSIVITY_ANSWER_DATE = 20250101 ! default = 20250101 + ! The vintage of the order of arithmetic in the drag diffusivity calculations. + ! Values above 20250301 use less confusing expressions to set the bottom-drag + ! generated diffusivity when USE_LOTW_BBL_DIFFUSIVITY is false. 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. @@ -1589,6 +1595,9 @@ VSTAR_SURF_FAC = 1.2 ! [nondim] default = 1.2 EPBL_BBL_EFFIC = 0.0 ! [nondim] default = 0.0 ! The efficiency of bottom boundary layer mixing via ePBL. Setting this to a ! value that is greater than 0 to enable bottom boundary layer mixing from EPBL. +EPBL_BBL_TIDAL_EFFIC = 0.0 ! [nondim] default = 0.0 + ! The efficiency of bottom boundary layer mixing via ePBL driven by the bottom + ! drag dissipation of tides, as provided in fluxes%BBL_tidal_dis. USE_LA_LI2016 = False ! [Boolean] default = False ! A logical to use the Li et al. 2016 (submitted) formula to determine the ! Langmuir number. diff --git a/ocean_only/single_column/KPP/MOM_parameter_doc.all b/ocean_only/single_column/KPP/MOM_parameter_doc.all index 29a020991..d8f13c7f1 100644 --- a/ocean_only/single_column/KPP/MOM_parameter_doc.all +++ b/ocean_only/single_column/KPP/MOM_parameter_doc.all @@ -1277,6 +1277,8 @@ SET_DIFF_ANSWER_DATE = 99991231 ! default = 99991231 ! The vintage of the order of arithmetic and expressions in the set diffusivity ! calculations. Values below 20190101 recover the answers from the end of 2018, ! while higher values use updated and more robust forms of the same expressions. + ! Values above 20250301 also use less confusing expressions to set the + ! bottom-drag generated diffusivity when USE_LOTW_BBL_DIFFUSIVITY is false. ! === module MOM_tidal_mixing === ! Vertical Tidal Mixing Parameterization @@ -1329,6 +1331,10 @@ USE_LOTW_BBL_DIFFUSIVITY = False ! [Boolean] default = False ! If true, uses a simple, imprecise but non-coordinate dependent, model of BBL ! mixing diffusivity based on Law of the Wall. Otherwise, uses the original BBL ! scheme. +DRAG_DIFFUSIVITY_ANSWER_DATE = 20250101 ! default = 20250101 + ! The vintage of the order of arithmetic in the drag diffusivity calculations. + ! Values above 20250301 use less confusing expressions to set the bottom-drag + ! generated diffusivity when USE_LOTW_BBL_DIFFUSIVITY is false. 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/sloshing/layer/MOM_parameter_doc.all b/ocean_only/sloshing/layer/MOM_parameter_doc.all index d1c6a2869..e36c7372b 100644 --- a/ocean_only/sloshing/layer/MOM_parameter_doc.all +++ b/ocean_only/sloshing/layer/MOM_parameter_doc.all @@ -1290,6 +1290,8 @@ SET_DIFF_ANSWER_DATE = 99991231 ! default = 99991231 ! The vintage of the order of arithmetic and expressions in the set diffusivity ! calculations. Values below 20190101 recover the answers from the end of 2018, ! while higher values use updated and more robust forms of the same expressions. + ! Values above 20250301 also use less confusing expressions to set the + ! bottom-drag generated diffusivity when USE_LOTW_BBL_DIFFUSIVITY is false. ! === module MOM_tidal_mixing === ! Vertical Tidal Mixing Parameterization diff --git a/ocean_only/sloshing/rho/MOM_parameter_doc.all b/ocean_only/sloshing/rho/MOM_parameter_doc.all index 08d7ca8a6..b52e2e918 100644 --- a/ocean_only/sloshing/rho/MOM_parameter_doc.all +++ b/ocean_only/sloshing/rho/MOM_parameter_doc.all @@ -1452,6 +1452,8 @@ SET_DIFF_ANSWER_DATE = 99991231 ! default = 99991231 ! The vintage of the order of arithmetic and expressions in the set diffusivity ! calculations. Values below 20190101 recover the answers from the end of 2018, ! while higher values use updated and more robust forms of the same expressions. + ! Values above 20250301 also use less confusing expressions to set the + ! bottom-drag generated diffusivity when USE_LOTW_BBL_DIFFUSIVITY is false. ! === module MOM_tidal_mixing === ! Vertical Tidal Mixing Parameterization diff --git a/ocean_only/sloshing/z/MOM_parameter_doc.all b/ocean_only/sloshing/z/MOM_parameter_doc.all index 2e3cc32c0..c892ed467 100644 --- a/ocean_only/sloshing/z/MOM_parameter_doc.all +++ b/ocean_only/sloshing/z/MOM_parameter_doc.all @@ -1404,6 +1404,8 @@ SET_DIFF_ANSWER_DATE = 99991231 ! default = 99991231 ! The vintage of the order of arithmetic and expressions in the set diffusivity ! calculations. Values below 20190101 recover the answers from the end of 2018, ! while higher values use updated and more robust forms of the same expressions. + ! Values above 20250301 also use less confusing expressions to set the + ! bottom-drag generated diffusivity when USE_LOTW_BBL_DIFFUSIVITY is false. ! === module MOM_tidal_mixing === ! Vertical Tidal Mixing Parameterization diff --git a/ocean_only/torus_advection_test/MOM_parameter_doc.all b/ocean_only/torus_advection_test/MOM_parameter_doc.all index 9a3b2f3a1..56f4998f7 100644 --- a/ocean_only/torus_advection_test/MOM_parameter_doc.all +++ b/ocean_only/torus_advection_test/MOM_parameter_doc.all @@ -1273,6 +1273,8 @@ SET_DIFF_ANSWER_DATE = 99991231 ! default = 99991231 ! The vintage of the order of arithmetic and expressions in the set diffusivity ! calculations. Values below 20190101 recover the answers from the end of 2018, ! while higher values use updated and more robust forms of the same expressions. + ! Values above 20250301 also use less confusing expressions to set the + ! bottom-drag generated diffusivity when USE_LOTW_BBL_DIFFUSIVITY is false. ! === module MOM_tidal_mixing === ! Vertical Tidal Mixing Parameterization diff --git a/ocean_only/tracer_mixing/rho/MOM_parameter_doc.all b/ocean_only/tracer_mixing/rho/MOM_parameter_doc.all index 0bf32c625..375c92cce 100644 --- a/ocean_only/tracer_mixing/rho/MOM_parameter_doc.all +++ b/ocean_only/tracer_mixing/rho/MOM_parameter_doc.all @@ -1453,6 +1453,8 @@ SET_DIFF_ANSWER_DATE = 99991231 ! default = 99991231 ! The vintage of the order of arithmetic and expressions in the set diffusivity ! calculations. Values below 20190101 recover the answers from the end of 2018, ! while higher values use updated and more robust forms of the same expressions. + ! Values above 20250301 also use less confusing expressions to set the + ! bottom-drag generated diffusivity when USE_LOTW_BBL_DIFFUSIVITY is false. ! === module MOM_tidal_mixing === ! Vertical Tidal Mixing Parameterization diff --git a/ocean_only/tracer_mixing/z/MOM_parameter_doc.all b/ocean_only/tracer_mixing/z/MOM_parameter_doc.all index 2287d6c14..49be3b4e9 100644 --- a/ocean_only/tracer_mixing/z/MOM_parameter_doc.all +++ b/ocean_only/tracer_mixing/z/MOM_parameter_doc.all @@ -1405,6 +1405,8 @@ SET_DIFF_ANSWER_DATE = 99991231 ! default = 99991231 ! The vintage of the order of arithmetic and expressions in the set diffusivity ! calculations. Values below 20190101 recover the answers from the end of 2018, ! while higher values use updated and more robust forms of the same expressions. + ! Values above 20250301 also use less confusing expressions to set the + ! bottom-drag generated diffusivity when USE_LOTW_BBL_DIFFUSIVITY is false. ! === module MOM_tidal_mixing === ! Vertical Tidal Mixing Parameterization diff --git a/src/MOM6 b/src/MOM6 index 83efb99bf..a645328be 160000 --- a/src/MOM6 +++ b/src/MOM6 @@ -1 +1 @@ -Subproject commit 83efb99bf298a09c15c5ec5bfbe88479b93db126 +Subproject commit a645328be33e7d3db3d2433eba58eb86d16f25d8