Skip to content

Commit 0363d2b

Browse files
Hallberg-NOAAmarshallward
authored andcommitted
*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.
1 parent bdf4b9e commit 0363d2b

File tree

3 files changed

+15
-1
lines changed

3 files changed

+15
-1
lines changed

.testing/tc1/MOM_input

Lines changed: 6 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -278,6 +278,12 @@ BOUND_CORIOLIS = True ! [Boolean] default = False
278278
! have no effect on the SADOURNY Coriolis scheme if it
279279
! were possible to use centered difference thickness fluxes.
280280

281+
! === module MOM_PressureForce_FV ===
282+
MASS_WEIGHT_IN_PRESSURE_GRADIENT = True ! [Boolean] default = False
283+
! If true, use mass weighting when interpolating T/S for integrals
284+
! near the bathymetry in FV pressure gradient calculations.
285+
286+
281287
! === module MOM_hor_visc ===
282288
AH_VEL_SCALE = 0.05 ! [m s-1] default = 0.0
283289
! The velocity scale which is multiplied by the cube of

.testing/tc2/MOM_input

Lines changed: 6 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -302,11 +302,16 @@ PGF_STANLEY_T2_DET_COEFF = -1.0 ! [nondim] default = -1.0
302302
! gradient in the deterministic part of the Stanley form of the Brankart
303303
! correction. Negative values disable the scheme.
304304

305+
! === module MOM_PressureForce_FV ===
306+
MASS_WEIGHT_IN_PRESSURE_GRADIENT = True ! [Boolean] default = False
307+
! If true, use mass weighting when interpolating T/S for integrals
308+
! near the bathymetry in FV pressure gradient calculations.
309+
305310
! === module MOM_hor_visc ===
306311
LAPLACIAN = True
307312
KH_VEL_SCALE = 0.05
308313
SMAGORINSKY_KH = True ! [Boolean] default = False
309-
SMAG_LAP_CONST = 0.06 ! [nondim] default = 0.0
314+
SMAG_LAP_CONST = 0.06 ! [nondim] default = 0.0
310315
AH_VEL_SCALE = 0.05 ! [m s-1] default = 0.0
311316
! The velocity scale which is multiplied by the cube of
312317
! the grid spacing to calculate the Laplacian viscosity.

.testing/tc4/MOM_input

Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -269,6 +269,9 @@ BOUND_CORIOLIS = True ! [Boolean] default = False
269269
! === module MOM_PressureForce ===
270270

271271
! === module MOM_PressureForce_FV ===
272+
MASS_WEIGHT_IN_PRESSURE_GRADIENT = True ! [Boolean] default = False
273+
! If true, use mass weighting when interpolating T/S for integrals
274+
! near the bathymetry in FV pressure gradient calculations.
272275
RECONSTRUCT_FOR_PRESSURE = False ! [Boolean] default = True
273276
! If True, use vertical reconstruction of T & S within the integrals of the FV
274277
! pressure gradient calculation. If False, use the constant-by-layer algorithm.

0 commit comments

Comments
 (0)