From 0363d2bd46b30326c74934f5fd2dde527d73a7cc Mon Sep 17 00:00:00 2001
From: Robert Hallberg <Robert.Hallberg@noaa.gov>
Date: Mon, 16 Sep 2024 18:01:15 -0400
Subject: [PATCH] *Set MASS_WEIGHT_IN_PRESSURE_GRADIENT in .testing

  Set MASS_WEIGHT_IN_PRESSURE_GRADIENT = True in the MOM_input files for the
tc1, tc2 and tc4 test cases in .testing, to permit the code to pass this testing
while dealing with inconsistent settings for two diagnostics related to the
mass-weighting in the pressure gradient forces.  This commit redefines these 3
test cases.
---
 .testing/tc1/MOM_input | 6 ++++++
 .testing/tc2/MOM_input | 7 ++++++-
 .testing/tc4/MOM_input | 3 +++
 3 files changed, 15 insertions(+), 1 deletion(-)

diff --git a/.testing/tc1/MOM_input b/.testing/tc1/MOM_input
index 151c093ff9..04204bd67f 100644
--- a/.testing/tc1/MOM_input
+++ b/.testing/tc1/MOM_input
@@ -278,6 +278,12 @@ BOUND_CORIOLIS = True           !   [Boolean] default = False
                                 ! have no effect on the SADOURNY Coriolis scheme if it
                                 ! were possible to use centered difference thickness fluxes.
 
+! === module MOM_PressureForce_FV ===
+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.
+
+
 ! === module MOM_hor_visc ===
 AH_VEL_SCALE = 0.05             !   [m s-1] default = 0.0
                                 ! The velocity scale which is multiplied by the cube of
diff --git a/.testing/tc2/MOM_input b/.testing/tc2/MOM_input
index c7d2a35aa6..e142c64ff8 100644
--- a/.testing/tc2/MOM_input
+++ b/.testing/tc2/MOM_input
@@ -302,11 +302,16 @@ PGF_STANLEY_T2_DET_COEFF = -1.0 !   [nondim] default = -1.0
                                 ! gradient in the deterministic part of the Stanley form of the Brankart
                                 ! correction. Negative values disable the scheme.
 
+! === module MOM_PressureForce_FV ===
+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.
+
 ! === module MOM_hor_visc ===
 LAPLACIAN = True
 KH_VEL_SCALE = 0.05
 SMAGORINSKY_KH = True           !   [Boolean] default = False
-SMAG_LAP_CONST = 0.06            !   [nondim] default = 0.0
+SMAG_LAP_CONST = 0.06           !   [nondim] default = 0.0
 AH_VEL_SCALE = 0.05             !   [m s-1] default = 0.0
                                 ! The velocity scale which is multiplied by the cube of
                                 ! the grid spacing to calculate the Laplacian viscosity.
diff --git a/.testing/tc4/MOM_input b/.testing/tc4/MOM_input
index 591ed4c788..c4ef8475a9 100644
--- a/.testing/tc4/MOM_input
+++ b/.testing/tc4/MOM_input
@@ -269,6 +269,9 @@ BOUND_CORIOLIS = True           !   [Boolean] default = False
 ! === module MOM_PressureForce ===
 
 ! === module MOM_PressureForce_FV ===
+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.
 RECONSTRUCT_FOR_PRESSURE = False !   [Boolean] default = True
                                 ! If True, use vertical reconstruction of T & S within the integrals of the FV
                                 ! pressure gradient calculation. If False, use the constant-by-layer algorithm.