From ede4d719e9377fc89e814f9f7aa76991f06627a4 Mon Sep 17 00:00:00 2001 From: MOM6 bot Date: Mon, 24 Feb 2025 15:42:33 -0500 Subject: [PATCH] MOM6: Bugfix for mixing up `Rho0` and `rho_ref` in Boussinesq PGF (#837) - NOAA-GFDL/MOM6@5f23058b4 Bugfix for mixing up `Rho0` and `rho_ref` in Boussinesq PGF (#837) - NOAA-GFDL/MOM6@86ed81f90 Use field_checksum in save_restart & restore_state - NOAA-GFDL/MOM6@090e3232f Refactor get_depth_list_checksum - NOAA-GFDL/MOM6@ad0a8b8f5 +Add the new interface field_checksum --- .../AM2_SIS2_MOM6i_1deg/MOM_parameter_doc.all | 5 +++++ .../Concurrent_ice_1deg/MOM_parameter_doc.all | 5 +++++ .../Intersperse_ice_1deg/MOM_parameter_doc.all | 5 +++++ ice_ocean_SIS2/Baltic/MOM_parameter_doc.all | 5 +++++ .../Baltic_ALE_z_offline_tracers/MOM_parameter_doc.all | 5 +++++ ice_ocean_SIS2/Baltic_OM4_025/MOM_parameter_doc.all | 5 +++++ ice_ocean_SIS2/Baltic_OM4_05/MOM_parameter_doc.all | 5 +++++ ice_ocean_SIS2/OM4_025/MOM_parameter_doc.all | 5 +++++ ice_ocean_SIS2/OM4_05/MOM_parameter_doc.all | 5 +++++ ice_ocean_SIS2/OM_1deg/MOM_parameter_doc.all | 5 +++++ ice_ocean_SIS2/SIS2/MOM_parameter_doc.all | 5 +++++ ice_ocean_SIS2/SIS2_bergs_cgrid/MOM_parameter_doc.all | 5 +++++ ice_ocean_SIS2/SIS2_cgrid/MOM_parameter_doc.all | 5 +++++ .../CVmix_SCM_tests/cooling_only/BML/MOM_parameter_doc.all | 5 +++++ .../CVmix_SCM_tests/cooling_only/EPBL/MOM_parameter_doc.all | 5 +++++ .../CVmix_SCM_tests/cooling_only/KPP/MOM_parameter_doc.all | 5 +++++ .../CVmix_SCM_tests/mech_only/BML/MOM_parameter_doc.all | 5 +++++ .../CVmix_SCM_tests/mech_only/EPBL/MOM_parameter_doc.all | 5 +++++ .../CVmix_SCM_tests/mech_only/KPP/MOM_parameter_doc.all | 5 +++++ .../skin_warming_wind/BML/MOM_parameter_doc.all | 5 +++++ .../skin_warming_wind/EPBL/MOM_parameter_doc.all | 5 +++++ .../skin_warming_wind/KPP/MOM_parameter_doc.all | 5 +++++ .../CVmix_SCM_tests/wind_only/BML/MOM_parameter_doc.all | 5 +++++ .../CVmix_SCM_tests/wind_only/EPBL/MOM_parameter_doc.all | 5 +++++ .../CVmix_SCM_tests/wind_only/KPP/MOM_parameter_doc.all | 5 +++++ ocean_only/SCM_idealized_hurricane/MOM_parameter_doc.all | 5 +++++ ocean_only/adjustment2d/layer/MOM_parameter_doc.all | 5 +++++ ocean_only/adjustment2d/rho/MOM_parameter_doc.all | 5 +++++ ocean_only/adjustment2d/z/MOM_parameter_doc.all | 5 +++++ ocean_only/benchmark/MOM_parameter_doc.all | 5 +++++ ocean_only/circle_obcs/MOM_parameter_doc.all | 5 +++++ ocean_only/double_gyre/MOM_parameter_doc.all | 5 +++++ ocean_only/external_gwave/MOM_parameter_doc.all | 5 +++++ ocean_only/flow_downslope/layer/MOM_parameter_doc.all | 5 +++++ ocean_only/flow_downslope/rho/MOM_parameter_doc.all | 5 +++++ ocean_only/flow_downslope/sigma/MOM_parameter_doc.all | 5 +++++ ocean_only/flow_downslope/z/MOM_parameter_doc.all | 5 +++++ ocean_only/global_ALE/hycom/MOM_parameter_doc.all | 5 +++++ ocean_only/global_ALE/layer/MOM_parameter_doc.all | 5 +++++ ocean_only/global_ALE/z/MOM_parameter_doc.all | 5 +++++ ocean_only/lock_exchange/MOM_parameter_doc.all | 5 +++++ ocean_only/mixed_layer_restrat_2d/MOM_parameter_doc.all | 5 +++++ ocean_only/nonBous_global/MOM_parameter_doc.all | 5 +++++ ocean_only/resting/layer/MOM_parameter_doc.all | 5 +++++ ocean_only/resting/z/MOM_parameter_doc.all | 5 +++++ ocean_only/seamount/layer/MOM_parameter_doc.all | 5 +++++ ocean_only/seamount/rho/MOM_parameter_doc.all | 5 +++++ ocean_only/seamount/sigma/MOM_parameter_doc.all | 5 +++++ ocean_only/seamount/z/MOM_parameter_doc.all | 5 +++++ ocean_only/single_column/BML/MOM_parameter_doc.all | 5 +++++ ocean_only/single_column/EPBL/MOM_parameter_doc.all | 5 +++++ ocean_only/single_column/KPP/MOM_parameter_doc.all | 5 +++++ ocean_only/sloshing/layer/MOM_parameter_doc.all | 5 +++++ ocean_only/sloshing/rho/MOM_parameter_doc.all | 5 +++++ ocean_only/sloshing/z/MOM_parameter_doc.all | 5 +++++ ocean_only/torus_advection_test/MOM_parameter_doc.all | 5 +++++ ocean_only/tracer_mixing/rho/MOM_parameter_doc.all | 5 +++++ ocean_only/tracer_mixing/z/MOM_parameter_doc.all | 5 +++++ ocean_only/unit_tests/MOM_parameter_doc.all | 5 +++++ src/MOM6 | 2 +- 60 files changed, 296 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 3043e5f7c..38494529c 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 @@ -1095,6 +1095,11 @@ RHO_PGF_REF = 1035.0 ! [kg m-3] default = 1035.0 ! The reference density that is subtracted off when calculating pressure ! gradient forces. Its inverse is subtracted off of specific volumes when in ! non-Boussinesq mode. The default is RHO_0. +RHO_PGF_REF_BUG = True ! [Boolean] default = True + ! If true, recover a bug that RHO_0 (the mean seawater density in Boussinesq + ! mode) and RHO_PGF_REF (the subtracted reference density in finite volume + ! pressure gradient forces) are incorrectly interchanged in several instances in + ! Boussinesq mode. SSH_IN_EOS_PRESSURE_FOR_PGF = False ! [Boolean] default = False ! If true, include contributions from the sea surface height in the height-based ! pressure used in the equation of state calculations for the Boussinesq 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 6c3c50afd..ebd576d79 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 @@ -1095,6 +1095,11 @@ RHO_PGF_REF = 1035.0 ! [kg m-3] default = 1035.0 ! The reference density that is subtracted off when calculating pressure ! gradient forces. Its inverse is subtracted off of specific volumes when in ! non-Boussinesq mode. The default is RHO_0. +RHO_PGF_REF_BUG = True ! [Boolean] default = True + ! If true, recover a bug that RHO_0 (the mean seawater density in Boussinesq + ! mode) and RHO_PGF_REF (the subtracted reference density in finite volume + ! pressure gradient forces) are incorrectly interchanged in several instances in + ! Boussinesq mode. SSH_IN_EOS_PRESSURE_FOR_PGF = False ! [Boolean] default = False ! If true, include contributions from the sea surface height in the height-based ! pressure used in the equation of state calculations for the Boussinesq 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 afde05c49..3312d1d12 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 @@ -1095,6 +1095,11 @@ RHO_PGF_REF = 1035.0 ! [kg m-3] default = 1035.0 ! The reference density that is subtracted off when calculating pressure ! gradient forces. Its inverse is subtracted off of specific volumes when in ! non-Boussinesq mode. The default is RHO_0. +RHO_PGF_REF_BUG = True ! [Boolean] default = True + ! If true, recover a bug that RHO_0 (the mean seawater density in Boussinesq + ! mode) and RHO_PGF_REF (the subtracted reference density in finite volume + ! pressure gradient forces) are incorrectly interchanged in several instances in + ! Boussinesq mode. SSH_IN_EOS_PRESSURE_FOR_PGF = False ! [Boolean] default = False ! If true, include contributions from the sea surface height in the height-based ! pressure used in the equation of state calculations for the Boussinesq diff --git a/ice_ocean_SIS2/Baltic/MOM_parameter_doc.all b/ice_ocean_SIS2/Baltic/MOM_parameter_doc.all index 1581e8676..1b4ae95fc 100644 --- a/ice_ocean_SIS2/Baltic/MOM_parameter_doc.all +++ b/ice_ocean_SIS2/Baltic/MOM_parameter_doc.all @@ -1095,6 +1095,11 @@ RHO_PGF_REF = 1035.0 ! [kg m-3] default = 1035.0 ! The reference density that is subtracted off when calculating pressure ! gradient forces. Its inverse is subtracted off of specific volumes when in ! non-Boussinesq mode. The default is RHO_0. +RHO_PGF_REF_BUG = True ! [Boolean] default = True + ! If true, recover a bug that RHO_0 (the mean seawater density in Boussinesq + ! mode) and RHO_PGF_REF (the subtracted reference density in finite volume + ! pressure gradient forces) are incorrectly interchanged in several instances in + ! Boussinesq mode. SSH_IN_EOS_PRESSURE_FOR_PGF = False ! [Boolean] default = False ! If true, include contributions from the sea surface height in the height-based ! pressure used in the equation of state calculations for the Boussinesq 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 9c07263ee..4d903c223 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 @@ -1341,6 +1341,11 @@ RHO_PGF_REF = 1035.0 ! [kg m-3] default = 1035.0 ! The reference density that is subtracted off when calculating pressure ! gradient forces. Its inverse is subtracted off of specific volumes when in ! non-Boussinesq mode. The default is RHO_0. +RHO_PGF_REF_BUG = True ! [Boolean] default = True + ! If true, recover a bug that RHO_0 (the mean seawater density in Boussinesq + ! mode) and RHO_PGF_REF (the subtracted reference density in finite volume + ! pressure gradient forces) are incorrectly interchanged in several instances in + ! Boussinesq mode. TIDES_ANSWER_DATE = 20230630 ! default = 20230630 ! The vintage of self-attraction and loading (SAL) and tidal forcing ! calculations. Setting dates before 20230701 recovers old answers (Boussinesq 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 660a3bd96..cab6b4c15 100644 --- a/ice_ocean_SIS2/Baltic_OM4_025/MOM_parameter_doc.all +++ b/ice_ocean_SIS2/Baltic_OM4_025/MOM_parameter_doc.all @@ -1346,6 +1346,11 @@ RHO_PGF_REF = 1035.0 ! [kg m-3] default = 1035.0 ! The reference density that is subtracted off when calculating pressure ! gradient forces. Its inverse is subtracted off of specific volumes when in ! non-Boussinesq mode. The default is RHO_0. +RHO_PGF_REF_BUG = True ! [Boolean] default = True + ! If true, recover a bug that RHO_0 (the mean seawater density in Boussinesq + ! mode) and RHO_PGF_REF (the subtracted reference density in finite volume + ! pressure gradient forces) are incorrectly interchanged in several instances in + ! Boussinesq mode. SSH_IN_EOS_PRESSURE_FOR_PGF = False ! [Boolean] default = False ! If true, include contributions from the sea surface height in the height-based ! pressure used in the equation of state calculations for the Boussinesq 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 fed735a25..50f7d627e 100644 --- a/ice_ocean_SIS2/Baltic_OM4_05/MOM_parameter_doc.all +++ b/ice_ocean_SIS2/Baltic_OM4_05/MOM_parameter_doc.all @@ -1360,6 +1360,11 @@ RHO_PGF_REF = 1035.0 ! [kg m-3] default = 1035.0 ! The reference density that is subtracted off when calculating pressure ! gradient forces. Its inverse is subtracted off of specific volumes when in ! non-Boussinesq mode. The default is RHO_0. +RHO_PGF_REF_BUG = True ! [Boolean] default = True + ! If true, recover a bug that RHO_0 (the mean seawater density in Boussinesq + ! mode) and RHO_PGF_REF (the subtracted reference density in finite volume + ! pressure gradient forces) are incorrectly interchanged in several instances in + ! Boussinesq mode. SSH_IN_EOS_PRESSURE_FOR_PGF = False ! [Boolean] default = False ! If true, include contributions from the sea surface height in the height-based ! pressure used in the equation of state calculations for the Boussinesq diff --git a/ice_ocean_SIS2/OM4_025/MOM_parameter_doc.all b/ice_ocean_SIS2/OM4_025/MOM_parameter_doc.all index a03686adc..ca3d31d50 100644 --- a/ice_ocean_SIS2/OM4_025/MOM_parameter_doc.all +++ b/ice_ocean_SIS2/OM4_025/MOM_parameter_doc.all @@ -1346,6 +1346,11 @@ RHO_PGF_REF = 1035.0 ! [kg m-3] default = 1035.0 ! The reference density that is subtracted off when calculating pressure ! gradient forces. Its inverse is subtracted off of specific volumes when in ! non-Boussinesq mode. The default is RHO_0. +RHO_PGF_REF_BUG = True ! [Boolean] default = True + ! If true, recover a bug that RHO_0 (the mean seawater density in Boussinesq + ! mode) and RHO_PGF_REF (the subtracted reference density in finite volume + ! pressure gradient forces) are incorrectly interchanged in several instances in + ! Boussinesq mode. SSH_IN_EOS_PRESSURE_FOR_PGF = False ! [Boolean] default = False ! If true, include contributions from the sea surface height in the height-based ! pressure used in the equation of state calculations for the Boussinesq diff --git a/ice_ocean_SIS2/OM4_05/MOM_parameter_doc.all b/ice_ocean_SIS2/OM4_05/MOM_parameter_doc.all index 3ee904f48..18b08a397 100644 --- a/ice_ocean_SIS2/OM4_05/MOM_parameter_doc.all +++ b/ice_ocean_SIS2/OM4_05/MOM_parameter_doc.all @@ -1360,6 +1360,11 @@ RHO_PGF_REF = 1035.0 ! [kg m-3] default = 1035.0 ! The reference density that is subtracted off when calculating pressure ! gradient forces. Its inverse is subtracted off of specific volumes when in ! non-Boussinesq mode. The default is RHO_0. +RHO_PGF_REF_BUG = True ! [Boolean] default = True + ! If true, recover a bug that RHO_0 (the mean seawater density in Boussinesq + ! mode) and RHO_PGF_REF (the subtracted reference density in finite volume + ! pressure gradient forces) are incorrectly interchanged in several instances in + ! Boussinesq mode. SSH_IN_EOS_PRESSURE_FOR_PGF = False ! [Boolean] default = False ! If true, include contributions from the sea surface height in the height-based ! pressure used in the equation of state calculations for the Boussinesq diff --git a/ice_ocean_SIS2/OM_1deg/MOM_parameter_doc.all b/ice_ocean_SIS2/OM_1deg/MOM_parameter_doc.all index 5b1465e92..c73f97fe6 100644 --- a/ice_ocean_SIS2/OM_1deg/MOM_parameter_doc.all +++ b/ice_ocean_SIS2/OM_1deg/MOM_parameter_doc.all @@ -1337,6 +1337,11 @@ RHO_PGF_REF = 1035.0 ! [kg m-3] default = 1035.0 ! The reference density that is subtracted off when calculating pressure ! gradient forces. Its inverse is subtracted off of specific volumes when in ! non-Boussinesq mode. The default is RHO_0. +RHO_PGF_REF_BUG = True ! [Boolean] default = True + ! If true, recover a bug that RHO_0 (the mean seawater density in Boussinesq + ! mode) and RHO_PGF_REF (the subtracted reference density in finite volume + ! pressure gradient forces) are incorrectly interchanged in several instances in + ! Boussinesq mode. SSH_IN_EOS_PRESSURE_FOR_PGF = False ! [Boolean] default = False ! If true, include contributions from the sea surface height in the height-based ! pressure used in the equation of state calculations for the Boussinesq diff --git a/ice_ocean_SIS2/SIS2/MOM_parameter_doc.all b/ice_ocean_SIS2/SIS2/MOM_parameter_doc.all index 11d0cbdbc..61b0b5c0b 100644 --- a/ice_ocean_SIS2/SIS2/MOM_parameter_doc.all +++ b/ice_ocean_SIS2/SIS2/MOM_parameter_doc.all @@ -1062,6 +1062,11 @@ RHO_PGF_REF = 1035.0 ! [kg m-3] default = 1035.0 ! The reference density that is subtracted off when calculating pressure ! gradient forces. Its inverse is subtracted off of specific volumes when in ! non-Boussinesq mode. The default is RHO_0. +RHO_PGF_REF_BUG = True ! [Boolean] default = True + ! If true, recover a bug that RHO_0 (the mean seawater density in Boussinesq + ! mode) and RHO_PGF_REF (the subtracted reference density in finite volume + ! pressure gradient forces) are incorrectly interchanged in several instances in + ! Boussinesq mode. SSH_IN_EOS_PRESSURE_FOR_PGF = False ! [Boolean] default = False ! If true, include contributions from the sea surface height in the height-based ! pressure used in the equation of state calculations for the Boussinesq 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 1ad16dc30..1ae249c61 100644 --- a/ice_ocean_SIS2/SIS2_bergs_cgrid/MOM_parameter_doc.all +++ b/ice_ocean_SIS2/SIS2_bergs_cgrid/MOM_parameter_doc.all @@ -1062,6 +1062,11 @@ RHO_PGF_REF = 1035.0 ! [kg m-3] default = 1035.0 ! The reference density that is subtracted off when calculating pressure ! gradient forces. Its inverse is subtracted off of specific volumes when in ! non-Boussinesq mode. The default is RHO_0. +RHO_PGF_REF_BUG = True ! [Boolean] default = True + ! If true, recover a bug that RHO_0 (the mean seawater density in Boussinesq + ! mode) and RHO_PGF_REF (the subtracted reference density in finite volume + ! pressure gradient forces) are incorrectly interchanged in several instances in + ! Boussinesq mode. SSH_IN_EOS_PRESSURE_FOR_PGF = False ! [Boolean] default = False ! If true, include contributions from the sea surface height in the height-based ! pressure used in the equation of state calculations for the Boussinesq diff --git a/ice_ocean_SIS2/SIS2_cgrid/MOM_parameter_doc.all b/ice_ocean_SIS2/SIS2_cgrid/MOM_parameter_doc.all index a33dcd723..bfa85fbd6 100644 --- a/ice_ocean_SIS2/SIS2_cgrid/MOM_parameter_doc.all +++ b/ice_ocean_SIS2/SIS2_cgrid/MOM_parameter_doc.all @@ -1062,6 +1062,11 @@ RHO_PGF_REF = 1035.0 ! [kg m-3] default = 1035.0 ! The reference density that is subtracted off when calculating pressure ! gradient forces. Its inverse is subtracted off of specific volumes when in ! non-Boussinesq mode. The default is RHO_0. +RHO_PGF_REF_BUG = True ! [Boolean] default = True + ! If true, recover a bug that RHO_0 (the mean seawater density in Boussinesq + ! mode) and RHO_PGF_REF (the subtracted reference density in finite volume + ! pressure gradient forces) are incorrectly interchanged in several instances in + ! Boussinesq mode. SSH_IN_EOS_PRESSURE_FOR_PGF = False ! [Boolean] default = False ! If true, include contributions from the sea surface height in the height-based ! pressure used in the equation of state calculations for the Boussinesq diff --git a/ocean_only/CVmix_SCM_tests/cooling_only/BML/MOM_parameter_doc.all b/ocean_only/CVmix_SCM_tests/cooling_only/BML/MOM_parameter_doc.all index 883cb4d00..abe841600 100644 --- a/ocean_only/CVmix_SCM_tests/cooling_only/BML/MOM_parameter_doc.all +++ b/ocean_only/CVmix_SCM_tests/cooling_only/BML/MOM_parameter_doc.all @@ -866,6 +866,11 @@ RHO_PGF_REF = 1000.0 ! [kg m-3] default = 1000.0 ! The reference density that is subtracted off when calculating pressure ! gradient forces. Its inverse is subtracted off of specific volumes when in ! non-Boussinesq mode. The default is RHO_0. +RHO_PGF_REF_BUG = True ! [Boolean] default = True + ! If true, recover a bug that RHO_0 (the mean seawater density in Boussinesq + ! mode) and RHO_PGF_REF (the subtracted reference density in finite volume + ! pressure gradient forces) are incorrectly interchanged in several instances in + ! Boussinesq mode. SSH_IN_EOS_PRESSURE_FOR_PGF = False ! [Boolean] default = False ! If true, include contributions from the sea surface height in the height-based ! pressure used in the equation of state calculations for the Boussinesq diff --git a/ocean_only/CVmix_SCM_tests/cooling_only/EPBL/MOM_parameter_doc.all b/ocean_only/CVmix_SCM_tests/cooling_only/EPBL/MOM_parameter_doc.all index 0ed8175ca..48e7a1258 100644 --- a/ocean_only/CVmix_SCM_tests/cooling_only/EPBL/MOM_parameter_doc.all +++ b/ocean_only/CVmix_SCM_tests/cooling_only/EPBL/MOM_parameter_doc.all @@ -985,6 +985,11 @@ RHO_PGF_REF = 1000.0 ! [kg m-3] default = 1000.0 ! The reference density that is subtracted off when calculating pressure ! gradient forces. Its inverse is subtracted off of specific volumes when in ! non-Boussinesq mode. The default is RHO_0. +RHO_PGF_REF_BUG = True ! [Boolean] default = True + ! If true, recover a bug that RHO_0 (the mean seawater density in Boussinesq + ! mode) and RHO_PGF_REF (the subtracted reference density in finite volume + ! pressure gradient forces) are incorrectly interchanged in several instances in + ! Boussinesq mode. SSH_IN_EOS_PRESSURE_FOR_PGF = False ! [Boolean] default = False ! If true, include contributions from the sea surface height in the height-based ! pressure used in the equation of state calculations for the Boussinesq diff --git a/ocean_only/CVmix_SCM_tests/cooling_only/KPP/MOM_parameter_doc.all b/ocean_only/CVmix_SCM_tests/cooling_only/KPP/MOM_parameter_doc.all index ae73f8737..0d1b2f898 100644 --- a/ocean_only/CVmix_SCM_tests/cooling_only/KPP/MOM_parameter_doc.all +++ b/ocean_only/CVmix_SCM_tests/cooling_only/KPP/MOM_parameter_doc.all @@ -985,6 +985,11 @@ RHO_PGF_REF = 1000.0 ! [kg m-3] default = 1000.0 ! The reference density that is subtracted off when calculating pressure ! gradient forces. Its inverse is subtracted off of specific volumes when in ! non-Boussinesq mode. The default is RHO_0. +RHO_PGF_REF_BUG = True ! [Boolean] default = True + ! If true, recover a bug that RHO_0 (the mean seawater density in Boussinesq + ! mode) and RHO_PGF_REF (the subtracted reference density in finite volume + ! pressure gradient forces) are incorrectly interchanged in several instances in + ! Boussinesq mode. SSH_IN_EOS_PRESSURE_FOR_PGF = False ! [Boolean] default = False ! If true, include contributions from the sea surface height in the height-based ! pressure used in the equation of state calculations for the Boussinesq diff --git a/ocean_only/CVmix_SCM_tests/mech_only/BML/MOM_parameter_doc.all b/ocean_only/CVmix_SCM_tests/mech_only/BML/MOM_parameter_doc.all index 44ecac4cb..c932d39fa 100644 --- a/ocean_only/CVmix_SCM_tests/mech_only/BML/MOM_parameter_doc.all +++ b/ocean_only/CVmix_SCM_tests/mech_only/BML/MOM_parameter_doc.all @@ -866,6 +866,11 @@ RHO_PGF_REF = 1000.0 ! [kg m-3] default = 1000.0 ! The reference density that is subtracted off when calculating pressure ! gradient forces. Its inverse is subtracted off of specific volumes when in ! non-Boussinesq mode. The default is RHO_0. +RHO_PGF_REF_BUG = True ! [Boolean] default = True + ! If true, recover a bug that RHO_0 (the mean seawater density in Boussinesq + ! mode) and RHO_PGF_REF (the subtracted reference density in finite volume + ! pressure gradient forces) are incorrectly interchanged in several instances in + ! Boussinesq mode. SSH_IN_EOS_PRESSURE_FOR_PGF = False ! [Boolean] default = False ! If true, include contributions from the sea surface height in the height-based ! pressure used in the equation of state calculations for the Boussinesq diff --git a/ocean_only/CVmix_SCM_tests/mech_only/EPBL/MOM_parameter_doc.all b/ocean_only/CVmix_SCM_tests/mech_only/EPBL/MOM_parameter_doc.all index d223b2544..e0018964f 100644 --- a/ocean_only/CVmix_SCM_tests/mech_only/EPBL/MOM_parameter_doc.all +++ b/ocean_only/CVmix_SCM_tests/mech_only/EPBL/MOM_parameter_doc.all @@ -985,6 +985,11 @@ RHO_PGF_REF = 1000.0 ! [kg m-3] default = 1000.0 ! The reference density that is subtracted off when calculating pressure ! gradient forces. Its inverse is subtracted off of specific volumes when in ! non-Boussinesq mode. The default is RHO_0. +RHO_PGF_REF_BUG = True ! [Boolean] default = True + ! If true, recover a bug that RHO_0 (the mean seawater density in Boussinesq + ! mode) and RHO_PGF_REF (the subtracted reference density in finite volume + ! pressure gradient forces) are incorrectly interchanged in several instances in + ! Boussinesq mode. SSH_IN_EOS_PRESSURE_FOR_PGF = False ! [Boolean] default = False ! If true, include contributions from the sea surface height in the height-based ! pressure used in the equation of state calculations for the Boussinesq diff --git a/ocean_only/CVmix_SCM_tests/mech_only/KPP/MOM_parameter_doc.all b/ocean_only/CVmix_SCM_tests/mech_only/KPP/MOM_parameter_doc.all index 4983e4103..b057b8ad7 100644 --- a/ocean_only/CVmix_SCM_tests/mech_only/KPP/MOM_parameter_doc.all +++ b/ocean_only/CVmix_SCM_tests/mech_only/KPP/MOM_parameter_doc.all @@ -985,6 +985,11 @@ RHO_PGF_REF = 1000.0 ! [kg m-3] default = 1000.0 ! The reference density that is subtracted off when calculating pressure ! gradient forces. Its inverse is subtracted off of specific volumes when in ! non-Boussinesq mode. The default is RHO_0. +RHO_PGF_REF_BUG = True ! [Boolean] default = True + ! If true, recover a bug that RHO_0 (the mean seawater density in Boussinesq + ! mode) and RHO_PGF_REF (the subtracted reference density in finite volume + ! pressure gradient forces) are incorrectly interchanged in several instances in + ! Boussinesq mode. SSH_IN_EOS_PRESSURE_FOR_PGF = False ! [Boolean] default = False ! If true, include contributions from the sea surface height in the height-based ! pressure used in the equation of state calculations for the Boussinesq diff --git a/ocean_only/CVmix_SCM_tests/skin_warming_wind/BML/MOM_parameter_doc.all b/ocean_only/CVmix_SCM_tests/skin_warming_wind/BML/MOM_parameter_doc.all index 38aa1fa2d..f5ca4c120 100644 --- a/ocean_only/CVmix_SCM_tests/skin_warming_wind/BML/MOM_parameter_doc.all +++ b/ocean_only/CVmix_SCM_tests/skin_warming_wind/BML/MOM_parameter_doc.all @@ -866,6 +866,11 @@ RHO_PGF_REF = 1000.0 ! [kg m-3] default = 1000.0 ! The reference density that is subtracted off when calculating pressure ! gradient forces. Its inverse is subtracted off of specific volumes when in ! non-Boussinesq mode. The default is RHO_0. +RHO_PGF_REF_BUG = True ! [Boolean] default = True + ! If true, recover a bug that RHO_0 (the mean seawater density in Boussinesq + ! mode) and RHO_PGF_REF (the subtracted reference density in finite volume + ! pressure gradient forces) are incorrectly interchanged in several instances in + ! Boussinesq mode. SSH_IN_EOS_PRESSURE_FOR_PGF = False ! [Boolean] default = False ! If true, include contributions from the sea surface height in the height-based ! pressure used in the equation of state calculations for the Boussinesq diff --git a/ocean_only/CVmix_SCM_tests/skin_warming_wind/EPBL/MOM_parameter_doc.all b/ocean_only/CVmix_SCM_tests/skin_warming_wind/EPBL/MOM_parameter_doc.all index 38abf507e..7f9c28b49 100644 --- a/ocean_only/CVmix_SCM_tests/skin_warming_wind/EPBL/MOM_parameter_doc.all +++ b/ocean_only/CVmix_SCM_tests/skin_warming_wind/EPBL/MOM_parameter_doc.all @@ -985,6 +985,11 @@ RHO_PGF_REF = 1000.0 ! [kg m-3] default = 1000.0 ! The reference density that is subtracted off when calculating pressure ! gradient forces. Its inverse is subtracted off of specific volumes when in ! non-Boussinesq mode. The default is RHO_0. +RHO_PGF_REF_BUG = True ! [Boolean] default = True + ! If true, recover a bug that RHO_0 (the mean seawater density in Boussinesq + ! mode) and RHO_PGF_REF (the subtracted reference density in finite volume + ! pressure gradient forces) are incorrectly interchanged in several instances in + ! Boussinesq mode. SSH_IN_EOS_PRESSURE_FOR_PGF = False ! [Boolean] default = False ! If true, include contributions from the sea surface height in the height-based ! pressure used in the equation of state calculations for the Boussinesq diff --git a/ocean_only/CVmix_SCM_tests/skin_warming_wind/KPP/MOM_parameter_doc.all b/ocean_only/CVmix_SCM_tests/skin_warming_wind/KPP/MOM_parameter_doc.all index 11292d9b5..409675a63 100644 --- a/ocean_only/CVmix_SCM_tests/skin_warming_wind/KPP/MOM_parameter_doc.all +++ b/ocean_only/CVmix_SCM_tests/skin_warming_wind/KPP/MOM_parameter_doc.all @@ -985,6 +985,11 @@ RHO_PGF_REF = 1000.0 ! [kg m-3] default = 1000.0 ! The reference density that is subtracted off when calculating pressure ! gradient forces. Its inverse is subtracted off of specific volumes when in ! non-Boussinesq mode. The default is RHO_0. +RHO_PGF_REF_BUG = True ! [Boolean] default = True + ! If true, recover a bug that RHO_0 (the mean seawater density in Boussinesq + ! mode) and RHO_PGF_REF (the subtracted reference density in finite volume + ! pressure gradient forces) are incorrectly interchanged in several instances in + ! Boussinesq mode. SSH_IN_EOS_PRESSURE_FOR_PGF = False ! [Boolean] default = False ! If true, include contributions from the sea surface height in the height-based ! pressure used in the equation of state calculations for the Boussinesq diff --git a/ocean_only/CVmix_SCM_tests/wind_only/BML/MOM_parameter_doc.all b/ocean_only/CVmix_SCM_tests/wind_only/BML/MOM_parameter_doc.all index 8a9327533..c667c93ac 100644 --- a/ocean_only/CVmix_SCM_tests/wind_only/BML/MOM_parameter_doc.all +++ b/ocean_only/CVmix_SCM_tests/wind_only/BML/MOM_parameter_doc.all @@ -866,6 +866,11 @@ RHO_PGF_REF = 1000.0 ! [kg m-3] default = 1000.0 ! The reference density that is subtracted off when calculating pressure ! gradient forces. Its inverse is subtracted off of specific volumes when in ! non-Boussinesq mode. The default is RHO_0. +RHO_PGF_REF_BUG = True ! [Boolean] default = True + ! If true, recover a bug that RHO_0 (the mean seawater density in Boussinesq + ! mode) and RHO_PGF_REF (the subtracted reference density in finite volume + ! pressure gradient forces) are incorrectly interchanged in several instances in + ! Boussinesq mode. SSH_IN_EOS_PRESSURE_FOR_PGF = False ! [Boolean] default = False ! If true, include contributions from the sea surface height in the height-based ! pressure used in the equation of state calculations for the Boussinesq diff --git a/ocean_only/CVmix_SCM_tests/wind_only/EPBL/MOM_parameter_doc.all b/ocean_only/CVmix_SCM_tests/wind_only/EPBL/MOM_parameter_doc.all index 7b5ba6d39..5faf7c1ee 100644 --- a/ocean_only/CVmix_SCM_tests/wind_only/EPBL/MOM_parameter_doc.all +++ b/ocean_only/CVmix_SCM_tests/wind_only/EPBL/MOM_parameter_doc.all @@ -985,6 +985,11 @@ RHO_PGF_REF = 1000.0 ! [kg m-3] default = 1000.0 ! The reference density that is subtracted off when calculating pressure ! gradient forces. Its inverse is subtracted off of specific volumes when in ! non-Boussinesq mode. The default is RHO_0. +RHO_PGF_REF_BUG = True ! [Boolean] default = True + ! If true, recover a bug that RHO_0 (the mean seawater density in Boussinesq + ! mode) and RHO_PGF_REF (the subtracted reference density in finite volume + ! pressure gradient forces) are incorrectly interchanged in several instances in + ! Boussinesq mode. SSH_IN_EOS_PRESSURE_FOR_PGF = False ! [Boolean] default = False ! If true, include contributions from the sea surface height in the height-based ! pressure used in the equation of state calculations for the Boussinesq diff --git a/ocean_only/CVmix_SCM_tests/wind_only/KPP/MOM_parameter_doc.all b/ocean_only/CVmix_SCM_tests/wind_only/KPP/MOM_parameter_doc.all index c3571102e..895b53fbe 100644 --- a/ocean_only/CVmix_SCM_tests/wind_only/KPP/MOM_parameter_doc.all +++ b/ocean_only/CVmix_SCM_tests/wind_only/KPP/MOM_parameter_doc.all @@ -985,6 +985,11 @@ RHO_PGF_REF = 1000.0 ! [kg m-3] default = 1000.0 ! The reference density that is subtracted off when calculating pressure ! gradient forces. Its inverse is subtracted off of specific volumes when in ! non-Boussinesq mode. The default is RHO_0. +RHO_PGF_REF_BUG = True ! [Boolean] default = True + ! If true, recover a bug that RHO_0 (the mean seawater density in Boussinesq + ! mode) and RHO_PGF_REF (the subtracted reference density in finite volume + ! pressure gradient forces) are incorrectly interchanged in several instances in + ! Boussinesq mode. SSH_IN_EOS_PRESSURE_FOR_PGF = False ! [Boolean] default = False ! If true, include contributions from the sea surface height in the height-based ! pressure used in the equation of state calculations for the Boussinesq diff --git a/ocean_only/SCM_idealized_hurricane/MOM_parameter_doc.all b/ocean_only/SCM_idealized_hurricane/MOM_parameter_doc.all index 5ce29e37a..1c23f0b36 100644 --- a/ocean_only/SCM_idealized_hurricane/MOM_parameter_doc.all +++ b/ocean_only/SCM_idealized_hurricane/MOM_parameter_doc.all @@ -985,6 +985,11 @@ RHO_PGF_REF = 1027.0 ! [kg m-3] default = 1027.0 ! The reference density that is subtracted off when calculating pressure ! gradient forces. Its inverse is subtracted off of specific volumes when in ! non-Boussinesq mode. The default is RHO_0. +RHO_PGF_REF_BUG = True ! [Boolean] default = True + ! If true, recover a bug that RHO_0 (the mean seawater density in Boussinesq + ! mode) and RHO_PGF_REF (the subtracted reference density in finite volume + ! pressure gradient forces) are incorrectly interchanged in several instances in + ! Boussinesq mode. SSH_IN_EOS_PRESSURE_FOR_PGF = False ! [Boolean] default = False ! If true, include contributions from the sea surface height in the height-based ! pressure used in the equation of state calculations for the Boussinesq diff --git a/ocean_only/adjustment2d/layer/MOM_parameter_doc.all b/ocean_only/adjustment2d/layer/MOM_parameter_doc.all index ee1d84f35..58af4194f 100644 --- a/ocean_only/adjustment2d/layer/MOM_parameter_doc.all +++ b/ocean_only/adjustment2d/layer/MOM_parameter_doc.all @@ -913,6 +913,11 @@ RHO_PGF_REF = 1000.0 ! [kg m-3] default = 1000.0 ! The reference density that is subtracted off when calculating pressure ! gradient forces. Its inverse is subtracted off of specific volumes when in ! non-Boussinesq mode. The default is RHO_0. +RHO_PGF_REF_BUG = True ! [Boolean] default = True + ! If true, recover a bug that RHO_0 (the mean seawater density in Boussinesq + ! mode) and RHO_PGF_REF (the subtracted reference density in finite volume + ! pressure gradient forces) are incorrectly interchanged in several instances in + ! Boussinesq mode. SSH_IN_EOS_PRESSURE_FOR_PGF = False ! [Boolean] default = False ! If true, include contributions from the sea surface height in the height-based ! pressure used in the equation of state calculations for the Boussinesq diff --git a/ocean_only/adjustment2d/rho/MOM_parameter_doc.all b/ocean_only/adjustment2d/rho/MOM_parameter_doc.all index e4c9cd982..97bce9747 100644 --- a/ocean_only/adjustment2d/rho/MOM_parameter_doc.all +++ b/ocean_only/adjustment2d/rho/MOM_parameter_doc.all @@ -1077,6 +1077,11 @@ RHO_PGF_REF = 1000.0 ! [kg m-3] default = 1000.0 ! The reference density that is subtracted off when calculating pressure ! gradient forces. Its inverse is subtracted off of specific volumes when in ! non-Boussinesq mode. The default is RHO_0. +RHO_PGF_REF_BUG = True ! [Boolean] default = True + ! If true, recover a bug that RHO_0 (the mean seawater density in Boussinesq + ! mode) and RHO_PGF_REF (the subtracted reference density in finite volume + ! pressure gradient forces) are incorrectly interchanged in several instances in + ! Boussinesq mode. SSH_IN_EOS_PRESSURE_FOR_PGF = False ! [Boolean] default = False ! If true, include contributions from the sea surface height in the height-based ! pressure used in the equation of state calculations for the Boussinesq diff --git a/ocean_only/adjustment2d/z/MOM_parameter_doc.all b/ocean_only/adjustment2d/z/MOM_parameter_doc.all index a44846997..05a239fc3 100644 --- a/ocean_only/adjustment2d/z/MOM_parameter_doc.all +++ b/ocean_only/adjustment2d/z/MOM_parameter_doc.all @@ -1029,6 +1029,11 @@ RHO_PGF_REF = 1000.0 ! [kg m-3] default = 1000.0 ! The reference density that is subtracted off when calculating pressure ! gradient forces. Its inverse is subtracted off of specific volumes when in ! non-Boussinesq mode. The default is RHO_0. +RHO_PGF_REF_BUG = True ! [Boolean] default = True + ! If true, recover a bug that RHO_0 (the mean seawater density in Boussinesq + ! mode) and RHO_PGF_REF (the subtracted reference density in finite volume + ! pressure gradient forces) are incorrectly interchanged in several instances in + ! Boussinesq mode. SSH_IN_EOS_PRESSURE_FOR_PGF = False ! [Boolean] default = False ! If true, include contributions from the sea surface height in the height-based ! pressure used in the equation of state calculations for the Boussinesq diff --git a/ocean_only/benchmark/MOM_parameter_doc.all b/ocean_only/benchmark/MOM_parameter_doc.all index 3e759b05d..a7b9878fb 100644 --- a/ocean_only/benchmark/MOM_parameter_doc.all +++ b/ocean_only/benchmark/MOM_parameter_doc.all @@ -1006,6 +1006,11 @@ RHO_PGF_REF = 1035.0 ! [kg m-3] default = 1035.0 ! The reference density that is subtracted off when calculating pressure ! gradient forces. Its inverse is subtracted off of specific volumes when in ! non-Boussinesq mode. The default is RHO_0. +RHO_PGF_REF_BUG = True ! [Boolean] default = True + ! If true, recover a bug that RHO_0 (the mean seawater density in Boussinesq + ! mode) and RHO_PGF_REF (the subtracted reference density in finite volume + ! pressure gradient forces) are incorrectly interchanged in several instances in + ! Boussinesq mode. SSH_IN_EOS_PRESSURE_FOR_PGF = False ! [Boolean] default = False ! If true, include contributions from the sea surface height in the height-based ! pressure used in the equation of state calculations for the Boussinesq diff --git a/ocean_only/circle_obcs/MOM_parameter_doc.all b/ocean_only/circle_obcs/MOM_parameter_doc.all index 301a65fe4..c6947c9e5 100644 --- a/ocean_only/circle_obcs/MOM_parameter_doc.all +++ b/ocean_only/circle_obcs/MOM_parameter_doc.all @@ -940,6 +940,11 @@ RHO_PGF_REF = 1031.0 ! [kg m-3] default = 1031.0 ! The reference density that is subtracted off when calculating pressure ! gradient forces. Its inverse is subtracted off of specific volumes when in ! non-Boussinesq mode. The default is RHO_0. +RHO_PGF_REF_BUG = True ! [Boolean] default = True + ! If true, recover a bug that RHO_0 (the mean seawater density in Boussinesq + ! mode) and RHO_PGF_REF (the subtracted reference density in finite volume + ! pressure gradient forces) are incorrectly interchanged in several instances in + ! Boussinesq mode. SSH_IN_EOS_PRESSURE_FOR_PGF = False ! [Boolean] default = False ! If true, include contributions from the sea surface height in the height-based ! pressure used in the equation of state calculations for the Boussinesq diff --git a/ocean_only/double_gyre/MOM_parameter_doc.all b/ocean_only/double_gyre/MOM_parameter_doc.all index 2f1156014..eefe17ba3 100644 --- a/ocean_only/double_gyre/MOM_parameter_doc.all +++ b/ocean_only/double_gyre/MOM_parameter_doc.all @@ -796,6 +796,11 @@ RHO_PGF_REF = 1035.0 ! [kg m-3] default = 1035.0 ! The reference density that is subtracted off when calculating pressure ! gradient forces. Its inverse is subtracted off of specific volumes when in ! non-Boussinesq mode. The default is RHO_0. +RHO_PGF_REF_BUG = True ! [Boolean] default = True + ! If true, recover a bug that RHO_0 (the mean seawater density in Boussinesq + ! mode) and RHO_PGF_REF (the subtracted reference density in finite volume + ! pressure gradient forces) are incorrectly interchanged in several instances in + ! Boussinesq mode. SSH_IN_EOS_PRESSURE_FOR_PGF = False ! [Boolean] default = False ! If true, include contributions from the sea surface height in the height-based ! pressure used in the equation of state calculations for the Boussinesq diff --git a/ocean_only/external_gwave/MOM_parameter_doc.all b/ocean_only/external_gwave/MOM_parameter_doc.all index d222a15a8..bd7f5147d 100644 --- a/ocean_only/external_gwave/MOM_parameter_doc.all +++ b/ocean_only/external_gwave/MOM_parameter_doc.all @@ -902,6 +902,11 @@ RHO_PGF_REF = 1000.0 ! [kg m-3] default = 1000.0 ! The reference density that is subtracted off when calculating pressure ! gradient forces. Its inverse is subtracted off of specific volumes when in ! non-Boussinesq mode. The default is RHO_0. +RHO_PGF_REF_BUG = True ! [Boolean] default = True + ! If true, recover a bug that RHO_0 (the mean seawater density in Boussinesq + ! mode) and RHO_PGF_REF (the subtracted reference density in finite volume + ! pressure gradient forces) are incorrectly interchanged in several instances in + ! Boussinesq mode. SSH_IN_EOS_PRESSURE_FOR_PGF = False ! [Boolean] default = False ! If true, include contributions from the sea surface height in the height-based ! pressure used in the equation of state calculations for the Boussinesq diff --git a/ocean_only/flow_downslope/layer/MOM_parameter_doc.all b/ocean_only/flow_downslope/layer/MOM_parameter_doc.all index 95e878f79..901c209d2 100644 --- a/ocean_only/flow_downslope/layer/MOM_parameter_doc.all +++ b/ocean_only/flow_downslope/layer/MOM_parameter_doc.all @@ -912,6 +912,11 @@ RHO_PGF_REF = 1035.0 ! [kg m-3] default = 1035.0 ! The reference density that is subtracted off when calculating pressure ! gradient forces. Its inverse is subtracted off of specific volumes when in ! non-Boussinesq mode. The default is RHO_0. +RHO_PGF_REF_BUG = True ! [Boolean] default = True + ! If true, recover a bug that RHO_0 (the mean seawater density in Boussinesq + ! mode) and RHO_PGF_REF (the subtracted reference density in finite volume + ! pressure gradient forces) are incorrectly interchanged in several instances in + ! Boussinesq mode. SSH_IN_EOS_PRESSURE_FOR_PGF = False ! [Boolean] default = False ! If true, include contributions from the sea surface height in the height-based ! pressure used in the equation of state calculations for the Boussinesq diff --git a/ocean_only/flow_downslope/rho/MOM_parameter_doc.all b/ocean_only/flow_downslope/rho/MOM_parameter_doc.all index 03d3553fe..cd272be7b 100644 --- a/ocean_only/flow_downslope/rho/MOM_parameter_doc.all +++ b/ocean_only/flow_downslope/rho/MOM_parameter_doc.all @@ -1078,6 +1078,11 @@ RHO_PGF_REF = 1035.0 ! [kg m-3] default = 1035.0 ! The reference density that is subtracted off when calculating pressure ! gradient forces. Its inverse is subtracted off of specific volumes when in ! non-Boussinesq mode. The default is RHO_0. +RHO_PGF_REF_BUG = True ! [Boolean] default = True + ! If true, recover a bug that RHO_0 (the mean seawater density in Boussinesq + ! mode) and RHO_PGF_REF (the subtracted reference density in finite volume + ! pressure gradient forces) are incorrectly interchanged in several instances in + ! Boussinesq mode. SSH_IN_EOS_PRESSURE_FOR_PGF = False ! [Boolean] default = False ! If true, include contributions from the sea surface height in the height-based ! pressure used in the equation of state calculations for the Boussinesq diff --git a/ocean_only/flow_downslope/sigma/MOM_parameter_doc.all b/ocean_only/flow_downslope/sigma/MOM_parameter_doc.all index 37df3df31..c0802365f 100644 --- a/ocean_only/flow_downslope/sigma/MOM_parameter_doc.all +++ b/ocean_only/flow_downslope/sigma/MOM_parameter_doc.all @@ -1030,6 +1030,11 @@ RHO_PGF_REF = 1035.0 ! [kg m-3] default = 1035.0 ! The reference density that is subtracted off when calculating pressure ! gradient forces. Its inverse is subtracted off of specific volumes when in ! non-Boussinesq mode. The default is RHO_0. +RHO_PGF_REF_BUG = True ! [Boolean] default = True + ! If true, recover a bug that RHO_0 (the mean seawater density in Boussinesq + ! mode) and RHO_PGF_REF (the subtracted reference density in finite volume + ! pressure gradient forces) are incorrectly interchanged in several instances in + ! Boussinesq mode. SSH_IN_EOS_PRESSURE_FOR_PGF = False ! [Boolean] default = False ! If true, include contributions from the sea surface height in the height-based ! pressure used in the equation of state calculations for the Boussinesq diff --git a/ocean_only/flow_downslope/z/MOM_parameter_doc.all b/ocean_only/flow_downslope/z/MOM_parameter_doc.all index 517c350e1..88c1c075b 100644 --- a/ocean_only/flow_downslope/z/MOM_parameter_doc.all +++ b/ocean_only/flow_downslope/z/MOM_parameter_doc.all @@ -1030,6 +1030,11 @@ RHO_PGF_REF = 1035.0 ! [kg m-3] default = 1035.0 ! The reference density that is subtracted off when calculating pressure ! gradient forces. Its inverse is subtracted off of specific volumes when in ! non-Boussinesq mode. The default is RHO_0. +RHO_PGF_REF_BUG = True ! [Boolean] default = True + ! If true, recover a bug that RHO_0 (the mean seawater density in Boussinesq + ! mode) and RHO_PGF_REF (the subtracted reference density in finite volume + ! pressure gradient forces) are incorrectly interchanged in several instances in + ! Boussinesq mode. SSH_IN_EOS_PRESSURE_FOR_PGF = False ! [Boolean] default = False ! If true, include contributions from the sea surface height in the height-based ! pressure used in the equation of state calculations for the Boussinesq diff --git a/ocean_only/global_ALE/hycom/MOM_parameter_doc.all b/ocean_only/global_ALE/hycom/MOM_parameter_doc.all index f7ae3550d..839788f31 100644 --- a/ocean_only/global_ALE/hycom/MOM_parameter_doc.all +++ b/ocean_only/global_ALE/hycom/MOM_parameter_doc.all @@ -1391,6 +1391,11 @@ RHO_PGF_REF = 1035.0 ! [kg m-3] default = 1035.0 ! The reference density that is subtracted off when calculating pressure ! gradient forces. Its inverse is subtracted off of specific volumes when in ! non-Boussinesq mode. The default is RHO_0. +RHO_PGF_REF_BUG = True ! [Boolean] default = True + ! If true, recover a bug that RHO_0 (the mean seawater density in Boussinesq + ! mode) and RHO_PGF_REF (the subtracted reference density in finite volume + ! pressure gradient forces) are incorrectly interchanged in several instances in + ! Boussinesq mode. TIDES_ANSWER_DATE = 20230630 ! default = 20230630 ! The vintage of self-attraction and loading (SAL) and tidal forcing ! calculations. Setting dates before 20230701 recovers old answers (Boussinesq diff --git a/ocean_only/global_ALE/layer/MOM_parameter_doc.all b/ocean_only/global_ALE/layer/MOM_parameter_doc.all index 4bca0c018..dbf9d3d20 100644 --- a/ocean_only/global_ALE/layer/MOM_parameter_doc.all +++ b/ocean_only/global_ALE/layer/MOM_parameter_doc.all @@ -1275,6 +1275,11 @@ RHO_PGF_REF = 1035.0 ! [kg m-3] default = 1035.0 ! The reference density that is subtracted off when calculating pressure ! gradient forces. Its inverse is subtracted off of specific volumes when in ! non-Boussinesq mode. The default is RHO_0. +RHO_PGF_REF_BUG = True ! [Boolean] default = True + ! If true, recover a bug that RHO_0 (the mean seawater density in Boussinesq + ! mode) and RHO_PGF_REF (the subtracted reference density in finite volume + ! pressure gradient forces) are incorrectly interchanged in several instances in + ! Boussinesq mode. TIDES_ANSWER_DATE = 20230630 ! default = 20230630 ! The vintage of self-attraction and loading (SAL) and tidal forcing ! calculations. Setting dates before 20230701 recovers old answers (Boussinesq diff --git a/ocean_only/global_ALE/z/MOM_parameter_doc.all b/ocean_only/global_ALE/z/MOM_parameter_doc.all index 35a2b879e..f5cc97840 100644 --- a/ocean_only/global_ALE/z/MOM_parameter_doc.all +++ b/ocean_only/global_ALE/z/MOM_parameter_doc.all @@ -1338,6 +1338,11 @@ RHO_PGF_REF = 1035.0 ! [kg m-3] default = 1035.0 ! The reference density that is subtracted off when calculating pressure ! gradient forces. Its inverse is subtracted off of specific volumes when in ! non-Boussinesq mode. The default is RHO_0. +RHO_PGF_REF_BUG = True ! [Boolean] default = True + ! If true, recover a bug that RHO_0 (the mean seawater density in Boussinesq + ! mode) and RHO_PGF_REF (the subtracted reference density in finite volume + ! pressure gradient forces) are incorrectly interchanged in several instances in + ! Boussinesq mode. TIDES_ANSWER_DATE = 20230630 ! default = 20230630 ! The vintage of self-attraction and loading (SAL) and tidal forcing ! calculations. Setting dates before 20230701 recovers old answers (Boussinesq diff --git a/ocean_only/lock_exchange/MOM_parameter_doc.all b/ocean_only/lock_exchange/MOM_parameter_doc.all index 945e375d0..4b8b482f8 100644 --- a/ocean_only/lock_exchange/MOM_parameter_doc.all +++ b/ocean_only/lock_exchange/MOM_parameter_doc.all @@ -905,6 +905,11 @@ RHO_PGF_REF = 1000.0 ! [kg m-3] default = 1000.0 ! The reference density that is subtracted off when calculating pressure ! gradient forces. Its inverse is subtracted off of specific volumes when in ! non-Boussinesq mode. The default is RHO_0. +RHO_PGF_REF_BUG = True ! [Boolean] default = True + ! If true, recover a bug that RHO_0 (the mean seawater density in Boussinesq + ! mode) and RHO_PGF_REF (the subtracted reference density in finite volume + ! pressure gradient forces) are incorrectly interchanged in several instances in + ! Boussinesq mode. SSH_IN_EOS_PRESSURE_FOR_PGF = False ! [Boolean] default = False ! If true, include contributions from the sea surface height in the height-based ! pressure used in the equation of state calculations for the Boussinesq 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 1019782d9..363cda446 100644 --- a/ocean_only/mixed_layer_restrat_2d/MOM_parameter_doc.all +++ b/ocean_only/mixed_layer_restrat_2d/MOM_parameter_doc.all @@ -1015,6 +1015,11 @@ RHO_PGF_REF = 1000.0 ! [kg m-3] default = 1000.0 ! The reference density that is subtracted off when calculating pressure ! gradient forces. Its inverse is subtracted off of specific volumes when in ! non-Boussinesq mode. The default is RHO_0. +RHO_PGF_REF_BUG = True ! [Boolean] default = True + ! If true, recover a bug that RHO_0 (the mean seawater density in Boussinesq + ! mode) and RHO_PGF_REF (the subtracted reference density in finite volume + ! pressure gradient forces) are incorrectly interchanged in several instances in + ! Boussinesq mode. SSH_IN_EOS_PRESSURE_FOR_PGF = False ! [Boolean] default = False ! If true, include contributions from the sea surface height in the height-based ! pressure used in the equation of state calculations for the Boussinesq diff --git a/ocean_only/nonBous_global/MOM_parameter_doc.all b/ocean_only/nonBous_global/MOM_parameter_doc.all index a4d435bd5..26e60058c 100644 --- a/ocean_only/nonBous_global/MOM_parameter_doc.all +++ b/ocean_only/nonBous_global/MOM_parameter_doc.all @@ -1105,6 +1105,11 @@ RHO_PGF_REF = 1024.0 ! [kg m-3] default = 1024.0 ! The reference density that is subtracted off when calculating pressure ! gradient forces. Its inverse is subtracted off of specific volumes when in ! non-Boussinesq mode. The default is RHO_0. +RHO_PGF_REF_BUG = True ! [Boolean] default = True + ! If true, recover a bug that RHO_0 (the mean seawater density in Boussinesq + ! mode) and RHO_PGF_REF (the subtracted reference density in finite volume + ! pressure gradient forces) are incorrectly interchanged in several instances in + ! Boussinesq mode. TIDES_ANSWER_DATE = 20230630 ! default = 20230630 ! The vintage of self-attraction and loading (SAL) and tidal forcing ! calculations. Setting dates before 20230701 recovers old answers (Boussinesq diff --git a/ocean_only/resting/layer/MOM_parameter_doc.all b/ocean_only/resting/layer/MOM_parameter_doc.all index c16c01ea3..d642ed972 100644 --- a/ocean_only/resting/layer/MOM_parameter_doc.all +++ b/ocean_only/resting/layer/MOM_parameter_doc.all @@ -897,6 +897,11 @@ RHO_PGF_REF = 1035.0 ! [kg m-3] default = 1035.0 ! The reference density that is subtracted off when calculating pressure ! gradient forces. Its inverse is subtracted off of specific volumes when in ! non-Boussinesq mode. The default is RHO_0. +RHO_PGF_REF_BUG = True ! [Boolean] default = True + ! If true, recover a bug that RHO_0 (the mean seawater density in Boussinesq + ! mode) and RHO_PGF_REF (the subtracted reference density in finite volume + ! pressure gradient forces) are incorrectly interchanged in several instances in + ! Boussinesq mode. SSH_IN_EOS_PRESSURE_FOR_PGF = False ! [Boolean] default = False ! If true, include contributions from the sea surface height in the height-based ! pressure used in the equation of state calculations for the Boussinesq diff --git a/ocean_only/resting/z/MOM_parameter_doc.all b/ocean_only/resting/z/MOM_parameter_doc.all index 5b9d24cda..11be42206 100644 --- a/ocean_only/resting/z/MOM_parameter_doc.all +++ b/ocean_only/resting/z/MOM_parameter_doc.all @@ -1015,6 +1015,11 @@ RHO_PGF_REF = 1035.0 ! [kg m-3] default = 1035.0 ! The reference density that is subtracted off when calculating pressure ! gradient forces. Its inverse is subtracted off of specific volumes when in ! non-Boussinesq mode. The default is RHO_0. +RHO_PGF_REF_BUG = True ! [Boolean] default = True + ! If true, recover a bug that RHO_0 (the mean seawater density in Boussinesq + ! mode) and RHO_PGF_REF (the subtracted reference density in finite volume + ! pressure gradient forces) are incorrectly interchanged in several instances in + ! Boussinesq mode. SSH_IN_EOS_PRESSURE_FOR_PGF = False ! [Boolean] default = False ! If true, include contributions from the sea surface height in the height-based ! pressure used in the equation of state calculations for the Boussinesq diff --git a/ocean_only/seamount/layer/MOM_parameter_doc.all b/ocean_only/seamount/layer/MOM_parameter_doc.all index bd9f83faa..f489d865b 100644 --- a/ocean_only/seamount/layer/MOM_parameter_doc.all +++ b/ocean_only/seamount/layer/MOM_parameter_doc.all @@ -930,6 +930,11 @@ RHO_PGF_REF = 1035.0 ! [kg m-3] default = 1035.0 ! The reference density that is subtracted off when calculating pressure ! gradient forces. Its inverse is subtracted off of specific volumes when in ! non-Boussinesq mode. The default is RHO_0. +RHO_PGF_REF_BUG = True ! [Boolean] default = True + ! If true, recover a bug that RHO_0 (the mean seawater density in Boussinesq + ! mode) and RHO_PGF_REF (the subtracted reference density in finite volume + ! pressure gradient forces) are incorrectly interchanged in several instances in + ! Boussinesq mode. SSH_IN_EOS_PRESSURE_FOR_PGF = False ! [Boolean] default = False ! If true, include contributions from the sea surface height in the height-based ! pressure used in the equation of state calculations for the Boussinesq diff --git a/ocean_only/seamount/rho/MOM_parameter_doc.all b/ocean_only/seamount/rho/MOM_parameter_doc.all index 71d91f241..e3f088956 100644 --- a/ocean_only/seamount/rho/MOM_parameter_doc.all +++ b/ocean_only/seamount/rho/MOM_parameter_doc.all @@ -1094,6 +1094,11 @@ RHO_PGF_REF = 1035.0 ! [kg m-3] default = 1035.0 ! The reference density that is subtracted off when calculating pressure ! gradient forces. Its inverse is subtracted off of specific volumes when in ! non-Boussinesq mode. The default is RHO_0. +RHO_PGF_REF_BUG = True ! [Boolean] default = True + ! If true, recover a bug that RHO_0 (the mean seawater density in Boussinesq + ! mode) and RHO_PGF_REF (the subtracted reference density in finite volume + ! pressure gradient forces) are incorrectly interchanged in several instances in + ! Boussinesq mode. SSH_IN_EOS_PRESSURE_FOR_PGF = False ! [Boolean] default = False ! If true, include contributions from the sea surface height in the height-based ! pressure used in the equation of state calculations for the Boussinesq diff --git a/ocean_only/seamount/sigma/MOM_parameter_doc.all b/ocean_only/seamount/sigma/MOM_parameter_doc.all index 86d8e2493..30840039e 100644 --- a/ocean_only/seamount/sigma/MOM_parameter_doc.all +++ b/ocean_only/seamount/sigma/MOM_parameter_doc.all @@ -1043,6 +1043,11 @@ RHO_PGF_REF = 1035.0 ! [kg m-3] default = 1035.0 ! The reference density that is subtracted off when calculating pressure ! gradient forces. Its inverse is subtracted off of specific volumes when in ! non-Boussinesq mode. The default is RHO_0. +RHO_PGF_REF_BUG = True ! [Boolean] default = True + ! If true, recover a bug that RHO_0 (the mean seawater density in Boussinesq + ! mode) and RHO_PGF_REF (the subtracted reference density in finite volume + ! pressure gradient forces) are incorrectly interchanged in several instances in + ! Boussinesq mode. SSH_IN_EOS_PRESSURE_FOR_PGF = False ! [Boolean] default = False ! If true, include contributions from the sea surface height in the height-based ! pressure used in the equation of state calculations for the Boussinesq diff --git a/ocean_only/seamount/z/MOM_parameter_doc.all b/ocean_only/seamount/z/MOM_parameter_doc.all index 3dfbb7ba3..e8908041c 100644 --- a/ocean_only/seamount/z/MOM_parameter_doc.all +++ b/ocean_only/seamount/z/MOM_parameter_doc.all @@ -1043,6 +1043,11 @@ RHO_PGF_REF = 1035.0 ! [kg m-3] default = 1035.0 ! The reference density that is subtracted off when calculating pressure ! gradient forces. Its inverse is subtracted off of specific volumes when in ! non-Boussinesq mode. The default is RHO_0. +RHO_PGF_REF_BUG = True ! [Boolean] default = True + ! If true, recover a bug that RHO_0 (the mean seawater density in Boussinesq + ! mode) and RHO_PGF_REF (the subtracted reference density in finite volume + ! pressure gradient forces) are incorrectly interchanged in several instances in + ! Boussinesq mode. SSH_IN_EOS_PRESSURE_FOR_PGF = False ! [Boolean] default = False ! If true, include contributions from the sea surface height in the height-based ! pressure used in the equation of state calculations for the Boussinesq diff --git a/ocean_only/single_column/BML/MOM_parameter_doc.all b/ocean_only/single_column/BML/MOM_parameter_doc.all index 3f9be3f8b..ecdcffa6d 100644 --- a/ocean_only/single_column/BML/MOM_parameter_doc.all +++ b/ocean_only/single_column/BML/MOM_parameter_doc.all @@ -896,6 +896,11 @@ RHO_PGF_REF = 1035.0 ! [kg m-3] default = 1035.0 ! The reference density that is subtracted off when calculating pressure ! gradient forces. Its inverse is subtracted off of specific volumes when in ! non-Boussinesq mode. The default is RHO_0. +RHO_PGF_REF_BUG = True ! [Boolean] default = True + ! If true, recover a bug that RHO_0 (the mean seawater density in Boussinesq + ! mode) and RHO_PGF_REF (the subtracted reference density in finite volume + ! pressure gradient forces) are incorrectly interchanged in several instances in + ! Boussinesq mode. SSH_IN_EOS_PRESSURE_FOR_PGF = False ! [Boolean] default = False ! If true, include contributions from the sea surface height in the height-based ! pressure used in the equation of state calculations for the Boussinesq diff --git a/ocean_only/single_column/EPBL/MOM_parameter_doc.all b/ocean_only/single_column/EPBL/MOM_parameter_doc.all index 89d0b9dea..7fb8e58c2 100644 --- a/ocean_only/single_column/EPBL/MOM_parameter_doc.all +++ b/ocean_only/single_column/EPBL/MOM_parameter_doc.all @@ -966,6 +966,11 @@ RHO_PGF_REF = 1035.0 ! [kg m-3] default = 1035.0 ! The reference density that is subtracted off when calculating pressure ! gradient forces. Its inverse is subtracted off of specific volumes when in ! non-Boussinesq mode. The default is RHO_0. +RHO_PGF_REF_BUG = True ! [Boolean] default = True + ! If true, recover a bug that RHO_0 (the mean seawater density in Boussinesq + ! mode) and RHO_PGF_REF (the subtracted reference density in finite volume + ! pressure gradient forces) are incorrectly interchanged in several instances in + ! Boussinesq mode. SSH_IN_EOS_PRESSURE_FOR_PGF = False ! [Boolean] default = False ! If true, include contributions from the sea surface height in the height-based ! pressure used in the equation of state calculations for the Boussinesq diff --git a/ocean_only/single_column/KPP/MOM_parameter_doc.all b/ocean_only/single_column/KPP/MOM_parameter_doc.all index e91d314df..8ec21bcd5 100644 --- a/ocean_only/single_column/KPP/MOM_parameter_doc.all +++ b/ocean_only/single_column/KPP/MOM_parameter_doc.all @@ -966,6 +966,11 @@ RHO_PGF_REF = 1035.0 ! [kg m-3] default = 1035.0 ! The reference density that is subtracted off when calculating pressure ! gradient forces. Its inverse is subtracted off of specific volumes when in ! non-Boussinesq mode. The default is RHO_0. +RHO_PGF_REF_BUG = True ! [Boolean] default = True + ! If true, recover a bug that RHO_0 (the mean seawater density in Boussinesq + ! mode) and RHO_PGF_REF (the subtracted reference density in finite volume + ! pressure gradient forces) are incorrectly interchanged in several instances in + ! Boussinesq mode. SSH_IN_EOS_PRESSURE_FOR_PGF = False ! [Boolean] default = False ! If true, include contributions from the sea surface height in the height-based ! pressure used in the equation of state calculations for the Boussinesq diff --git a/ocean_only/sloshing/layer/MOM_parameter_doc.all b/ocean_only/sloshing/layer/MOM_parameter_doc.all index b448e3d86..87e99df05 100644 --- a/ocean_only/sloshing/layer/MOM_parameter_doc.all +++ b/ocean_only/sloshing/layer/MOM_parameter_doc.all @@ -911,6 +911,11 @@ RHO_PGF_REF = 1035.0 ! [kg m-3] default = 1035.0 ! The reference density that is subtracted off when calculating pressure ! gradient forces. Its inverse is subtracted off of specific volumes when in ! non-Boussinesq mode. The default is RHO_0. +RHO_PGF_REF_BUG = True ! [Boolean] default = True + ! If true, recover a bug that RHO_0 (the mean seawater density in Boussinesq + ! mode) and RHO_PGF_REF (the subtracted reference density in finite volume + ! pressure gradient forces) are incorrectly interchanged in several instances in + ! Boussinesq mode. SSH_IN_EOS_PRESSURE_FOR_PGF = False ! [Boolean] default = False ! If true, include contributions from the sea surface height in the height-based ! pressure used in the equation of state calculations for the Boussinesq diff --git a/ocean_only/sloshing/rho/MOM_parameter_doc.all b/ocean_only/sloshing/rho/MOM_parameter_doc.all index b95e5707a..355cfc8fc 100644 --- a/ocean_only/sloshing/rho/MOM_parameter_doc.all +++ b/ocean_only/sloshing/rho/MOM_parameter_doc.all @@ -1077,6 +1077,11 @@ RHO_PGF_REF = 1035.0 ! [kg m-3] default = 1035.0 ! The reference density that is subtracted off when calculating pressure ! gradient forces. Its inverse is subtracted off of specific volumes when in ! non-Boussinesq mode. The default is RHO_0. +RHO_PGF_REF_BUG = True ! [Boolean] default = True + ! If true, recover a bug that RHO_0 (the mean seawater density in Boussinesq + ! mode) and RHO_PGF_REF (the subtracted reference density in finite volume + ! pressure gradient forces) are incorrectly interchanged in several instances in + ! Boussinesq mode. SSH_IN_EOS_PRESSURE_FOR_PGF = False ! [Boolean] default = False ! If true, include contributions from the sea surface height in the height-based ! pressure used in the equation of state calculations for the Boussinesq diff --git a/ocean_only/sloshing/z/MOM_parameter_doc.all b/ocean_only/sloshing/z/MOM_parameter_doc.all index 94ec9885e..20da60ec5 100644 --- a/ocean_only/sloshing/z/MOM_parameter_doc.all +++ b/ocean_only/sloshing/z/MOM_parameter_doc.all @@ -1029,6 +1029,11 @@ RHO_PGF_REF = 1035.0 ! [kg m-3] default = 1035.0 ! The reference density that is subtracted off when calculating pressure ! gradient forces. Its inverse is subtracted off of specific volumes when in ! non-Boussinesq mode. The default is RHO_0. +RHO_PGF_REF_BUG = True ! [Boolean] default = True + ! If true, recover a bug that RHO_0 (the mean seawater density in Boussinesq + ! mode) and RHO_PGF_REF (the subtracted reference density in finite volume + ! pressure gradient forces) are incorrectly interchanged in several instances in + ! Boussinesq mode. SSH_IN_EOS_PRESSURE_FOR_PGF = False ! [Boolean] default = False ! If true, include contributions from the sea surface height in the height-based ! pressure used in the equation of state calculations for the Boussinesq diff --git a/ocean_only/torus_advection_test/MOM_parameter_doc.all b/ocean_only/torus_advection_test/MOM_parameter_doc.all index f32779651..7cf8e3bc7 100644 --- a/ocean_only/torus_advection_test/MOM_parameter_doc.all +++ b/ocean_only/torus_advection_test/MOM_parameter_doc.all @@ -894,6 +894,11 @@ RHO_PGF_REF = 1000.0 ! [kg m-3] default = 1000.0 ! The reference density that is subtracted off when calculating pressure ! gradient forces. Its inverse is subtracted off of specific volumes when in ! non-Boussinesq mode. The default is RHO_0. +RHO_PGF_REF_BUG = True ! [Boolean] default = True + ! If true, recover a bug that RHO_0 (the mean seawater density in Boussinesq + ! mode) and RHO_PGF_REF (the subtracted reference density in finite volume + ! pressure gradient forces) are incorrectly interchanged in several instances in + ! Boussinesq mode. SSH_IN_EOS_PRESSURE_FOR_PGF = False ! [Boolean] default = False ! If true, include contributions from the sea surface height in the height-based ! pressure used in the equation of state calculations for the Boussinesq diff --git a/ocean_only/tracer_mixing/rho/MOM_parameter_doc.all b/ocean_only/tracer_mixing/rho/MOM_parameter_doc.all index 30c80bf78..cdfa17e41 100644 --- a/ocean_only/tracer_mixing/rho/MOM_parameter_doc.all +++ b/ocean_only/tracer_mixing/rho/MOM_parameter_doc.all @@ -1078,6 +1078,11 @@ RHO_PGF_REF = 1000.0 ! [kg m-3] default = 1000.0 ! The reference density that is subtracted off when calculating pressure ! gradient forces. Its inverse is subtracted off of specific volumes when in ! non-Boussinesq mode. The default is RHO_0. +RHO_PGF_REF_BUG = True ! [Boolean] default = True + ! If true, recover a bug that RHO_0 (the mean seawater density in Boussinesq + ! mode) and RHO_PGF_REF (the subtracted reference density in finite volume + ! pressure gradient forces) are incorrectly interchanged in several instances in + ! Boussinesq mode. SSH_IN_EOS_PRESSURE_FOR_PGF = False ! [Boolean] default = False ! If true, include contributions from the sea surface height in the height-based ! pressure used in the equation of state calculations for the Boussinesq diff --git a/ocean_only/tracer_mixing/z/MOM_parameter_doc.all b/ocean_only/tracer_mixing/z/MOM_parameter_doc.all index bcf82953c..14eb4c05d 100644 --- a/ocean_only/tracer_mixing/z/MOM_parameter_doc.all +++ b/ocean_only/tracer_mixing/z/MOM_parameter_doc.all @@ -1030,6 +1030,11 @@ RHO_PGF_REF = 1000.0 ! [kg m-3] default = 1000.0 ! The reference density that is subtracted off when calculating pressure ! gradient forces. Its inverse is subtracted off of specific volumes when in ! non-Boussinesq mode. The default is RHO_0. +RHO_PGF_REF_BUG = True ! [Boolean] default = True + ! If true, recover a bug that RHO_0 (the mean seawater density in Boussinesq + ! mode) and RHO_PGF_REF (the subtracted reference density in finite volume + ! pressure gradient forces) are incorrectly interchanged in several instances in + ! Boussinesq mode. SSH_IN_EOS_PRESSURE_FOR_PGF = False ! [Boolean] default = False ! If true, include contributions from the sea surface height in the height-based ! pressure used in the equation of state calculations for the Boussinesq diff --git a/ocean_only/unit_tests/MOM_parameter_doc.all b/ocean_only/unit_tests/MOM_parameter_doc.all index d24f926ce..bc8d1fb75 100644 --- a/ocean_only/unit_tests/MOM_parameter_doc.all +++ b/ocean_only/unit_tests/MOM_parameter_doc.all @@ -742,6 +742,11 @@ RHO_PGF_REF = 1035.0 ! [kg m-3] default = 1035.0 ! The reference density that is subtracted off when calculating pressure ! gradient forces. Its inverse is subtracted off of specific volumes when in ! non-Boussinesq mode. The default is RHO_0. +RHO_PGF_REF_BUG = True ! [Boolean] default = True + ! If true, recover a bug that RHO_0 (the mean seawater density in Boussinesq + ! mode) and RHO_PGF_REF (the subtracted reference density in finite volume + ! pressure gradient forces) are incorrectly interchanged in several instances in + ! Boussinesq mode. SSH_IN_EOS_PRESSURE_FOR_PGF = False ! [Boolean] default = False ! If true, include contributions from the sea surface height in the height-based ! pressure used in the equation of state calculations for the Boussinesq diff --git a/src/MOM6 b/src/MOM6 index 809d56e36..5f23058b4 160000 --- a/src/MOM6 +++ b/src/MOM6 @@ -1 +1 @@ -Subproject commit 809d56e366497f88830b27d6c58c1f10c4b535af +Subproject commit 5f23058b43d391421837e187e31c46327b07e938