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 dc74d5da71..bef83d5e00 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 @@ -714,6 +714,12 @@ VARMIX_KTOP = 6 ! [nondim] default = 2 MIN_DZ_FOR_SLOPE_N2 = 1.0 ! [m] default = 1.0 ! The minimum vertical distance to use in the denominator of the bouyancy ! frequency used in the slope calculation. +FULL_DEPTH_EADY_GROWTH_RATE = False ! [Boolean] default = False + ! If true, calculate the Eady growth rate based on average slope times + ! stratification that includes contributions from sea-level changes in its + ! denominator, rather than just the nominal depth of the bathymetry. This only + ! applies when using the model interface heights as a proxy for isopycnal + ! slopes. VISBECK_L_SCALE = 3.0E+04 ! [m or nondim] default = 0.0 ! The fixed length scale in the Visbeck formula, or if negative a nondimensional ! scaling factor relating this length scale squared to the cell areas. 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 238d8c81b2..bf7fdd3d17 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 @@ -714,6 +714,12 @@ VARMIX_KTOP = 6 ! [nondim] default = 2 MIN_DZ_FOR_SLOPE_N2 = 1.0 ! [m] default = 1.0 ! The minimum vertical distance to use in the denominator of the bouyancy ! frequency used in the slope calculation. +FULL_DEPTH_EADY_GROWTH_RATE = False ! [Boolean] default = False + ! If true, calculate the Eady growth rate based on average slope times + ! stratification that includes contributions from sea-level changes in its + ! denominator, rather than just the nominal depth of the bathymetry. This only + ! applies when using the model interface heights as a proxy for isopycnal + ! slopes. VISBECK_L_SCALE = 3.0E+04 ! [m or nondim] default = 0.0 ! The fixed length scale in the Visbeck formula, or if negative a nondimensional ! scaling factor relating this length scale squared to the cell areas. 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 b4e82aa0d4..d0172b77b5 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 @@ -714,6 +714,12 @@ VARMIX_KTOP = 6 ! [nondim] default = 2 MIN_DZ_FOR_SLOPE_N2 = 1.0 ! [m] default = 1.0 ! The minimum vertical distance to use in the denominator of the bouyancy ! frequency used in the slope calculation. +FULL_DEPTH_EADY_GROWTH_RATE = False ! [Boolean] default = False + ! If true, calculate the Eady growth rate based on average slope times + ! stratification that includes contributions from sea-level changes in its + ! denominator, rather than just the nominal depth of the bathymetry. This only + ! applies when using the model interface heights as a proxy for isopycnal + ! slopes. VISBECK_L_SCALE = 3.0E+04 ! [m or nondim] default = 0.0 ! The fixed length scale in the Visbeck formula, or if negative a nondimensional ! scaling factor relating this length scale squared to the cell areas. diff --git a/ice_ocean_SIS2/Baltic/MOM_parameter_doc.all b/ice_ocean_SIS2/Baltic/MOM_parameter_doc.all index d158d1b07a..84fd7fda57 100644 --- a/ice_ocean_SIS2/Baltic/MOM_parameter_doc.all +++ b/ice_ocean_SIS2/Baltic/MOM_parameter_doc.all @@ -714,6 +714,12 @@ VARMIX_KTOP = 6 ! [nondim] default = 2 MIN_DZ_FOR_SLOPE_N2 = 1.0 ! [m] default = 1.0 ! The minimum vertical distance to use in the denominator of the bouyancy ! frequency used in the slope calculation. +FULL_DEPTH_EADY_GROWTH_RATE = False ! [Boolean] default = False + ! If true, calculate the Eady growth rate based on average slope times + ! stratification that includes contributions from sea-level changes in its + ! denominator, rather than just the nominal depth of the bathymetry. This only + ! applies when using the model interface heights as a proxy for isopycnal + ! slopes. VISBECK_L_SCALE = 3.0E+04 ! [m or nondim] default = 0.0 ! The fixed length scale in the Visbeck formula, or if negative a nondimensional ! scaling factor relating this length scale squared to the cell areas. diff --git a/ice_ocean_SIS2/SIS2/MOM_parameter_doc.all b/ice_ocean_SIS2/SIS2/MOM_parameter_doc.all index ff39db4d99..00cc6aa800 100644 --- a/ice_ocean_SIS2/SIS2/MOM_parameter_doc.all +++ b/ice_ocean_SIS2/SIS2/MOM_parameter_doc.all @@ -686,6 +686,12 @@ VARMIX_KTOP = 6 ! [nondim] default = 2 MIN_DZ_FOR_SLOPE_N2 = 1.0 ! [m] default = 1.0 ! The minimum vertical distance to use in the denominator of the bouyancy ! frequency used in the slope calculation. +FULL_DEPTH_EADY_GROWTH_RATE = False ! [Boolean] default = False + ! If true, calculate the Eady growth rate based on average slope times + ! stratification that includes contributions from sea-level changes in its + ! denominator, rather than just the nominal depth of the bathymetry. This only + ! applies when using the model interface heights as a proxy for isopycnal + ! slopes. VISBECK_L_SCALE = 3.0E+04 ! [m or nondim] default = 0.0 ! The fixed length scale in the Visbeck formula, or if negative a nondimensional ! scaling factor relating this length scale squared to the cell areas. 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 52b3f4dcc4..581c07ea95 100644 --- a/ice_ocean_SIS2/SIS2_bergs_cgrid/MOM_parameter_doc.all +++ b/ice_ocean_SIS2/SIS2_bergs_cgrid/MOM_parameter_doc.all @@ -686,6 +686,12 @@ VARMIX_KTOP = 6 ! [nondim] default = 2 MIN_DZ_FOR_SLOPE_N2 = 1.0 ! [m] default = 1.0 ! The minimum vertical distance to use in the denominator of the bouyancy ! frequency used in the slope calculation. +FULL_DEPTH_EADY_GROWTH_RATE = False ! [Boolean] default = False + ! If true, calculate the Eady growth rate based on average slope times + ! stratification that includes contributions from sea-level changes in its + ! denominator, rather than just the nominal depth of the bathymetry. This only + ! applies when using the model interface heights as a proxy for isopycnal + ! slopes. VISBECK_L_SCALE = 3.0E+04 ! [m or nondim] default = 0.0 ! The fixed length scale in the Visbeck formula, or if negative a nondimensional ! scaling factor relating this length scale squared to the cell areas. diff --git a/ice_ocean_SIS2/SIS2_cgrid/MOM_parameter_doc.all b/ice_ocean_SIS2/SIS2_cgrid/MOM_parameter_doc.all index c2d7c2f722..84d14292a6 100644 --- a/ice_ocean_SIS2/SIS2_cgrid/MOM_parameter_doc.all +++ b/ice_ocean_SIS2/SIS2_cgrid/MOM_parameter_doc.all @@ -686,6 +686,12 @@ VARMIX_KTOP = 6 ! [nondim] default = 2 MIN_DZ_FOR_SLOPE_N2 = 1.0 ! [m] default = 1.0 ! The minimum vertical distance to use in the denominator of the bouyancy ! frequency used in the slope calculation. +FULL_DEPTH_EADY_GROWTH_RATE = False ! [Boolean] default = False + ! If true, calculate the Eady growth rate based on average slope times + ! stratification that includes contributions from sea-level changes in its + ! denominator, rather than just the nominal depth of the bathymetry. This only + ! applies when using the model interface heights as a proxy for isopycnal + ! slopes. VISBECK_L_SCALE = 3.0E+04 ! [m or nondim] default = 0.0 ! The fixed length scale in the Visbeck formula, or if negative a nondimensional ! scaling factor relating this length scale squared to the cell areas. diff --git a/ocean_only/benchmark/MOM_parameter_doc.all b/ocean_only/benchmark/MOM_parameter_doc.all index e2a440c6c6..059ced4e51 100644 --- a/ocean_only/benchmark/MOM_parameter_doc.all +++ b/ocean_only/benchmark/MOM_parameter_doc.all @@ -643,6 +643,12 @@ VARMIX_KTOP = 6 ! [nondim] default = 2 MIN_DZ_FOR_SLOPE_N2 = 1.0 ! [m] default = 1.0 ! The minimum vertical distance to use in the denominator of the bouyancy ! frequency used in the slope calculation. +FULL_DEPTH_EADY_GROWTH_RATE = False ! [Boolean] default = False + ! If true, calculate the Eady growth rate based on average slope times + ! stratification that includes contributions from sea-level changes in its + ! denominator, rather than just the nominal depth of the bathymetry. This only + ! applies when using the model interface heights as a proxy for isopycnal + ! slopes. VISBECK_L_SCALE = 3.0E+04 ! [m or nondim] default = 0.0 ! The fixed length scale in the Visbeck formula, or if negative a nondimensional ! scaling factor relating this length scale squared to the cell areas. diff --git a/ocean_only/global_ALE/layer/MOM_parameter_doc.all b/ocean_only/global_ALE/layer/MOM_parameter_doc.all index ebfc1c2a36..46da41f70b 100644 --- a/ocean_only/global_ALE/layer/MOM_parameter_doc.all +++ b/ocean_only/global_ALE/layer/MOM_parameter_doc.all @@ -811,6 +811,12 @@ VARMIX_KTOP = 2 ! [nondim] default = 2 MIN_DZ_FOR_SLOPE_N2 = 1.0 ! [m] default = 1.0 ! The minimum vertical distance to use in the denominator of the bouyancy ! frequency used in the slope calculation. +FULL_DEPTH_EADY_GROWTH_RATE = False ! [Boolean] default = False + ! If true, calculate the Eady growth rate based on average slope times + ! stratification that includes contributions from sea-level changes in its + ! denominator, rather than just the nominal depth of the bathymetry. This only + ! applies when using the model interface heights as a proxy for isopycnal + ! slopes. KH_RES_SCALE_COEF = 1.0 ! [nondim] default = 1.0 ! A coefficient that determines how KhTh is scaled away if RESOLN_SCALED_... is ! true, as F = 1 / (1 + (KH_RES_SCALE_COEF*Rd/dx)^KH_RES_FN_POWER). diff --git a/ocean_only/nonBous_global/MOM_parameter_doc.all b/ocean_only/nonBous_global/MOM_parameter_doc.all index 5d8ccc0fad..52510cf164 100644 --- a/ocean_only/nonBous_global/MOM_parameter_doc.all +++ b/ocean_only/nonBous_global/MOM_parameter_doc.all @@ -642,6 +642,12 @@ VARMIX_KTOP = 6 ! [nondim] default = 2 MIN_DZ_FOR_SLOPE_N2 = 1.0 ! [m] default = 1.0 ! The minimum vertical distance to use in the denominator of the bouyancy ! frequency used in the slope calculation. +FULL_DEPTH_EADY_GROWTH_RATE = False ! [Boolean] default = False + ! If true, calculate the Eady growth rate based on average slope times + ! stratification that includes contributions from sea-level changes in its + ! denominator, rather than just the nominal depth of the bathymetry. This only + ! applies when using the model interface heights as a proxy for isopycnal + ! slopes. VISBECK_L_SCALE = 3.0E+04 ! [m or nondim] default = 0.0 ! The fixed length scale in the Visbeck formula, or if negative a nondimensional ! scaling factor relating this length scale squared to the cell areas. diff --git a/src/MOM6 b/src/MOM6 index 2f1bdc06d4..13f26036e7 160000 --- a/src/MOM6 +++ b/src/MOM6 @@ -1 +1 @@ -Subproject commit 2f1bdc06d41e35582759c678de2a48ba1fd66fd9 +Subproject commit 13f26036e7849bd435500f00959c45989fb82c38