Skip to content

Commit

Permalink
MOM6: Bugfix for mixing up Rho0 and rho_ref in Boussinesq PGF (#837)
Browse files Browse the repository at this point in the history
- 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
  • Loading branch information
mom6bot authored and Hallberg-NOAA committed Feb 24, 2025
1 parent 57cf15d commit 2045e77
Show file tree
Hide file tree
Showing 60 changed files with 296 additions and 1 deletion.
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down
5 changes: 5 additions & 0 deletions ice_ocean_SIS2/Baltic/MOM_parameter_doc.all
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down
5 changes: 5 additions & 0 deletions ice_ocean_SIS2/Baltic_OM4_025/MOM_parameter_doc.all
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down
5 changes: 5 additions & 0 deletions ice_ocean_SIS2/Baltic_OM4_05/MOM_parameter_doc.all
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down
5 changes: 5 additions & 0 deletions ice_ocean_SIS2/OM4_025/MOM_parameter_doc.all
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down
5 changes: 5 additions & 0 deletions ice_ocean_SIS2/OM4_05/MOM_parameter_doc.all
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down
5 changes: 5 additions & 0 deletions ice_ocean_SIS2/OM_1deg/MOM_parameter_doc.all
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down
5 changes: 5 additions & 0 deletions ice_ocean_SIS2/SIS2/MOM_parameter_doc.all
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down
5 changes: 5 additions & 0 deletions ice_ocean_SIS2/SIS2_bergs_cgrid/MOM_parameter_doc.all
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down
5 changes: 5 additions & 0 deletions ice_ocean_SIS2/SIS2_cgrid/MOM_parameter_doc.all
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down
Loading

0 comments on commit 2045e77

Please sign in to comment.