MOM6 bug fixes from mom-ocean/MOM6#149

mom-ocean/MOM6@9dd6497 Bugfix: uninitialized variable dS in midas_vertmap mom-ocean/MOM6@b7ffdc9 Bugfix: uninitialized variable debug_ in midas_vertmap mom-ocean/MOM6@719c885 Bugfix: uninitialized variable CS%Henyey_IGW_background_new mom-ocean/MOM6@c11e836 Bugfix: uninitialized variable CS%Decay_scale_factor_lee - mom-ocean/MOM6@719c885 changed all the MOM_parameter_doc.all files. - No answer changes.
NOAA-GFDL · Apr 28, 2015 · 375b3b1 · 375b3b1
1 parent ee0ed8a
commit 375b3b1
Show file tree

Hide file tree

Showing 48 changed files with 189 additions and 1 deletion.
diff --git a/coupled_AM2_LM3_SIS/AM2_MOM6i_1deg/MOM_parameter_doc.all b/coupled_AM2_LM3_SIS/AM2_MOM6i_1deg/MOM_parameter_doc.all
@@ -1088,6 +1088,10 @@ HENYEY_IGW_BACKGROUND = True    !   [Boolean] default = False
                                 ! If true, use a latitude-dependent scaling for the near
                                 ! surface background diffusivity, as described in
                                 ! Harrison & Hallberg, JPO 2008.
+HENYEY_IGW_BACKGROUND_NEW = False !   [Boolean] default = False
+                                ! If true, use a better latitude-dependent scaling for the
+                                ! background diffusivity, as described in
+                                ! Harrison & Hallberg, JPO 2008.
 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

diff --git a/coupled_AM2_LM3_SIS/CM2G63L/MOM_parameter_doc.all b/coupled_AM2_LM3_SIS/CM2G63L/MOM_parameter_doc.all
@@ -1107,6 +1107,10 @@ HENYEY_IGW_BACKGROUND = True    !   [Boolean] default = False
                                 ! If true, use a latitude-dependent scaling for the near
                                 ! surface background diffusivity, as described in
                                 ! Harrison & Hallberg, JPO 2008.
+HENYEY_IGW_BACKGROUND_NEW = False !   [Boolean] default = False
+                                ! If true, use a better latitude-dependent scaling for the
+                                ! background diffusivity, as described in
+                                ! Harrison & Hallberg, JPO 2008.
 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

diff --git a/coupled_AM2_LM3_SIS2/AM2_SIS2B_MOM6i_1deg/MOM_parameter_doc.all b/coupled_AM2_LM3_SIS2/AM2_SIS2B_MOM6i_1deg/MOM_parameter_doc.all
@@ -1088,6 +1088,10 @@ HENYEY_IGW_BACKGROUND = True    !   [Boolean] default = False
                                 ! If true, use a latitude-dependent scaling for the near
                                 ! surface background diffusivity, as described in
                                 ! Harrison & Hallberg, JPO 2008.
+HENYEY_IGW_BACKGROUND_NEW = False !   [Boolean] default = False
+                                ! If true, use a better latitude-dependent scaling for the
+                                ! background diffusivity, as described in
+                                ! Harrison & Hallberg, JPO 2008.
 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

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
@@ -1088,6 +1088,10 @@ HENYEY_IGW_BACKGROUND = True    !   [Boolean] default = False
                                 ! If true, use a latitude-dependent scaling for the near
                                 ! surface background diffusivity, as described in
                                 ! Harrison & Hallberg, JPO 2008.
+HENYEY_IGW_BACKGROUND_NEW = False !   [Boolean] default = False
+                                ! If true, use a better latitude-dependent scaling for the
+                                ! background diffusivity, as described in
+                                ! Harrison & Hallberg, JPO 2008.
 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

diff --git a/ice_ocean_SIS/GOLD_SIS/MOM_parameter_doc.all b/ice_ocean_SIS/GOLD_SIS/MOM_parameter_doc.all
@@ -1115,6 +1115,10 @@ HENYEY_IGW_BACKGROUND = True    !   [Boolean] default = False
                                 ! If true, use a latitude-dependent scaling for the near
                                 ! surface background diffusivity, as described in
                                 ! Harrison & Hallberg, JPO 2008.
+HENYEY_IGW_BACKGROUND_NEW = False !   [Boolean] default = False
+                                ! If true, use a better latitude-dependent scaling for the
+                                ! background diffusivity, as described in
+                                ! Harrison & Hallberg, JPO 2008.
 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

diff --git a/ice_ocean_SIS/GOLD_SIS_icebergs/MOM_parameter_doc.all b/ice_ocean_SIS/GOLD_SIS_icebergs/MOM_parameter_doc.all
@@ -1115,6 +1115,10 @@ HENYEY_IGW_BACKGROUND = True    !   [Boolean] default = False
                                 ! If true, use a latitude-dependent scaling for the near
                                 ! surface background diffusivity, as described in
                                 ! Harrison & Hallberg, JPO 2008.
+HENYEY_IGW_BACKGROUND_NEW = False !   [Boolean] default = False
+                                ! If true, use a better latitude-dependent scaling for the
+                                ! background diffusivity, as described in
+                                ! Harrison & Hallberg, JPO 2008.
 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

diff --git a/ice_ocean_SIS/OM4_025/MOM_parameter_doc.all b/ice_ocean_SIS/OM4_025/MOM_parameter_doc.all
@@ -1171,6 +1171,10 @@ HENYEY_IGW_BACKGROUND = True    !   [Boolean] default = False
                                 ! If true, use a latitude-dependent scaling for the near
                                 ! surface background diffusivity, as described in
                                 ! Harrison & Hallberg, JPO 2008.
+HENYEY_IGW_BACKGROUND_NEW = False !   [Boolean] default = False
+                                ! If true, use a better latitude-dependent scaling for the
+                                ! background diffusivity, as described in
+                                ! Harrison & Hallberg, JPO 2008.
 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

diff --git a/ice_ocean_SIS2/Baltic/MOM_parameter_doc.all b/ice_ocean_SIS2/Baltic/MOM_parameter_doc.all
@@ -1088,6 +1088,10 @@ HENYEY_IGW_BACKGROUND = True    !   [Boolean] default = False
                                 ! If true, use a latitude-dependent scaling for the near
                                 ! surface background diffusivity, as described in
                                 ! Harrison & Hallberg, JPO 2008.
+HENYEY_IGW_BACKGROUND_NEW = False !   [Boolean] default = False
+                                ! If true, use a better latitude-dependent scaling for the
+                                ! background diffusivity, as described in
+                                ! Harrison & Hallberg, JPO 2008.
 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

diff --git a/ice_ocean_SIS2/OM4_025/MOM_parameter_doc.all b/ice_ocean_SIS2/OM4_025/MOM_parameter_doc.all
@@ -1171,6 +1171,10 @@ HENYEY_IGW_BACKGROUND = True    !   [Boolean] default = False
                                 ! If true, use a latitude-dependent scaling for the near
                                 ! surface background diffusivity, as described in
                                 ! Harrison & Hallberg, JPO 2008.
+HENYEY_IGW_BACKGROUND_NEW = False !   [Boolean] default = False
+                                ! If true, use a better latitude-dependent scaling for the
+                                ! background diffusivity, as described in
+                                ! Harrison & Hallberg, JPO 2008.
 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

diff --git a/ice_ocean_SIS2/SIS2/MOM_parameter_doc.all b/ice_ocean_SIS2/SIS2/MOM_parameter_doc.all
@@ -1115,6 +1115,10 @@ HENYEY_IGW_BACKGROUND = True    !   [Boolean] default = False
                                 ! If true, use a latitude-dependent scaling for the near
                                 ! surface background diffusivity, as described in
                                 ! Harrison & Hallberg, JPO 2008.
+HENYEY_IGW_BACKGROUND_NEW = False !   [Boolean] default = False
+                                ! If true, use a better latitude-dependent scaling for the
+                                ! background diffusivity, as described in
+                                ! Harrison & Hallberg, JPO 2008.
 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

diff --git a/ice_ocean_SIS2/SIS2_bergs_cgrid/MOM_parameter_doc.all b/ice_ocean_SIS2/SIS2_bergs_cgrid/MOM_parameter_doc.all
@@ -1115,6 +1115,10 @@ HENYEY_IGW_BACKGROUND = True    !   [Boolean] default = False
                                 ! If true, use a latitude-dependent scaling for the near
                                 ! surface background diffusivity, as described in
                                 ! Harrison & Hallberg, JPO 2008.
+HENYEY_IGW_BACKGROUND_NEW = False !   [Boolean] default = False
+                                ! If true, use a better latitude-dependent scaling for the
+                                ! background diffusivity, as described in
+                                ! Harrison & Hallberg, JPO 2008.
 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

diff --git a/ice_ocean_SIS2/SIS2_cgrid/MOM_parameter_doc.all b/ice_ocean_SIS2/SIS2_cgrid/MOM_parameter_doc.all
@@ -1115,6 +1115,10 @@ HENYEY_IGW_BACKGROUND = True    !   [Boolean] default = False
                                 ! If true, use a latitude-dependent scaling for the near
                                 ! surface background diffusivity, as described in
                                 ! Harrison & Hallberg, JPO 2008.
+HENYEY_IGW_BACKGROUND_NEW = False !   [Boolean] default = False
+                                ! If true, use a better latitude-dependent scaling for the
+                                ! background diffusivity, as described in
+                                ! Harrison & Hallberg, JPO 2008.
 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

diff --git a/ice_ocean_SIS2/SIS2_icebergs/MOM_parameter_doc.all b/ice_ocean_SIS2/SIS2_icebergs/MOM_parameter_doc.all
@@ -1115,6 +1115,10 @@ HENYEY_IGW_BACKGROUND = True    !   [Boolean] default = False
                                 ! If true, use a latitude-dependent scaling for the near
                                 ! surface background diffusivity, as described in
                                 ! Harrison & Hallberg, JPO 2008.
+HENYEY_IGW_BACKGROUND_NEW = False !   [Boolean] default = False
+                                ! If true, use a better latitude-dependent scaling for the
+                                ! background diffusivity, as described in
+                                ! Harrison & Hallberg, JPO 2008.
 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

diff --git a/ocean_only/DOME/MOM_parameter_doc.all b/ocean_only/DOME/MOM_parameter_doc.all
@@ -884,6 +884,10 @@ HENYEY_IGW_BACKGROUND = False   !   [Boolean] default = False
                                 ! If true, use a latitude-dependent scaling for the near
                                 ! surface background diffusivity, as described in
                                 ! Harrison & Hallberg, JPO 2008.
+HENYEY_IGW_BACKGROUND_NEW = False !   [Boolean] default = False
+                                ! If true, use a better latitude-dependent scaling for the
+                                ! background diffusivity, as described in
+                                ! Harrison & Hallberg, JPO 2008.
 N2_FLOOR_IOMEGA2 = 1.0          !   [nondim] default = 1.0
                                 ! The floor applied to N2(k) scaled by Omega^2:
                                 !   If =0., N2(k) is simply positive definite.

diff --git a/ocean_only/MESO_025_63L/MOM_parameter_doc.all b/ocean_only/MESO_025_63L/MOM_parameter_doc.all
@@ -1027,6 +1027,10 @@ HENYEY_IGW_BACKGROUND = False   !   [Boolean] default = False
                                 ! If true, use a latitude-dependent scaling for the near
                                 ! surface background diffusivity, as described in
                                 ! Harrison & Hallberg, JPO 2008.
+HENYEY_IGW_BACKGROUND_NEW = False !   [Boolean] default = False
+                                ! If true, use a better latitude-dependent scaling for the
+                                ! background diffusivity, as described in
+                                ! Harrison & Hallberg, JPO 2008.
 N2_FLOOR_IOMEGA2 = 1.0          !   [nondim] default = 1.0
                                 ! The floor applied to N2(k) scaled by Omega^2:
                                 !   If =0., N2(k) is simply positive definite.

diff --git a/ocean_only/Phillips_2layer/MOM_parameter_doc.all b/ocean_only/Phillips_2layer/MOM_parameter_doc.all
@@ -913,6 +913,10 @@ HENYEY_IGW_BACKGROUND = False   !   [Boolean] default = False
                                 ! If true, use a latitude-dependent scaling for the near
                                 ! surface background diffusivity, as described in
                                 ! Harrison & Hallberg, JPO 2008.
+HENYEY_IGW_BACKGROUND_NEW = False !   [Boolean] default = False
+                                ! If true, use a better latitude-dependent scaling for the
+                                ! background diffusivity, as described in
+                                ! Harrison & Hallberg, JPO 2008.
 N2_FLOOR_IOMEGA2 = 1.0          !   [nondim] default = 1.0
                                 ! The floor applied to N2(k) scaled by Omega^2:
                                 !   If =0., N2(k) is simply positive definite.

diff --git a/ocean_only/SCM_KPP_tests/WSwPSBF.A/MOM_parameter_doc.all b/ocean_only/SCM_KPP_tests/WSwPSBF.A/MOM_parameter_doc.all
@@ -895,6 +895,10 @@ HENYEY_IGW_BACKGROUND = False   !   [Boolean] default = False
                                 ! If true, use a latitude-dependent scaling for the near
                                 ! surface background diffusivity, as described in
                                 ! Harrison & Hallberg, JPO 2008.
+HENYEY_IGW_BACKGROUND_NEW = False !   [Boolean] default = False
+                                ! If true, use a better latitude-dependent scaling for the
+                                ! background diffusivity, as described in
+                                ! Harrison & Hallberg, JPO 2008.
 N2_FLOOR_IOMEGA2 = 1.0          !   [nondim] default = 1.0
                                 ! The floor applied to N2(k) scaled by Omega^2:
                                 !   If =0., N2(k) is simply positive definite.

diff --git a/ocean_only/SCM_KPP_tests/WSwPSBF.B/MOM_parameter_doc.all b/ocean_only/SCM_KPP_tests/WSwPSBF.B/MOM_parameter_doc.all
@@ -895,6 +895,10 @@ HENYEY_IGW_BACKGROUND = False   !   [Boolean] default = False
                                 ! If true, use a latitude-dependent scaling for the near
                                 ! surface background diffusivity, as described in
                                 ! Harrison & Hallberg, JPO 2008.
+HENYEY_IGW_BACKGROUND_NEW = False !   [Boolean] default = False
+                                ! If true, use a better latitude-dependent scaling for the
+                                ! background diffusivity, as described in
+                                ! Harrison & Hallberg, JPO 2008.
 N2_FLOOR_IOMEGA2 = 1.0          !   [nondim] default = 1.0
                                 ! The floor applied to N2(k) scaled by Omega^2:
                                 !   If =0., N2(k) is simply positive definite.

diff --git a/ocean_only/SCM_KPP_tests/WSwPSBF.C/MOM_parameter_doc.all b/ocean_only/SCM_KPP_tests/WSwPSBF.C/MOM_parameter_doc.all
@@ -895,6 +895,10 @@ HENYEY_IGW_BACKGROUND = False   !   [Boolean] default = False
                                 ! If true, use a latitude-dependent scaling for the near
                                 ! surface background diffusivity, as described in
                                 ! Harrison & Hallberg, JPO 2008.
+HENYEY_IGW_BACKGROUND_NEW = False !   [Boolean] default = False
+                                ! If true, use a better latitude-dependent scaling for the
+                                ! background diffusivity, as described in
+                                ! Harrison & Hallberg, JPO 2008.
 N2_FLOOR_IOMEGA2 = 1.0          !   [nondim] default = 1.0
                                 ! The floor applied to N2(k) scaled by Omega^2:
                                 !   If =0., N2(k) is simply positive definite.

diff --git a/ocean_only/SCM_idealized_hurricane/MOM_parameter_doc.all b/ocean_only/SCM_idealized_hurricane/MOM_parameter_doc.all
@@ -895,6 +895,10 @@ HENYEY_IGW_BACKGROUND = False   !   [Boolean] default = False
                                 ! If true, use a latitude-dependent scaling for the near
                                 ! surface background diffusivity, as described in
                                 ! Harrison & Hallberg, JPO 2008.
+HENYEY_IGW_BACKGROUND_NEW = False !   [Boolean] default = False
+                                ! If true, use a better latitude-dependent scaling for the
+                                ! background diffusivity, as described in
+                                ! Harrison & Hallberg, JPO 2008.
 N2_FLOOR_IOMEGA2 = 1.0          !   [nondim] default = 1.0
                                 ! The floor applied to N2(k) scaled by Omega^2:
                                 !   If =0., N2(k) is simply positive definite.

diff --git a/ocean_only/adjustment2d/layer/MOM_parameter_doc.all b/ocean_only/adjustment2d/layer/MOM_parameter_doc.all
@@ -953,6 +953,10 @@ HENYEY_IGW_BACKGROUND = False   !   [Boolean] default = False
                                 ! If true, use a latitude-dependent scaling for the near
                                 ! surface background diffusivity, as described in
                                 ! Harrison & Hallberg, JPO 2008.
+HENYEY_IGW_BACKGROUND_NEW = False !   [Boolean] default = False
+                                ! If true, use a better latitude-dependent scaling for the
+                                ! background diffusivity, as described in
+                                ! Harrison & Hallberg, JPO 2008.
 N2_FLOOR_IOMEGA2 = 1.0          !   [nondim] default = 1.0
                                 ! The floor applied to N2(k) scaled by Omega^2:
                                 !   If =0., N2(k) is simply positive definite.

diff --git a/ocean_only/adjustment2d/rho/MOM_parameter_doc.all b/ocean_only/adjustment2d/rho/MOM_parameter_doc.all
@@ -1024,6 +1024,10 @@ HENYEY_IGW_BACKGROUND = False   !   [Boolean] default = False
                                 ! If true, use a latitude-dependent scaling for the near
                                 ! surface background diffusivity, as described in
                                 ! Harrison & Hallberg, JPO 2008.
+HENYEY_IGW_BACKGROUND_NEW = False !   [Boolean] default = False
+                                ! If true, use a better latitude-dependent scaling for the
+                                ! background diffusivity, as described in
+                                ! Harrison & Hallberg, JPO 2008.
 N2_FLOOR_IOMEGA2 = 1.0          !   [nondim] default = 1.0
                                 ! The floor applied to N2(k) scaled by Omega^2:
                                 !   If =0., N2(k) is simply positive definite.

diff --git a/ocean_only/adjustment2d/z/MOM_parameter_doc.all b/ocean_only/adjustment2d/z/MOM_parameter_doc.all
@@ -1024,6 +1024,10 @@ HENYEY_IGW_BACKGROUND = False   !   [Boolean] default = False
                                 ! If true, use a latitude-dependent scaling for the near
                                 ! surface background diffusivity, as described in
                                 ! Harrison & Hallberg, JPO 2008.
+HENYEY_IGW_BACKGROUND_NEW = False !   [Boolean] default = False
+                                ! If true, use a better latitude-dependent scaling for the
+                                ! background diffusivity, as described in
+                                ! Harrison & Hallberg, JPO 2008.
 N2_FLOOR_IOMEGA2 = 1.0          !   [nondim] default = 1.0
                                 ! The floor applied to N2(k) scaled by Omega^2:
                                 !   If =0., N2(k) is simply positive definite.

diff --git a/ocean_only/benchmark/MOM_parameter_doc.all b/ocean_only/benchmark/MOM_parameter_doc.all
@@ -1045,6 +1045,10 @@ HENYEY_IGW_BACKGROUND = False   !   [Boolean] default = False
                                 ! If true, use a latitude-dependent scaling for the near
                                 ! surface background diffusivity, as described in
                                 ! Harrison & Hallberg, JPO 2008.
+HENYEY_IGW_BACKGROUND_NEW = False !   [Boolean] default = False
+                                ! If true, use a better latitude-dependent scaling for the
+                                ! background diffusivity, as described in
+                                ! Harrison & Hallberg, JPO 2008.
 N2_FLOOR_IOMEGA2 = 1.0          !   [nondim] default = 1.0
                                 ! The floor applied to N2(k) scaled by Omega^2:
                                 !   If =0., N2(k) is simply positive definite.