MOM6: +*Non-Boussinesq revision of lateral_mixing_coeffs

- NOAA-GFDL/MOM6@13f26036e +*Non-Boussinesq revision of lateral_mixing_coeffs - NOAA-GFDL/MOM6@6d684598e +(*)Non-Boussinesq default for Z_INIT_REMAP_GENERAL MOM6: Module dependency in nested includes - NOAA-GFDL/MOM6@2047676a3 +*Add halo_size argument to wave_speeds - NOAA-GFDL/MOM6@08704f8c4 +*Non-Boussinesq wave_speed calculations - NOAA-GFDL/MOM6@e2d244f08 We need an extra pass_var for Kv_shear - NOAA-GFDL/MOM6@3ef5b9339 Do not allocate ustar and tau_mag together - NOAA-GFDL/MOM6@8d628bdb9 +*Non-Boussinesq revision of diabatic_aux
mom6bot · Oct 5, 2023 · 940be33 · 940be33
1 parent 3a136df
commit 940be33
Show file tree

Hide file tree

Showing 11 changed files with 61 additions and 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
@@ -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
@@ -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
@@ -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
@@ -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
@@ -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
@@ -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
@@ -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
@@ -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
@@ -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
@@ -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