From 582385d4fd6175aa94b65d767009d263e53ff0fb Mon Sep 17 00:00:00 2001 From: MOM6 bot Date: Mon, 22 Apr 2024 20:04:50 -0400 Subject: [PATCH] MOM6: Proto-type cricital latitude modification of Henyey - NOAA-GFDL/MOM6@0efe83d74 Proto-type cricital latitude modification of Henyey - NOAA-GFDL/MOM6@1c4d0dc88 Better document variable units in 3 user modules MOM6: Better error report for failed parsing - NOAA-GFDL/MOM6@6c44c5f38 Fix for using tidal amplitude in determining the BBL thickness - NOAA-GFDL/MOM6@3a3baf12f (*)Fix Stokes drift spectrum rescaling - NOAA-GFDL/MOM6@6f1c79eb6 CPP expression parser for makedep - NOAA-GFDL/MOM6@5b9ae5288 Disable codecov upload requirement - NOAA-GFDL/MOM6@b98acd861 Add units to the descriptions of 115 variables - NOAA-GFDL/MOM6@43b2a4305 Add units to the descriptions of 141 variables - NOAA-GFDL/MOM6@c86358b74 (*)Avoiding using RHO_0 in non-Boussinesq debugging - NOAA-GFDL/MOM6@2d121dcc4 (*)Pass dz to user initialize_ALE_sponge calls --- coupled_AM2_LM3_SIS2/AM2_SIS2_MOM6i_1deg/MOM_parameter_doc.all | 3 +++ coupled_AM2_LM3_SIS2/Concurrent_ice_1deg/MOM_parameter_doc.all | 3 +++ .../Intersperse_ice_1deg/MOM_parameter_doc.all | 3 +++ ice_ocean_SIS2/Baltic/MOM_parameter_doc.all | 3 +++ .../Baltic_ALE_z_offline_tracers/MOM_parameter_doc.all | 3 +++ ice_ocean_SIS2/Baltic_OM4_025/MOM_parameter_doc.all | 3 +++ ice_ocean_SIS2/Baltic_OM4_05/MOM_parameter_doc.all | 3 +++ ice_ocean_SIS2/OM4_025/MOM_parameter_doc.all | 3 +++ ice_ocean_SIS2/OM4_05/MOM_parameter_doc.all | 3 +++ ice_ocean_SIS2/OM_1deg/MOM_parameter_doc.all | 3 +++ ice_ocean_SIS2/SIS2/MOM_parameter_doc.all | 3 +++ ice_ocean_SIS2/SIS2_bergs_cgrid/MOM_parameter_doc.all | 3 +++ ice_ocean_SIS2/SIS2_cgrid/MOM_parameter_doc.all | 3 +++ ocean_only/global_ALE/hycom/MOM_parameter_doc.all | 3 +++ ocean_only/global_ALE/layer/MOM_parameter_doc.all | 3 +++ ocean_only/global_ALE/z/MOM_parameter_doc.all | 3 +++ ocean_only/nonBous_global/MOM_parameter_doc.all | 3 +++ src/MOM6 | 2 +- 18 files changed, 52 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 4ef3c092f..d01576eac 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 @@ -1609,6 +1609,9 @@ HENYEY_IGW_BACKGROUND = True ! [Boolean] default = False HENYEY_N0_2OMEGA = 20.0 ! [nondim] default = 20.0 ! The ratio of the typical Buoyancy frequency to twice the Earth's rotation ! period, used with the Henyey scaling from the mixing. +HENYEY_MAX_LAT = 95.0 ! [degN] default = 95.0 + ! A latitude poleward of which the Henyey profile is returned to the minimum + ! diffusivity KD_TANH_LAT_FN = False ! [Boolean] default = False ! If true, use a tanh dependence of Kd_sfc on latitude, like CM2.1/CM2M. There ! is no physical justification for this form, and it can not be used with 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 a7552565b..cb7a24bbd 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 @@ -1609,6 +1609,9 @@ HENYEY_IGW_BACKGROUND = True ! [Boolean] default = False HENYEY_N0_2OMEGA = 20.0 ! [nondim] default = 20.0 ! The ratio of the typical Buoyancy frequency to twice the Earth's rotation ! period, used with the Henyey scaling from the mixing. +HENYEY_MAX_LAT = 95.0 ! [degN] default = 95.0 + ! A latitude poleward of which the Henyey profile is returned to the minimum + ! diffusivity KD_TANH_LAT_FN = False ! [Boolean] default = False ! If true, use a tanh dependence of Kd_sfc on latitude, like CM2.1/CM2M. There ! is no physical justification for this form, and it can not be used with 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 17fb09306..cb24c9290 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 @@ -1609,6 +1609,9 @@ HENYEY_IGW_BACKGROUND = True ! [Boolean] default = False HENYEY_N0_2OMEGA = 20.0 ! [nondim] default = 20.0 ! The ratio of the typical Buoyancy frequency to twice the Earth's rotation ! period, used with the Henyey scaling from the mixing. +HENYEY_MAX_LAT = 95.0 ! [degN] default = 95.0 + ! A latitude poleward of which the Henyey profile is returned to the minimum + ! diffusivity KD_TANH_LAT_FN = False ! [Boolean] default = False ! If true, use a tanh dependence of Kd_sfc on latitude, like CM2.1/CM2M. There ! is no physical justification for this form, and it can not be used with diff --git a/ice_ocean_SIS2/Baltic/MOM_parameter_doc.all b/ice_ocean_SIS2/Baltic/MOM_parameter_doc.all index 6f88ba48e..272058b19 100644 --- a/ice_ocean_SIS2/Baltic/MOM_parameter_doc.all +++ b/ice_ocean_SIS2/Baltic/MOM_parameter_doc.all @@ -1609,6 +1609,9 @@ HENYEY_IGW_BACKGROUND = True ! [Boolean] default = False HENYEY_N0_2OMEGA = 20.0 ! [nondim] default = 20.0 ! The ratio of the typical Buoyancy frequency to twice the Earth's rotation ! period, used with the Henyey scaling from the mixing. +HENYEY_MAX_LAT = 95.0 ! [degN] default = 95.0 + ! A latitude poleward of which the Henyey profile is returned to the minimum + ! diffusivity KD_TANH_LAT_FN = False ! [Boolean] default = False ! If true, use a tanh dependence of Kd_sfc on latitude, like CM2.1/CM2M. There ! is no physical justification for this form, and it can not be used with 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 a49406633..3e96376f8 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 @@ -1843,6 +1843,9 @@ HENYEY_IGW_BACKGROUND = True ! [Boolean] default = False HENYEY_N0_2OMEGA = 20.0 ! [nondim] default = 20.0 ! The ratio of the typical Buoyancy frequency to twice the Earth's rotation ! period, used with the Henyey scaling from the mixing. +HENYEY_MAX_LAT = 95.0 ! [degN] default = 95.0 + ! A latitude poleward of which the Henyey profile is returned to the minimum + ! diffusivity KD_TANH_LAT_FN = False ! [Boolean] default = False ! If true, use a tanh dependence of Kd_sfc on latitude, like CM2.1/CM2M. There ! is no physical justification for this form, and it can not be used with 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 bd9de337b..cab647c77 100644 --- a/ice_ocean_SIS2/Baltic_OM4_025/MOM_parameter_doc.all +++ b/ice_ocean_SIS2/Baltic_OM4_025/MOM_parameter_doc.all @@ -1889,6 +1889,9 @@ HENYEY_IGW_BACKGROUND = True ! [Boolean] default = False HENYEY_N0_2OMEGA = 20.0 ! [nondim] default = 20.0 ! The ratio of the typical Buoyancy frequency to twice the Earth's rotation ! period, used with the Henyey scaling from the mixing. +HENYEY_MAX_LAT = 95.0 ! [degN] default = 95.0 + ! A latitude poleward of which the Henyey profile is returned to the minimum + ! diffusivity KD_TANH_LAT_FN = False ! [Boolean] default = False ! If true, use a tanh dependence of Kd_sfc on latitude, like CM2.1/CM2M. There ! is no physical justification for this form, and it can not be used with 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 a6c09511e..4caac1218 100644 --- a/ice_ocean_SIS2/Baltic_OM4_05/MOM_parameter_doc.all +++ b/ice_ocean_SIS2/Baltic_OM4_05/MOM_parameter_doc.all @@ -1908,6 +1908,9 @@ HENYEY_IGW_BACKGROUND = True ! [Boolean] default = False HENYEY_N0_2OMEGA = 20.0 ! [nondim] default = 20.0 ! The ratio of the typical Buoyancy frequency to twice the Earth's rotation ! period, used with the Henyey scaling from the mixing. +HENYEY_MAX_LAT = 95.0 ! [degN] default = 95.0 + ! A latitude poleward of which the Henyey profile is returned to the minimum + ! diffusivity KD_TANH_LAT_FN = False ! [Boolean] default = False ! If true, use a tanh dependence of Kd_sfc on latitude, like CM2.1/CM2M. There ! is no physical justification for this form, and it can not be used with diff --git a/ice_ocean_SIS2/OM4_025/MOM_parameter_doc.all b/ice_ocean_SIS2/OM4_025/MOM_parameter_doc.all index ed6a2f102..c65dd99d4 100644 --- a/ice_ocean_SIS2/OM4_025/MOM_parameter_doc.all +++ b/ice_ocean_SIS2/OM4_025/MOM_parameter_doc.all @@ -1889,6 +1889,9 @@ HENYEY_IGW_BACKGROUND = True ! [Boolean] default = False HENYEY_N0_2OMEGA = 20.0 ! [nondim] default = 20.0 ! The ratio of the typical Buoyancy frequency to twice the Earth's rotation ! period, used with the Henyey scaling from the mixing. +HENYEY_MAX_LAT = 95.0 ! [degN] default = 95.0 + ! A latitude poleward of which the Henyey profile is returned to the minimum + ! diffusivity KD_TANH_LAT_FN = False ! [Boolean] default = False ! If true, use a tanh dependence of Kd_sfc on latitude, like CM2.1/CM2M. There ! is no physical justification for this form, and it can not be used with diff --git a/ice_ocean_SIS2/OM4_05/MOM_parameter_doc.all b/ice_ocean_SIS2/OM4_05/MOM_parameter_doc.all index 575dab3db..bc33ab177 100644 --- a/ice_ocean_SIS2/OM4_05/MOM_parameter_doc.all +++ b/ice_ocean_SIS2/OM4_05/MOM_parameter_doc.all @@ -1908,6 +1908,9 @@ HENYEY_IGW_BACKGROUND = True ! [Boolean] default = False HENYEY_N0_2OMEGA = 20.0 ! [nondim] default = 20.0 ! The ratio of the typical Buoyancy frequency to twice the Earth's rotation ! period, used with the Henyey scaling from the mixing. +HENYEY_MAX_LAT = 95.0 ! [degN] default = 95.0 + ! A latitude poleward of which the Henyey profile is returned to the minimum + ! diffusivity KD_TANH_LAT_FN = False ! [Boolean] default = False ! If true, use a tanh dependence of Kd_sfc on latitude, like CM2.1/CM2M. There ! is no physical justification for this form, and it can not be used with diff --git a/ice_ocean_SIS2/OM_1deg/MOM_parameter_doc.all b/ice_ocean_SIS2/OM_1deg/MOM_parameter_doc.all index f5e2b1133..30be8ba21 100644 --- a/ice_ocean_SIS2/OM_1deg/MOM_parameter_doc.all +++ b/ice_ocean_SIS2/OM_1deg/MOM_parameter_doc.all @@ -1867,6 +1867,9 @@ HENYEY_IGW_BACKGROUND = True ! [Boolean] default = False HENYEY_N0_2OMEGA = 20.0 ! [nondim] default = 20.0 ! The ratio of the typical Buoyancy frequency to twice the Earth's rotation ! period, used with the Henyey scaling from the mixing. +HENYEY_MAX_LAT = 95.0 ! [degN] default = 95.0 + ! A latitude poleward of which the Henyey profile is returned to the minimum + ! diffusivity KD_TANH_LAT_FN = False ! [Boolean] default = False ! If true, use a tanh dependence of Kd_sfc on latitude, like CM2.1/CM2M. There ! is no physical justification for this form, and it can not be used with diff --git a/ice_ocean_SIS2/SIS2/MOM_parameter_doc.all b/ice_ocean_SIS2/SIS2/MOM_parameter_doc.all index 7fd6b3052..940880486 100644 --- a/ice_ocean_SIS2/SIS2/MOM_parameter_doc.all +++ b/ice_ocean_SIS2/SIS2/MOM_parameter_doc.all @@ -1581,6 +1581,9 @@ HENYEY_IGW_BACKGROUND = True ! [Boolean] default = False HENYEY_N0_2OMEGA = 20.0 ! [nondim] default = 20.0 ! The ratio of the typical Buoyancy frequency to twice the Earth's rotation ! period, used with the Henyey scaling from the mixing. +HENYEY_MAX_LAT = 95.0 ! [degN] default = 95.0 + ! A latitude poleward of which the Henyey profile is returned to the minimum + ! diffusivity KD_TANH_LAT_FN = False ! [Boolean] default = False ! If true, use a tanh dependence of Kd_sfc on latitude, like CM2.1/CM2M. There ! is no physical justification for this form, and it can not be used with 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 e0dd9ed80..80df5ddb0 100644 --- a/ice_ocean_SIS2/SIS2_bergs_cgrid/MOM_parameter_doc.all +++ b/ice_ocean_SIS2/SIS2_bergs_cgrid/MOM_parameter_doc.all @@ -1581,6 +1581,9 @@ HENYEY_IGW_BACKGROUND = True ! [Boolean] default = False HENYEY_N0_2OMEGA = 20.0 ! [nondim] default = 20.0 ! The ratio of the typical Buoyancy frequency to twice the Earth's rotation ! period, used with the Henyey scaling from the mixing. +HENYEY_MAX_LAT = 95.0 ! [degN] default = 95.0 + ! A latitude poleward of which the Henyey profile is returned to the minimum + ! diffusivity KD_TANH_LAT_FN = False ! [Boolean] default = False ! If true, use a tanh dependence of Kd_sfc on latitude, like CM2.1/CM2M. There ! is no physical justification for this form, and it can not be used with diff --git a/ice_ocean_SIS2/SIS2_cgrid/MOM_parameter_doc.all b/ice_ocean_SIS2/SIS2_cgrid/MOM_parameter_doc.all index 9db3f0508..7d283c70b 100644 --- a/ice_ocean_SIS2/SIS2_cgrid/MOM_parameter_doc.all +++ b/ice_ocean_SIS2/SIS2_cgrid/MOM_parameter_doc.all @@ -1581,6 +1581,9 @@ HENYEY_IGW_BACKGROUND = True ! [Boolean] default = False HENYEY_N0_2OMEGA = 20.0 ! [nondim] default = 20.0 ! The ratio of the typical Buoyancy frequency to twice the Earth's rotation ! period, used with the Henyey scaling from the mixing. +HENYEY_MAX_LAT = 95.0 ! [degN] default = 95.0 + ! A latitude poleward of which the Henyey profile is returned to the minimum + ! diffusivity KD_TANH_LAT_FN = False ! [Boolean] default = False ! If true, use a tanh dependence of Kd_sfc on latitude, like CM2.1/CM2M. There ! is no physical justification for this form, and it can not be used with diff --git a/ocean_only/global_ALE/hycom/MOM_parameter_doc.all b/ocean_only/global_ALE/hycom/MOM_parameter_doc.all index 6d6b0ced5..ecb490576 100644 --- a/ocean_only/global_ALE/hycom/MOM_parameter_doc.all +++ b/ocean_only/global_ALE/hycom/MOM_parameter_doc.all @@ -1893,6 +1893,9 @@ HENYEY_IGW_BACKGROUND = True ! [Boolean] default = False HENYEY_N0_2OMEGA = 20.0 ! [nondim] default = 20.0 ! The ratio of the typical Buoyancy frequency to twice the Earth's rotation ! period, used with the Henyey scaling from the mixing. +HENYEY_MAX_LAT = 95.0 ! [degN] default = 95.0 + ! A latitude poleward of which the Henyey profile is returned to the minimum + ! diffusivity KD_TANH_LAT_FN = False ! [Boolean] default = False ! If true, use a tanh dependence of Kd_sfc on latitude, like CM2.1/CM2M. There ! is no physical justification for this form, and it can not be used with diff --git a/ocean_only/global_ALE/layer/MOM_parameter_doc.all b/ocean_only/global_ALE/layer/MOM_parameter_doc.all index ede621fe8..2d8388c6e 100644 --- a/ocean_only/global_ALE/layer/MOM_parameter_doc.all +++ b/ocean_only/global_ALE/layer/MOM_parameter_doc.all @@ -1752,6 +1752,9 @@ HENYEY_IGW_BACKGROUND = True ! [Boolean] default = False HENYEY_N0_2OMEGA = 20.0 ! [nondim] default = 20.0 ! The ratio of the typical Buoyancy frequency to twice the Earth's rotation ! period, used with the Henyey scaling from the mixing. +HENYEY_MAX_LAT = 95.0 ! [degN] default = 95.0 + ! A latitude poleward of which the Henyey profile is returned to the minimum + ! diffusivity KD_TANH_LAT_FN = False ! [Boolean] default = False ! If true, use a tanh dependence of Kd_sfc on latitude, like CM2.1/CM2M. There ! is no physical justification for this form, and it can not be used with diff --git a/ocean_only/global_ALE/z/MOM_parameter_doc.all b/ocean_only/global_ALE/z/MOM_parameter_doc.all index 79fb99f33..c0b476407 100644 --- a/ocean_only/global_ALE/z/MOM_parameter_doc.all +++ b/ocean_only/global_ALE/z/MOM_parameter_doc.all @@ -1840,6 +1840,9 @@ HENYEY_IGW_BACKGROUND = True ! [Boolean] default = False HENYEY_N0_2OMEGA = 20.0 ! [nondim] default = 20.0 ! The ratio of the typical Buoyancy frequency to twice the Earth's rotation ! period, used with the Henyey scaling from the mixing. +HENYEY_MAX_LAT = 95.0 ! [degN] default = 95.0 + ! A latitude poleward of which the Henyey profile is returned to the minimum + ! diffusivity KD_TANH_LAT_FN = False ! [Boolean] default = False ! If true, use a tanh dependence of Kd_sfc on latitude, like CM2.1/CM2M. There ! is no physical justification for this form, and it can not be used with diff --git a/ocean_only/nonBous_global/MOM_parameter_doc.all b/ocean_only/nonBous_global/MOM_parameter_doc.all index 5b1ba5afb..9f7436942 100644 --- a/ocean_only/nonBous_global/MOM_parameter_doc.all +++ b/ocean_only/nonBous_global/MOM_parameter_doc.all @@ -1584,6 +1584,9 @@ HENYEY_IGW_BACKGROUND = True ! [Boolean] default = False HENYEY_N0_2OMEGA = 20.0 ! [nondim] default = 20.0 ! The ratio of the typical Buoyancy frequency to twice the Earth's rotation ! period, used with the Henyey scaling from the mixing. +HENYEY_MAX_LAT = 95.0 ! [degN] default = 95.0 + ! A latitude poleward of which the Henyey profile is returned to the minimum + ! diffusivity KD_TANH_LAT_FN = False ! [Boolean] default = False ! If true, use a tanh dependence of Kd_sfc on latitude, like CM2.1/CM2M. There ! is no physical justification for this form, and it can not be used with diff --git a/src/MOM6 b/src/MOM6 index a71fbce12..0efe83d74 160000 --- a/src/MOM6 +++ b/src/MOM6 @@ -1 +1 @@ -Subproject commit a71fbce121614fa6723e1bffecc3ba09c38973d5 +Subproject commit 0efe83d7433ac8aa89636257c262446b19ef34b2