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 a4bb66e24..7c4f85dd0 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 @@ -1224,6 +1224,10 @@ PV_ADV_SCHEME = "PV_ADV_CENTERED" ! default = "PV_ADV_CENTERED" ! PV_ADV_UPWIND1 - upwind, first order ! === module MOM_self_attr_load === +SAL_USE_BPA = False ! [Boolean] default = False + ! If true, use bottom pressure anomaly to calculate self-attraction and loading + ! (SAL). Otherwise sea surface height anomaly is used, which is only correct for + ! homogenous flow. SAL_SCALAR_APPROX = True ! [Boolean] default = True ! If true, use the scalar approximation to calculate self-attraction and ! loading. @@ -1319,9 +1323,18 @@ RHO_PGF_REF = 1035.0 ! [kg m-3] default = 1035.0 ! non-Boussinesq mode. The default is RHO_0. TIDES_ANSWER_DATE = 20230630 ! default = 20230630 ! The vintage of self-attraction and loading (SAL) and tidal forcing - ! 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. + ! calculations. Setting dates before 20230701 recovers old answers (Boussinesq + ! and non-Boussinesq modes) when SAL is part of the tidal forcing calculation. + ! The answer difference is only at bit level and due to a reordered summation. + ! Setting dates before 20250201 recovers answers (Boussinesq mode) that + ! interface heights are modified before pressure force integrals are calculated. +BOUSSINESQ_SAL_TIDES = False ! [Boolean] default = False + ! If true, in Boussinesq mode, use an alternative method to include + ! self-attraction and loading (SAL) and tidal forcings in pressure gradient, in + ! which their gradients are calculated separately, instead of adding + ! geopotential anomalies as corrections to the interface height. This + ! alternative method elimates a baroclinic component of the SAL and tidal + ! forcings. 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 19ed6b60f..8ed5a57d9 100644 --- a/ocean_only/global_ALE/hycom/MOM_parameter_doc.all +++ b/ocean_only/global_ALE/hycom/MOM_parameter_doc.all @@ -1274,6 +1274,10 @@ PV_ADV_SCHEME = "PV_ADV_CENTERED" ! default = "PV_ADV_CENTERED" ! PV_ADV_UPWIND1 - upwind, first order ! === module MOM_self_attr_load === +SAL_USE_BPA = False ! [Boolean] default = False + ! If true, use bottom pressure anomaly to calculate self-attraction and loading + ! (SAL). Otherwise sea surface height anomaly is used, which is only correct for + ! homogenous flow. SAL_SCALAR_APPROX = True ! [Boolean] default = True ! If true, use the scalar approximation to calculate self-attraction and ! loading. @@ -1369,9 +1373,18 @@ RHO_PGF_REF = 1035.0 ! [kg m-3] default = 1035.0 ! non-Boussinesq mode. The default is RHO_0. TIDES_ANSWER_DATE = 20230630 ! default = 20230630 ! The vintage of self-attraction and loading (SAL) and tidal forcing - ! 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. + ! calculations. Setting dates before 20230701 recovers old answers (Boussinesq + ! and non-Boussinesq modes) when SAL is part of the tidal forcing calculation. + ! The answer difference is only at bit level and due to a reordered summation. + ! Setting dates before 20250201 recovers answers (Boussinesq mode) that + ! interface heights are modified before pressure force integrals are calculated. +BOUSSINESQ_SAL_TIDES = False ! [Boolean] default = False + ! If true, in Boussinesq mode, use an alternative method to include + ! self-attraction and loading (SAL) and tidal forcings in pressure gradient, in + ! which their gradients are calculated separately, instead of adding + ! geopotential anomalies as corrections to the interface height. This + ! alternative method elimates a baroclinic component of the SAL and tidal + ! forcings. 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/layer/MOM_parameter_doc.all b/ocean_only/global_ALE/layer/MOM_parameter_doc.all index 376fdc334..7bf5148b3 100644 --- a/ocean_only/global_ALE/layer/MOM_parameter_doc.all +++ b/ocean_only/global_ALE/layer/MOM_parameter_doc.all @@ -1158,6 +1158,10 @@ PV_ADV_SCHEME = "PV_ADV_CENTERED" ! default = "PV_ADV_CENTERED" ! PV_ADV_UPWIND1 - upwind, first order ! === module MOM_self_attr_load === +SAL_USE_BPA = False ! [Boolean] default = False + ! If true, use bottom pressure anomaly to calculate self-attraction and loading + ! (SAL). Otherwise sea surface height anomaly is used, which is only correct for + ! homogenous flow. SAL_SCALAR_APPROX = True ! [Boolean] default = True ! If true, use the scalar approximation to calculate self-attraction and ! loading. @@ -1253,9 +1257,18 @@ RHO_PGF_REF = 1035.0 ! [kg m-3] default = 1035.0 ! non-Boussinesq mode. The default is RHO_0. TIDES_ANSWER_DATE = 20230630 ! default = 20230630 ! The vintage of self-attraction and loading (SAL) and tidal forcing - ! 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. + ! calculations. Setting dates before 20230701 recovers old answers (Boussinesq + ! and non-Boussinesq modes) when SAL is part of the tidal forcing calculation. + ! The answer difference is only at bit level and due to a reordered summation. + ! Setting dates before 20250201 recovers answers (Boussinesq mode) that + ! interface heights are modified before pressure force integrals are calculated. +BOUSSINESQ_SAL_TIDES = False ! [Boolean] default = False + ! If true, in Boussinesq mode, use an alternative method to include + ! self-attraction and loading (SAL) and tidal forcings in pressure gradient, in + ! which their gradients are calculated separately, instead of adding + ! geopotential anomalies as corrections to the interface height. This + ! alternative method elimates a baroclinic component of the SAL and tidal + ! forcings. 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/z/MOM_parameter_doc.all b/ocean_only/global_ALE/z/MOM_parameter_doc.all index 0806448da..ecc08ae73 100644 --- a/ocean_only/global_ALE/z/MOM_parameter_doc.all +++ b/ocean_only/global_ALE/z/MOM_parameter_doc.all @@ -1221,6 +1221,10 @@ PV_ADV_SCHEME = "PV_ADV_CENTERED" ! default = "PV_ADV_CENTERED" ! PV_ADV_UPWIND1 - upwind, first order ! === module MOM_self_attr_load === +SAL_USE_BPA = False ! [Boolean] default = False + ! If true, use bottom pressure anomaly to calculate self-attraction and loading + ! (SAL). Otherwise sea surface height anomaly is used, which is only correct for + ! homogenous flow. SAL_SCALAR_APPROX = True ! [Boolean] default = True ! If true, use the scalar approximation to calculate self-attraction and ! loading. @@ -1316,9 +1320,18 @@ RHO_PGF_REF = 1035.0 ! [kg m-3] default = 1035.0 ! non-Boussinesq mode. The default is RHO_0. TIDES_ANSWER_DATE = 20230630 ! default = 20230630 ! The vintage of self-attraction and loading (SAL) and tidal forcing - ! 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. + ! calculations. Setting dates before 20230701 recovers old answers (Boussinesq + ! and non-Boussinesq modes) when SAL is part of the tidal forcing calculation. + ! The answer difference is only at bit level and due to a reordered summation. + ! Setting dates before 20250201 recovers answers (Boussinesq mode) that + ! interface heights are modified before pressure force integrals are calculated. +BOUSSINESQ_SAL_TIDES = False ! [Boolean] default = False + ! If true, in Boussinesq mode, use an alternative method to include + ! self-attraction and loading (SAL) and tidal forcings in pressure gradient, in + ! which their gradients are calculated separately, instead of adding + ! geopotential anomalies as corrections to the interface height. This + ! alternative method elimates a baroclinic component of the SAL and tidal + ! forcings. 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 d63e7573b..a9ecb0a16 100644 --- a/ocean_only/nonBous_global/MOM_parameter_doc.all +++ b/ocean_only/nonBous_global/MOM_parameter_doc.all @@ -988,6 +988,10 @@ PV_ADV_SCHEME = "PV_ADV_CENTERED" ! default = "PV_ADV_CENTERED" ! PV_ADV_UPWIND1 - upwind, first order ! === module MOM_self_attr_load === +SAL_USE_BPA = False ! [Boolean] default = False + ! If true, use bottom pressure anomaly to calculate self-attraction and loading + ! (SAL). Otherwise sea surface height anomaly is used, which is only correct for + ! homogenous flow. SAL_SCALAR_APPROX = True ! [Boolean] default = True ! If true, use the scalar approximation to calculate self-attraction and ! loading. @@ -1083,9 +1087,11 @@ RHO_PGF_REF = 1024.0 ! [kg m-3] default = 1024.0 ! non-Boussinesq mode. The default is RHO_0. TIDES_ANSWER_DATE = 20230630 ! default = 20230630 ! The vintage of self-attraction and loading (SAL) and tidal forcing - ! 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. + ! calculations. Setting dates before 20230701 recovers old answers (Boussinesq + ! and non-Boussinesq modes) when SAL is part of the tidal forcing calculation. + ! The answer difference is only at bit level and due to a reordered summation. + ! Setting dates before 20250201 recovers answers (Boussinesq mode) that + ! interface heights are modified before pressure force integrals are calculated. 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. diff --git a/src/MOM6 b/src/MOM6 index 7a45c61fe..8e0b83cda 160000 --- a/src/MOM6 +++ b/src/MOM6 @@ -1 +1 @@ -Subproject commit 7a45c61fe7ab1ccc0032bd1a27580d0d15d4a810 +Subproject commit 8e0b83cdaac726b5f77cfb6cdfee9c30c9cf8531