Skip to content

Commit

Permalink
MOM6: (*)Refactor p_ave calculation
Browse files Browse the repository at this point in the history 
- NOAA-GFDL/MOM6@9b9c16550 (*)Refactor p_ave calculation
- NOAA-GFDL/MOM6@ffff6f330 +Optionally use SSH in calculate density for PGF
  • Loading branch information
@mom6bot @marshallward
mom6bot authored and marshallward committed Sep 11, 2024
1 parent c30316c commit 68773d3
Show file tree
Hide file tree
Showing 59 changed files with 291 additions and 1 deletion.
5 changes: 5 additions & 0 deletions coupled_AM2_LM3_SIS2/AM2_SIS2_MOM6i_1deg/MOM_parameter_doc.all
View file
Original file line number Diff line number Diff line change
Expand Up @@ -1081,6 +1081,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.
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
! pressure gradient forces, including adjustments for atmospheric or sea-ice
! pressure.
MASS_WEIGHT_IN_PRESSURE_GRADIENT = False ! [Boolean] default = False
! If true, use mass weighting when interpolating T/S for integrals near the
! bathymetry in FV pressure gradient calculations.
Expand Down
5 changes: 5 additions & 0 deletions coupled_AM2_LM3_SIS2/Concurrent_ice_1deg/MOM_parameter_doc.all
View file
Original file line number Diff line number Diff line change
Expand Up @@ -1081,6 +1081,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.
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
! pressure gradient forces, including adjustments for atmospheric or sea-ice
! pressure.
MASS_WEIGHT_IN_PRESSURE_GRADIENT = False ! [Boolean] default = False
! If true, use mass weighting when interpolating T/S for integrals near the
! bathymetry in FV pressure gradient calculations.
Expand Down
5 changes: 5 additions & 0 deletions coupled_AM2_LM3_SIS2/Intersperse_ice_1deg/MOM_parameter_doc.all
View file
Original file line number Diff line number Diff line change
Expand Up @@ -1081,6 +1081,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.
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
! pressure gradient forces, including adjustments for atmospheric or sea-ice
! pressure.
MASS_WEIGHT_IN_PRESSURE_GRADIENT = False ! [Boolean] default = False
! If true, use mass weighting when interpolating T/S for integrals near the
! bathymetry in FV pressure gradient calculations.
Expand Down
5 changes: 5 additions & 0 deletions ice_ocean_SIS2/Baltic/MOM_parameter_doc.all
View file
Original file line number Diff line number Diff line change
Expand Up @@ -1081,6 +1081,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.
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
! pressure gradient forces, including adjustments for atmospheric or sea-ice
! pressure.
MASS_WEIGHT_IN_PRESSURE_GRADIENT = False ! [Boolean] default = False
! If true, use mass weighting when interpolating T/S for integrals near the
! bathymetry in FV pressure gradient calculations.
Expand Down
5 changes: 5 additions & 0 deletions ice_ocean_SIS2/Baltic_ALE_z_offline_tracers/MOM_parameter_doc.all
View file
Original file line number Diff line number Diff line change
Expand Up @@ -1317,6 +1317,11 @@ TIDES_ANSWER_DATE = 20230630 ! default = 20230630
! calculations in Boussinesq mode. Values below 20230701 recover the old answers
! in which the SAL is part of the tidal forcing calculation. The change is due
! to a reordered summation and the difference is only at bit level.
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
! pressure gradient forces, including adjustments for atmospheric or sea-ice
! pressure.
MASS_WEIGHT_IN_PRESSURE_GRADIENT = True ! [Boolean] default = False
! If true, use mass weighting when interpolating T/S for integrals near the
! bathymetry in FV pressure gradient calculations.
Expand Down
5 changes: 5 additions & 0 deletions ice_ocean_SIS2/Baltic_OM4_025/MOM_parameter_doc.all
View file
Original file line number Diff line number Diff line change
Expand Up @@ -1326,6 +1326,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.
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
! pressure gradient forces, including adjustments for atmospheric or sea-ice
! pressure.
MASS_WEIGHT_IN_PRESSURE_GRADIENT = True ! [Boolean] default = False
! If true, use mass weighting when interpolating T/S for integrals near the
! bathymetry in FV pressure gradient calculations.
Expand Down
5 changes: 5 additions & 0 deletions ice_ocean_SIS2/Baltic_OM4_05/MOM_parameter_doc.all
View file
Original file line number Diff line number Diff line change
Expand Up @@ -1340,6 +1340,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.
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
! pressure gradient forces, including adjustments for atmospheric or sea-ice
! pressure.
MASS_WEIGHT_IN_PRESSURE_GRADIENT = True ! [Boolean] default = False
! If true, use mass weighting when interpolating T/S for integrals near the
! bathymetry in FV pressure gradient calculations.
Expand Down
5 changes: 5 additions & 0 deletions ice_ocean_SIS2/OM4_025/MOM_parameter_doc.all
View file
Original file line number Diff line number Diff line change
Expand Up @@ -1326,6 +1326,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.
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
! pressure gradient forces, including adjustments for atmospheric or sea-ice
! pressure.
MASS_WEIGHT_IN_PRESSURE_GRADIENT = True ! [Boolean] default = False
! If true, use mass weighting when interpolating T/S for integrals near the
! bathymetry in FV pressure gradient calculations.
Expand Down
5 changes: 5 additions & 0 deletions ice_ocean_SIS2/OM4_05/MOM_parameter_doc.all
View file
Original file line number Diff line number Diff line change
Expand Up @@ -1340,6 +1340,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.
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
! pressure gradient forces, including adjustments for atmospheric or sea-ice
! pressure.
MASS_WEIGHT_IN_PRESSURE_GRADIENT = True ! [Boolean] default = False
! If true, use mass weighting when interpolating T/S for integrals near the
! bathymetry in FV pressure gradient calculations.
Expand Down
5 changes: 5 additions & 0 deletions ice_ocean_SIS2/OM_1deg/MOM_parameter_doc.all
View file
Original file line number Diff line number Diff line change
Expand Up @@ -1317,6 +1317,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.
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
! pressure gradient forces, including adjustments for atmospheric or sea-ice
! pressure.
MASS_WEIGHT_IN_PRESSURE_GRADIENT = True ! [Boolean] default = False
! If true, use mass weighting when interpolating T/S for integrals near the
! bathymetry in FV pressure gradient calculations.
Expand Down
5 changes: 5 additions & 0 deletions ice_ocean_SIS2/SIS2/MOM_parameter_doc.all
View file
Original file line number Diff line number Diff line change
Expand Up @@ -1047,6 +1047,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.
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
! pressure gradient forces, including adjustments for atmospheric or sea-ice
! pressure.
MASS_WEIGHT_IN_PRESSURE_GRADIENT = False ! [Boolean] default = False
! If true, use mass weighting when interpolating T/S for integrals near the
! bathymetry in FV pressure gradient calculations.
Expand Down
5 changes: 5 additions & 0 deletions ice_ocean_SIS2/SIS2_bergs_cgrid/MOM_parameter_doc.all
View file
Original file line number Diff line number Diff line change
Expand Up @@ -1047,6 +1047,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.
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
! pressure gradient forces, including adjustments for atmospheric or sea-ice
! pressure.
MASS_WEIGHT_IN_PRESSURE_GRADIENT = False ! [Boolean] default = False
! If true, use mass weighting when interpolating T/S for integrals near the
! bathymetry in FV pressure gradient calculations.
Expand Down
5 changes: 5 additions & 0 deletions ice_ocean_SIS2/SIS2_cgrid/MOM_parameter_doc.all
View file
Original file line number Diff line number Diff line change
Expand Up @@ -1047,6 +1047,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.
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
! pressure gradient forces, including adjustments for atmospheric or sea-ice
! pressure.
MASS_WEIGHT_IN_PRESSURE_GRADIENT = False ! [Boolean] default = False
! If true, use mass weighting when interpolating T/S for integrals near the
! bathymetry in FV pressure gradient calculations.
Expand Down
5 changes: 5 additions & 0 deletions ocean_only/CVmix_SCM_tests/cooling_only/BML/MOM_parameter_doc.all
View file
Original file line number Diff line number Diff line change
Expand Up @@ -848,6 +848,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.
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
! pressure gradient forces, including adjustments for atmospheric or sea-ice
! pressure.
MASS_WEIGHT_IN_PRESSURE_GRADIENT = False ! [Boolean] default = False
! If true, use mass weighting when interpolating T/S for integrals near the
! bathymetry in FV pressure gradient calculations.
Expand Down
5 changes: 5 additions & 0 deletions ocean_only/CVmix_SCM_tests/cooling_only/EPBL/MOM_parameter_doc.all
View file
Original file line number Diff line number Diff line change
Expand Up @@ -967,6 +967,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.
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
! pressure gradient forces, including adjustments for atmospheric or sea-ice
! pressure.
MASS_WEIGHT_IN_PRESSURE_GRADIENT = False ! [Boolean] default = False
! If true, use mass weighting when interpolating T/S for integrals near the
! bathymetry in FV pressure gradient calculations.
Expand Down
5 changes: 5 additions & 0 deletions ocean_only/CVmix_SCM_tests/cooling_only/KPP/MOM_parameter_doc.all
View file
Original file line number Diff line number Diff line change
Expand Up @@ -967,6 +967,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.
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
! pressure gradient forces, including adjustments for atmospheric or sea-ice
! pressure.
MASS_WEIGHT_IN_PRESSURE_GRADIENT = False ! [Boolean] default = False
! If true, use mass weighting when interpolating T/S for integrals near the
! bathymetry in FV pressure gradient calculations.
Expand Down
5 changes: 5 additions & 0 deletions ocean_only/CVmix_SCM_tests/mech_only/BML/MOM_parameter_doc.all
View file
Original file line number Diff line number Diff line change
Expand Up @@ -848,6 +848,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.
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
! pressure gradient forces, including adjustments for atmospheric or sea-ice
! pressure.
MASS_WEIGHT_IN_PRESSURE_GRADIENT = False ! [Boolean] default = False
! If true, use mass weighting when interpolating T/S for integrals near the
! bathymetry in FV pressure gradient calculations.
Expand Down
5 changes: 5 additions & 0 deletions ocean_only/CVmix_SCM_tests/mech_only/EPBL/MOM_parameter_doc.all
View file
Original file line number Diff line number Diff line change
Expand Up @@ -967,6 +967,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.
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
! pressure gradient forces, including adjustments for atmospheric or sea-ice
! pressure.
MASS_WEIGHT_IN_PRESSURE_GRADIENT = False ! [Boolean] default = False
! If true, use mass weighting when interpolating T/S for integrals near the
! bathymetry in FV pressure gradient calculations.
Expand Down
Loading

0 comments on commit 68773d3

Please sign in to comment.