From 375b3b17154c401a007ac39e2e29cf09f9f2b045 Mon Sep 17 00:00:00 2001 From: Alistair Adcroft Date: Mon, 27 Apr 2015 22:28:27 -0400 Subject: [PATCH] MOM6 bug fixes from CommerceGov/NOAA-GFDL-MOM6#149 CommerceGov/NOAA-GFDL-MOM6@9dd6497 Bugfix: uninitialized variable dS in midas_vertmap CommerceGov/NOAA-GFDL-MOM6@b7ffdc9 Bugfix: uninitialized variable debug_ in midas_vertmap CommerceGov/NOAA-GFDL-MOM6@719c885 Bugfix: uninitialized variable CS%Henyey_IGW_background_new CommerceGov/NOAA-GFDL-MOM6@c11e836 Bugfix: uninitialized variable CS%Decay_scale_factor_lee - CommerceGov/NOAA-GFDL-MOM6@719c885 changed all the MOM_parameter_doc.all files. - No answer changes. --- coupled_AM2_LM3_SIS/AM2_MOM6i_1deg/MOM_parameter_doc.all | 4 ++++ coupled_AM2_LM3_SIS/CM2G63L/MOM_parameter_doc.all | 4 ++++ .../AM2_SIS2B_MOM6i_1deg/MOM_parameter_doc.all | 4 ++++ .../AM2_SIS2_MOM6i_1deg/MOM_parameter_doc.all | 4 ++++ ice_ocean_SIS/GOLD_SIS/MOM_parameter_doc.all | 4 ++++ ice_ocean_SIS/GOLD_SIS_icebergs/MOM_parameter_doc.all | 4 ++++ ice_ocean_SIS/OM4_025/MOM_parameter_doc.all | 4 ++++ ice_ocean_SIS2/Baltic/MOM_parameter_doc.all | 4 ++++ ice_ocean_SIS2/OM4_025/MOM_parameter_doc.all | 4 ++++ ice_ocean_SIS2/SIS2/MOM_parameter_doc.all | 4 ++++ ice_ocean_SIS2/SIS2_bergs_cgrid/MOM_parameter_doc.all | 4 ++++ ice_ocean_SIS2/SIS2_cgrid/MOM_parameter_doc.all | 4 ++++ ice_ocean_SIS2/SIS2_icebergs/MOM_parameter_doc.all | 4 ++++ ocean_only/DOME/MOM_parameter_doc.all | 4 ++++ ocean_only/MESO_025_63L/MOM_parameter_doc.all | 4 ++++ ocean_only/Phillips_2layer/MOM_parameter_doc.all | 4 ++++ ocean_only/SCM_KPP_tests/WSwPSBF.A/MOM_parameter_doc.all | 4 ++++ ocean_only/SCM_KPP_tests/WSwPSBF.B/MOM_parameter_doc.all | 4 ++++ ocean_only/SCM_KPP_tests/WSwPSBF.C/MOM_parameter_doc.all | 4 ++++ ocean_only/SCM_idealized_hurricane/MOM_parameter_doc.all | 4 ++++ ocean_only/adjustment2d/layer/MOM_parameter_doc.all | 4 ++++ ocean_only/adjustment2d/rho/MOM_parameter_doc.all | 4 ++++ ocean_only/adjustment2d/z/MOM_parameter_doc.all | 4 ++++ ocean_only/benchmark/MOM_parameter_doc.all | 4 ++++ ocean_only/circle_obcs/MOM_parameter_doc.all | 4 ++++ ocean_only/external_gwave/MOM_parameter_doc.all | 4 ++++ ocean_only/flow_downslope/layer/MOM_parameter_doc.all | 4 ++++ ocean_only/flow_downslope/rho/MOM_parameter_doc.all | 4 ++++ ocean_only/flow_downslope/sigma/MOM_parameter_doc.all | 4 ++++ ocean_only/flow_downslope/z/MOM_parameter_doc.all | 4 ++++ ocean_only/global/MOM_parameter_doc.all | 4 ++++ ocean_only/global_ALE/layer/MOM_parameter_doc.all | 4 ++++ ocean_only/global_ALE/z/MOM_parameter_doc.all | 4 ++++ ocean_only/lock_exchange/MOM_parameter_doc.all | 4 ++++ ocean_only/mixed_layer_restrat_2d/MOM_parameter_doc.all | 4 ++++ ocean_only/nonBous_global/MOM_parameter_doc.all | 4 ++++ ocean_only/resting/layer/MOM_parameter_doc.all | 4 ++++ ocean_only/resting/z/MOM_parameter_doc.all | 4 ++++ ocean_only/seamount/layer/MOM_parameter_doc.all | 4 ++++ ocean_only/seamount/sigma/MOM_parameter_doc.all | 4 ++++ ocean_only/seamount/z/MOM_parameter_doc.all | 4 ++++ ocean_only/single_column/MOM_parameter_doc.all | 4 ++++ ocean_only/single_column_z/MOM_parameter_doc.all | 4 ++++ ocean_only/sloshing/layer/MOM_parameter_doc.all | 4 ++++ ocean_only/sloshing/rho/MOM_parameter_doc.all | 4 ++++ ocean_only/sloshing/z/MOM_parameter_doc.all | 4 ++++ ocean_only/torus_advection_test/MOM_parameter_doc.all | 4 ++++ src/MOM6 | 2 +- 48 files changed, 189 insertions(+), 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 index 76191c50a4..8c89d89cc7 100644 --- 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 index 235c74b545..9fdc023661 100644 --- 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 index 76191c50a4..8c89d89cc7 100644 --- 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 index 25a0fe408f..5caba279c8 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 @@ -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 index ef96926ff0..3df3ebd27c 100644 --- 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 index ef96926ff0..3df3ebd27c 100644 --- 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 index a430df12b6..0cc6b1477a 100644 --- 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 index 67b1d0adf6..5148f2359c 100644 --- 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 index 17bf94fba8..40a4435d77 100644 --- 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 index ef96926ff0..3df3ebd27c 100644 --- 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 index a9f633a193..c8dd174c02 100644 --- 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 index a9f633a193..c8dd174c02 100644 --- 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 index ef96926ff0..3df3ebd27c 100644 --- 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 index fbd1f64496..55c91c4208 100644 --- 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 index 9a8d01d70d..a861126cb9 100644 --- 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 index 92069e3134..ca5aae16a7 100644 --- 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 index d78d001617..40ea729ee5 100644 --- 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 index d2c5aebbc7..734fe381a1 100644 --- 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 index 9f6a14fafb..a16b644bf4 100644 --- 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 index 33a64b956e..d2924da8e0 100644 --- 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 index 7d82a34f8c..035a50c2cd 100644 --- 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 index 93404a304a..9b98c71143 100644 --- 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 index 597888ad55..d9352949f5 100644 --- 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 index 3c3350e401..8b51405c0f 100644 --- 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. diff --git a/ocean_only/circle_obcs/MOM_parameter_doc.all b/ocean_only/circle_obcs/MOM_parameter_doc.all index 2fdc54dc13..da10233d08 100644 --- a/ocean_only/circle_obcs/MOM_parameter_doc.all +++ b/ocean_only/circle_obcs/MOM_parameter_doc.all @@ -929,6 +929,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/external_gwave/MOM_parameter_doc.all b/ocean_only/external_gwave/MOM_parameter_doc.all index ff1581446c..5d43abac9f 100644 --- a/ocean_only/external_gwave/MOM_parameter_doc.all +++ b/ocean_only/external_gwave/MOM_parameter_doc.all @@ -933,6 +933,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/flow_downslope/layer/MOM_parameter_doc.all b/ocean_only/flow_downslope/layer/MOM_parameter_doc.all index dacd3ebfcc..4e512128de 100644 --- a/ocean_only/flow_downslope/layer/MOM_parameter_doc.all +++ b/ocean_only/flow_downslope/layer/MOM_parameter_doc.all @@ -941,6 +941,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/flow_downslope/rho/MOM_parameter_doc.all b/ocean_only/flow_downslope/rho/MOM_parameter_doc.all index ad59c17961..f28739c437 100644 --- a/ocean_only/flow_downslope/rho/MOM_parameter_doc.all +++ b/ocean_only/flow_downslope/rho/MOM_parameter_doc.all @@ -1012,6 +1012,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/flow_downslope/sigma/MOM_parameter_doc.all b/ocean_only/flow_downslope/sigma/MOM_parameter_doc.all index 90586514bc..139874d42d 100644 --- a/ocean_only/flow_downslope/sigma/MOM_parameter_doc.all +++ b/ocean_only/flow_downslope/sigma/MOM_parameter_doc.all @@ -1012,6 +1012,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/flow_downslope/z/MOM_parameter_doc.all b/ocean_only/flow_downslope/z/MOM_parameter_doc.all index 8cde89ebc5..b525160e45 100644 --- a/ocean_only/flow_downslope/z/MOM_parameter_doc.all +++ b/ocean_only/flow_downslope/z/MOM_parameter_doc.all @@ -1012,6 +1012,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/global/MOM_parameter_doc.all b/ocean_only/global/MOM_parameter_doc.all index 1ccaa65641..1ca8e12a41 100644 --- a/ocean_only/global/MOM_parameter_doc.all +++ b/ocean_only/global/MOM_parameter_doc.all @@ -1206,6 +1206,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/global_ALE/layer/MOM_parameter_doc.all b/ocean_only/global_ALE/layer/MOM_parameter_doc.all index cf6c053c28..06a8f24ed3 100644 --- a/ocean_only/global_ALE/layer/MOM_parameter_doc.all +++ b/ocean_only/global_ALE/layer/MOM_parameter_doc.all @@ -1177,6 +1177,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/global_ALE/z/MOM_parameter_doc.all b/ocean_only/global_ALE/z/MOM_parameter_doc.all index d1dcd79b99..31183f6518 100644 --- a/ocean_only/global_ALE/z/MOM_parameter_doc.all +++ b/ocean_only/global_ALE/z/MOM_parameter_doc.all @@ -1235,6 +1235,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/lock_exchange/MOM_parameter_doc.all b/ocean_only/lock_exchange/MOM_parameter_doc.all index c43cea117a..38c812c6ef 100644 --- a/ocean_only/lock_exchange/MOM_parameter_doc.all +++ b/ocean_only/lock_exchange/MOM_parameter_doc.all @@ -936,6 +936,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/mixed_layer_restrat_2d/MOM_parameter_doc.all b/ocean_only/mixed_layer_restrat_2d/MOM_parameter_doc.all index 1c50c9ff0a..756a0b5f61 100644 --- a/ocean_only/mixed_layer_restrat_2d/MOM_parameter_doc.all +++ b/ocean_only/mixed_layer_restrat_2d/MOM_parameter_doc.all @@ -1016,6 +1016,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/nonBous_global/MOM_parameter_doc.all b/ocean_only/nonBous_global/MOM_parameter_doc.all index afe6152827..70f2a26d39 100644 --- a/ocean_only/nonBous_global/MOM_parameter_doc.all +++ b/ocean_only/nonBous_global/MOM_parameter_doc.all @@ -1124,6 +1124,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/resting/layer/MOM_parameter_doc.all b/ocean_only/resting/layer/MOM_parameter_doc.all index e24264ca60..ba09dc7a13 100644 --- a/ocean_only/resting/layer/MOM_parameter_doc.all +++ b/ocean_only/resting/layer/MOM_parameter_doc.all @@ -936,6 +936,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/resting/z/MOM_parameter_doc.all b/ocean_only/resting/z/MOM_parameter_doc.all index 08f44d7fe7..15666aa12f 100644 --- a/ocean_only/resting/z/MOM_parameter_doc.all +++ b/ocean_only/resting/z/MOM_parameter_doc.all @@ -1009,6 +1009,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/seamount/layer/MOM_parameter_doc.all b/ocean_only/seamount/layer/MOM_parameter_doc.all index cf4dcba0f1..e415b1f6fe 100644 --- a/ocean_only/seamount/layer/MOM_parameter_doc.all +++ b/ocean_only/seamount/layer/MOM_parameter_doc.all @@ -937,6 +937,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/seamount/sigma/MOM_parameter_doc.all b/ocean_only/seamount/sigma/MOM_parameter_doc.all index 68df5f4aa0..d6691a0be7 100644 --- a/ocean_only/seamount/sigma/MOM_parameter_doc.all +++ b/ocean_only/seamount/sigma/MOM_parameter_doc.all @@ -1008,6 +1008,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/seamount/z/MOM_parameter_doc.all b/ocean_only/seamount/z/MOM_parameter_doc.all index 24c900eb53..12d7e89d01 100644 --- a/ocean_only/seamount/z/MOM_parameter_doc.all +++ b/ocean_only/seamount/z/MOM_parameter_doc.all @@ -1008,6 +1008,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/single_column/MOM_parameter_doc.all b/ocean_only/single_column/MOM_parameter_doc.all index 87d6826ff9..7dcbc5301a 100644 --- a/ocean_only/single_column/MOM_parameter_doc.all +++ b/ocean_only/single_column/MOM_parameter_doc.all @@ -823,6 +823,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/single_column_z/MOM_parameter_doc.all b/ocean_only/single_column_z/MOM_parameter_doc.all index ed2245e875..2b20bd178f 100644 --- a/ocean_only/single_column_z/MOM_parameter_doc.all +++ b/ocean_only/single_column_z/MOM_parameter_doc.all @@ -883,6 +883,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/sloshing/layer/MOM_parameter_doc.all b/ocean_only/sloshing/layer/MOM_parameter_doc.all index cf9de97f3d..1549a4daf4 100644 --- a/ocean_only/sloshing/layer/MOM_parameter_doc.all +++ b/ocean_only/sloshing/layer/MOM_parameter_doc.all @@ -942,6 +942,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/sloshing/rho/MOM_parameter_doc.all b/ocean_only/sloshing/rho/MOM_parameter_doc.all index 6df4195126..ea34839917 100644 --- a/ocean_only/sloshing/rho/MOM_parameter_doc.all +++ b/ocean_only/sloshing/rho/MOM_parameter_doc.all @@ -1015,6 +1015,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/sloshing/z/MOM_parameter_doc.all b/ocean_only/sloshing/z/MOM_parameter_doc.all index 12d07c7f6c..0a9895d1ea 100644 --- a/ocean_only/sloshing/z/MOM_parameter_doc.all +++ b/ocean_only/sloshing/z/MOM_parameter_doc.all @@ -1015,6 +1015,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/torus_advection_test/MOM_parameter_doc.all b/ocean_only/torus_advection_test/MOM_parameter_doc.all index 8bd11e5f6d..73e989aa87 100644 --- a/ocean_only/torus_advection_test/MOM_parameter_doc.all +++ b/ocean_only/torus_advection_test/MOM_parameter_doc.all @@ -920,6 +920,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/src/MOM6 b/src/MOM6 index 834b1faa39..9dd6497a9f 160000 --- a/src/MOM6 +++ b/src/MOM6 @@ -1 +1 @@ -Subproject commit 834b1faa39002da7af655a0a01a7257be7a8d952 +Subproject commit 9dd6497a9f7049d9ebdfb0f111fc98a02ec66140