Skip to content

Commit 68773d3

Browse files
mom6botmarshallward
mom6bot
authored and
marshallward
committed
MOM6: (*)Refactor p_ave calculation
- NOAA-GFDL/MOM6@9b9c16550 (*)Refactor p_ave calculation - NOAA-GFDL/MOM6@ffff6f330 +Optionally use SSH in calculate density for PGF
1 parent c30316c commit 68773d3

File tree

59 files changed

+291
-1
lines changed

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

59 files changed

+291
-1
lines changed

‎coupled_AM2_LM3_SIS2/AM2_SIS2_MOM6i_1deg/MOM_parameter_doc.all

Lines changed: 5 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1081,6 +1081,11 @@ RHO_PGF_REF = 1035.0 ! [kg m-3] default = 1035.0
10811081
! The reference density that is subtracted off when calculating pressure
10821082
! gradient forces. Its inverse is subtracted off of specific volumes when in
10831083
! non-Boussinesq mode. The default is RHO_0.
1084+
SSH_IN_EOS_PRESSURE_FOR_PGF = False ! [Boolean] default = False
1085+
! If true, include contributions from the sea surface height in the height-based
1086+
! pressure used in the equation of state calculations for the Boussinesq
1087+
! pressure gradient forces, including adjustments for atmospheric or sea-ice
1088+
! pressure.
10841089
MASS_WEIGHT_IN_PRESSURE_GRADIENT = False ! [Boolean] default = False
10851090
! If true, use mass weighting when interpolating T/S for integrals near the
10861091
! bathymetry in FV pressure gradient calculations.

‎coupled_AM2_LM3_SIS2/Concurrent_ice_1deg/MOM_parameter_doc.all

Lines changed: 5 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1081,6 +1081,11 @@ RHO_PGF_REF = 1035.0 ! [kg m-3] default = 1035.0
10811081
! The reference density that is subtracted off when calculating pressure
10821082
! gradient forces. Its inverse is subtracted off of specific volumes when in
10831083
! non-Boussinesq mode. The default is RHO_0.
1084+
SSH_IN_EOS_PRESSURE_FOR_PGF = False ! [Boolean] default = False
1085+
! If true, include contributions from the sea surface height in the height-based
1086+
! pressure used in the equation of state calculations for the Boussinesq
1087+
! pressure gradient forces, including adjustments for atmospheric or sea-ice
1088+
! pressure.
10841089
MASS_WEIGHT_IN_PRESSURE_GRADIENT = False ! [Boolean] default = False
10851090
! If true, use mass weighting when interpolating T/S for integrals near the
10861091
! bathymetry in FV pressure gradient calculations.

‎coupled_AM2_LM3_SIS2/Intersperse_ice_1deg/MOM_parameter_doc.all

Lines changed: 5 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1081,6 +1081,11 @@ RHO_PGF_REF = 1035.0 ! [kg m-3] default = 1035.0
10811081
! The reference density that is subtracted off when calculating pressure
10821082
! gradient forces. Its inverse is subtracted off of specific volumes when in
10831083
! non-Boussinesq mode. The default is RHO_0.
1084+
SSH_IN_EOS_PRESSURE_FOR_PGF = False ! [Boolean] default = False
1085+
! If true, include contributions from the sea surface height in the height-based
1086+
! pressure used in the equation of state calculations for the Boussinesq
1087+
! pressure gradient forces, including adjustments for atmospheric or sea-ice
1088+
! pressure.
10841089
MASS_WEIGHT_IN_PRESSURE_GRADIENT = False ! [Boolean] default = False
10851090
! If true, use mass weighting when interpolating T/S for integrals near the
10861091
! bathymetry in FV pressure gradient calculations.

‎ice_ocean_SIS2/Baltic/MOM_parameter_doc.all

Lines changed: 5 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1081,6 +1081,11 @@ RHO_PGF_REF = 1035.0 ! [kg m-3] default = 1035.0
10811081
! The reference density that is subtracted off when calculating pressure
10821082
! gradient forces. Its inverse is subtracted off of specific volumes when in
10831083
! non-Boussinesq mode. The default is RHO_0.
1084+
SSH_IN_EOS_PRESSURE_FOR_PGF = False ! [Boolean] default = False
1085+
! If true, include contributions from the sea surface height in the height-based
1086+
! pressure used in the equation of state calculations for the Boussinesq
1087+
! pressure gradient forces, including adjustments for atmospheric or sea-ice
1088+
! pressure.
10841089
MASS_WEIGHT_IN_PRESSURE_GRADIENT = False ! [Boolean] default = False
10851090
! If true, use mass weighting when interpolating T/S for integrals near the
10861091
! bathymetry in FV pressure gradient calculations.

‎ice_ocean_SIS2/Baltic_ALE_z_offline_tracers/MOM_parameter_doc.all

Lines changed: 5 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1317,6 +1317,11 @@ TIDES_ANSWER_DATE = 20230630 ! default = 20230630
13171317
! calculations in Boussinesq mode. Values below 20230701 recover the old answers
13181318
! in which the SAL is part of the tidal forcing calculation. The change is due
13191319
! to a reordered summation and the difference is only at bit level.
1320+
SSH_IN_EOS_PRESSURE_FOR_PGF = False ! [Boolean] default = False
1321+
! If true, include contributions from the sea surface height in the height-based
1322+
! pressure used in the equation of state calculations for the Boussinesq
1323+
! pressure gradient forces, including adjustments for atmospheric or sea-ice
1324+
! pressure.
13201325
MASS_WEIGHT_IN_PRESSURE_GRADIENT = True ! [Boolean] default = False
13211326
! If true, use mass weighting when interpolating T/S for integrals near the
13221327
! bathymetry in FV pressure gradient calculations.

‎ice_ocean_SIS2/Baltic_OM4_025/MOM_parameter_doc.all

Lines changed: 5 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1326,6 +1326,11 @@ RHO_PGF_REF = 1035.0 ! [kg m-3] default = 1035.0
13261326
! The reference density that is subtracted off when calculating pressure
13271327
! gradient forces. Its inverse is subtracted off of specific volumes when in
13281328
! non-Boussinesq mode. The default is RHO_0.
1329+
SSH_IN_EOS_PRESSURE_FOR_PGF = False ! [Boolean] default = False
1330+
! If true, include contributions from the sea surface height in the height-based
1331+
! pressure used in the equation of state calculations for the Boussinesq
1332+
! pressure gradient forces, including adjustments for atmospheric or sea-ice
1333+
! pressure.
13291334
MASS_WEIGHT_IN_PRESSURE_GRADIENT = True ! [Boolean] default = False
13301335
! If true, use mass weighting when interpolating T/S for integrals near the
13311336
! bathymetry in FV pressure gradient calculations.

‎ice_ocean_SIS2/Baltic_OM4_05/MOM_parameter_doc.all

Lines changed: 5 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1340,6 +1340,11 @@ RHO_PGF_REF = 1035.0 ! [kg m-3] default = 1035.0
13401340
! The reference density that is subtracted off when calculating pressure
13411341
! gradient forces. Its inverse is subtracted off of specific volumes when in
13421342
! non-Boussinesq mode. The default is RHO_0.
1343+
SSH_IN_EOS_PRESSURE_FOR_PGF = False ! [Boolean] default = False
1344+
! If true, include contributions from the sea surface height in the height-based
1345+
! pressure used in the equation of state calculations for the Boussinesq
1346+
! pressure gradient forces, including adjustments for atmospheric or sea-ice
1347+
! pressure.
13431348
MASS_WEIGHT_IN_PRESSURE_GRADIENT = True ! [Boolean] default = False
13441349
! If true, use mass weighting when interpolating T/S for integrals near the
13451350
! bathymetry in FV pressure gradient calculations.

‎ice_ocean_SIS2/OM4_025/MOM_parameter_doc.all

Lines changed: 5 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1326,6 +1326,11 @@ RHO_PGF_REF = 1035.0 ! [kg m-3] default = 1035.0
13261326
! The reference density that is subtracted off when calculating pressure
13271327
! gradient forces. Its inverse is subtracted off of specific volumes when in
13281328
! non-Boussinesq mode. The default is RHO_0.
1329+
SSH_IN_EOS_PRESSURE_FOR_PGF = False ! [Boolean] default = False
1330+
! If true, include contributions from the sea surface height in the height-based
1331+
! pressure used in the equation of state calculations for the Boussinesq
1332+
! pressure gradient forces, including adjustments for atmospheric or sea-ice
1333+
! pressure.
13291334
MASS_WEIGHT_IN_PRESSURE_GRADIENT = True ! [Boolean] default = False
13301335
! If true, use mass weighting when interpolating T/S for integrals near the
13311336
! bathymetry in FV pressure gradient calculations.

‎ice_ocean_SIS2/OM4_05/MOM_parameter_doc.all

Lines changed: 5 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1340,6 +1340,11 @@ RHO_PGF_REF = 1035.0 ! [kg m-3] default = 1035.0
13401340
! The reference density that is subtracted off when calculating pressure
13411341
! gradient forces. Its inverse is subtracted off of specific volumes when in
13421342
! non-Boussinesq mode. The default is RHO_0.
1343+
SSH_IN_EOS_PRESSURE_FOR_PGF = False ! [Boolean] default = False
1344+
! If true, include contributions from the sea surface height in the height-based
1345+
! pressure used in the equation of state calculations for the Boussinesq
1346+
! pressure gradient forces, including adjustments for atmospheric or sea-ice
1347+
! pressure.
13431348
MASS_WEIGHT_IN_PRESSURE_GRADIENT = True ! [Boolean] default = False
13441349
! If true, use mass weighting when interpolating T/S for integrals near the
13451350
! bathymetry in FV pressure gradient calculations.

‎ice_ocean_SIS2/OM_1deg/MOM_parameter_doc.all

Lines changed: 5 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1317,6 +1317,11 @@ RHO_PGF_REF = 1035.0 ! [kg m-3] default = 1035.0
13171317
! The reference density that is subtracted off when calculating pressure
13181318
! gradient forces. Its inverse is subtracted off of specific volumes when in
13191319
! non-Boussinesq mode. The default is RHO_0.
1320+
SSH_IN_EOS_PRESSURE_FOR_PGF = False ! [Boolean] default = False
1321+
! If true, include contributions from the sea surface height in the height-based
1322+
! pressure used in the equation of state calculations for the Boussinesq
1323+
! pressure gradient forces, including adjustments for atmospheric or sea-ice
1324+
! pressure.
13201325
MASS_WEIGHT_IN_PRESSURE_GRADIENT = True ! [Boolean] default = False
13211326
! If true, use mass weighting when interpolating T/S for integrals near the
13221327
! bathymetry in FV pressure gradient calculations.

0 commit comments

Comments
 (0)