Skip to content

Commit 759e209

Browse files
uwagurauwagura
authored
Merge pull request #264 from NOAA-GFDL/auto/update-submodules-20260325
Auto-update submodules to latest dev/cefi (auto/update-submodules-20260325), and updated reference answers for NWA12.COBALT, NEP10.COBALT, and NWA12.TIDESONLY
2 parents ff05aec + 7c955cd commit 759e209

10 files changed

Lines changed: 83 additions & 66 deletions

File tree

‎exps/NEP10.COBALT/driver.sh‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -101,7 +101,7 @@ mv ocean.stats RESTART_24hrs_rst
101101
# Define the directories containing the files
102102
module load nccmp
103103
DIR1="./RESTART_24hrs_rst"
104-
DIR2="/gpfs/f5/gfdl_med/proj-shared/github/ci_data/reference/main/NEP10.COBALT/20250625"
104+
DIR2="/gpfs/f5/gfdl_med/proj-shared/github/ci_data/reference/main/NEP10.COBALT/20260324/"
105105

106106
# Define the files to compare
107107
FILES=("$DIR2"/MOM.res*.nc)

‎exps/NWA12.COBALT/driver.sh‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -109,7 +109,7 @@ mv ocean.stats RESTART_24hrs_rst
109109
# Define the directories containing the files
110110
module load nccmp
111111
DIR1="./RESTART_24hrs_rst"
112-
DIR2="/gpfs/f5/gfdl_med/proj-shared/github/ci_data/reference/main/NWA12.COBALT/20250625"
112+
DIR2="/gpfs/f5/gfdl_med/proj-shared/github/ci_data/reference/main/NWA12.COBALT/20260324/"
113113

114114
# Define the files to compare
115115
FILES=("$DIR2"/*.nc)

‎exps/NWA12.tidesonly/MOM_parameter_doc.all‎

Lines changed: 40 additions & 38 deletions
Original file line numberDiff line numberDiff line change
@@ -55,7 +55,7 @@ ENABLE_BUGS_BY_DEFAULT = True ! [Boolean] default = True
5555
! If true, the defaults for certain recently added bug-fix flags are set to
5656
! recreate the bugs so that the code can be moved forward without changing
5757
! answers for existing configurations. The defaults for groups of bug-fix flags
58-
! are periodcially changed to correct the bugs, at which point this parameter
58+
! are periodically changed to correct the bugs, at which point this parameter
5959
! will no longer be used to set their default. Setting this to false means that
6060
! bugs are only used if they are actively selected, but it also means that
6161
! answers may change when code is updated due to newly found bugs.
@@ -268,42 +268,34 @@ MAXIMUM_DEPTH = 6500.0 ! [m]
268268
! if any.
269269
OBC_NUMBER_OF_SEGMENTS = 3 ! default = 0
270270
! The number of open boundary segments.
271-
OBC_ZERO_VORTICITY = False ! [Boolean] default = False
272-
! If true, sets relative vorticity to zero on open boundaries.
273-
OBC_FREESLIP_VORTICITY = True ! [Boolean] default = True
274-
! If true, sets the normal gradient of tangential velocity to zero in the
275-
! relative vorticity on open boundaries. This cannot be true if another
276-
! OBC_XXX_VORTICITY option is True.
277-
OBC_COMPUTED_VORTICITY = False ! [Boolean] default = False
278-
! If true, uses the external values of tangential velocity in the relative
279-
! vorticity on open boundaries. This cannot be true if another OBC_XXX_VORTICITY
280-
! option is True.
281-
OBC_SPECIFIED_VORTICITY = False ! [Boolean] default = False
282-
! If true, uses the external values of tangential velocity in the relative
283-
! vorticity on open boundaries. This cannot be true if another OBC_XXX_VORTICITY
284-
! option is True.
285-
OBC_ZERO_STRAIN = False ! [Boolean] default = False
286-
! If true, sets the strain used in the stress tensor to zero on open boundaries.
287-
OBC_FREESLIP_STRAIN = True ! [Boolean] default = True
288-
! If true, sets the normal gradient of tangential velocity to zero in the strain
289-
! use in the stress tensor on open boundaries. This cannot be true if another
290-
! OBC_XXX_STRAIN option is True.
291-
OBC_COMPUTED_STRAIN = False ! [Boolean] default = False
292-
! If true, sets the normal gradient of tangential velocity to zero in the strain
293-
! use in the stress tensor on open boundaries. This cannot be true if another
294-
! OBC_XXX_STRAIN option is True.
295-
OBC_SPECIFIED_STRAIN = False ! [Boolean] default = False
296-
! If true, sets the normal gradient of tangential velocity to zero in the strain
297-
! use in the stress tensor on open boundaries. This cannot be true if another
298-
! OBC_XXX_STRAIN option is True.
271+
OBC_VORTICITY_CONFIG = "freeslip" ! default = "freeslip"
272+
! Configuration for relative vorticity in momentum advection at open boundaries.
273+
! Options are:
274+
! none - No adjustment.
275+
! zero - Sets relative vorticity to zero.
276+
! freeslip - Sets the normal gradient of tangential velocity to zero.
277+
! computed - Computes the normal gradient of tangential velocity using
278+
! external values of tangential velocity.
279+
! specified - Uses the external values of the normal gradient of
280+
! tangential velocity.
281+
OBC_STRAIN_CONFIG = "freeslip" ! default = "freeslip"
282+
! Configuration for strain in horizontal viscosity at open boundaries. Options
283+
! are:
284+
! none - No adjustment.
285+
! zero - Sets strain to zero.
286+
! freeslip - Sets the normal gradient of tangential velocity to zero.
287+
! computed - Computes the normal gradient of tangential velocity using
288+
! external values of tangential velocity.
289+
! specified - Uses the external values of the normal gradient of
290+
! tangential velocity.
299291
OBC_ZERO_BIHARMONIC = True ! [Boolean] default = False
300292
! If true, zeros the Laplacian of flow on open boundaries in the biharmonic
301293
! viscosity term.
302294
MASK_OUTSIDE_OBCS = False ! [Boolean] default = False
303295
! If true, set the areas outside open boundaries to be land.
304296
RAMP_OBCS = False ! [Boolean] default = False
305-
! If true, ramps from zero to the external values over time, witha ramping
306-
! timescale given by RAMP_TIMESCALE. Ramping SSH only so far
297+
! If true, ramps from zero to the external values over time, with a ramping
298+
! timescale given by RAMP_TIMESCALE. Ramping SSH only so far.
307299
OBC_RAMP_TIMESCALE = 1.0 ! [days] default = 1.0
308300
! If RAMP_OBCS is true, this sets the ramping timescale.
309301
OBC_TIDE_N_CONSTITUENTS = 10 ! default = 0
@@ -313,6 +305,9 @@ EXTERIOR_OBC_BUG = True ! [Boolean] default = True
313305
! contitions interior to the domain are used.
314306
OBC_HOR_INDEXING_BUG = True ! [Boolean] default = True
315307
! If true, recover set of a horizontal indexing bugs in the OBC code.
308+
OBC_TEMP_SALT_NEEDED_BUG = True ! [Boolean] default = True
309+
! If true, recover a bug that OBC temperature and salinity can be ignored even
310+
! if they are registered tracers in the rest of the model.
316311
OBC_SEGMENT_001 = "J=0,I=0:N,FLATHER" !
317312
! Documentation needs to be dynamic?????
318313
OBC_SEGMENT_002 = "J=N,I=N:0,FLATHER" !
@@ -446,7 +441,7 @@ G_EARTH = 9.8 ! [m s-2] default = 9.8
446441
! The gravitational acceleration of the Earth.
447442
RHO_0 = 1035.0 ! [kg m-3] default = 1035.0
448443
! The mean ocean density used with BOUSSINESQ true to calculate accelerations
449-
! and the mass for conservation properties, or with BOUSSINSEQ false to convert
444+
! and the mass for conservation properties, or with BOUSSINESQ false to convert
450445
! some parameters from vertical units of m to kg m-2.
451446
BOUSSINESQ = False ! [Boolean] default = True
452447
! If true, make the Boussinesq approximation.
@@ -726,7 +721,7 @@ RESOLN_SCALED_KH = True ! [Boolean] default = False
726721
! If true, the Laplacian lateral viscosity is scaled away when the first
727722
! baroclinic deformation radius is well resolved.
728723
DEPTH_SCALED_KHTH = False ! [Boolean] default = False
729-
! If true, KHTH is scaled away when the depth is shallowerthan a reference
724+
! If true, KHTH is scaled away when the depth is shallower than a reference
730725
! depth: KHTH = MIN(1,H/H0)**N * KHTH, where H0 is a reference depth, controlled
731726
! via DEPTH_SCALED_KHTH_H0, and the exponent (N) is controlled via
732727
! DEPTH_SCALED_KHTH_EXP.
@@ -738,7 +733,7 @@ RESOLN_SCALED_KHTR = False ! [Boolean] default = False
738733
! baroclinic deformation radius is well resolved.
739734
RESOLN_USE_EBT = False ! [Boolean] default = False
740735
! If true, uses the equivalent barotropic wave speed instead of first baroclinic
741-
! wave for calculating the resolution fn.
736+
! wave for calculating the resolution function.
742737
BACKSCAT_EBT_POWER = 0.0 ! [nondim] default = 0.0
743738
! Power to raise EBT vertical structure to when backscatter has vertical
744739
! structure.
@@ -965,7 +960,7 @@ CALCULATE_SAL = True ! [Boolean] default = True
965960
USE_HA = False ! [Boolean] default = False
966961
! If true, perform inline harmonic analysis.
967962
BE = 0.6 ! [nondim] default = 0.6
968-
! If SPLIT is true, BE determines the relative weighting of a 2nd-order
963+
! If SPLIT is true, BE determines the relative weighting of a 2nd-order
969964
! Runga-Kutta baroclinic time stepping scheme (0.5) and a backward Euler scheme
970965
! (1) that is used for the Coriolis and inertial terms. BE may be from 0.5 to
971966
! 1, but instability may occur near 0.5. BE is also applicable if SPLIT is false
@@ -1323,8 +1318,11 @@ HORVISC_BOUND_COEF = 0.8 ! [nondim] default = 0.8
13231318
! theoretical maximum for stability without considering other terms.
13241319
FRICTWORK_BUG = True ! [Boolean] default = False
13251320
! If true, retain an answer-changing bug in calculating the FrictWork, which
1326-
! cancels the h in thickness flux and the h at velocity point. This isnot
1321+
! cancels the h in thickness flux and the h at velocity point. This is not
13271322
! recommended.
1323+
OBC_SPECIFIED_STRAIN_BUG = True ! [Boolean] default = True
1324+
! If true, recover a bug that specified shear strain option at open boundaries
1325+
! cannot be applied.
13281326

13291327
! === module MOM_vert_friction ===
13301328
DIRECT_STRESS = True ! [Boolean] default = False
@@ -1532,6 +1530,10 @@ INTWAVE_REMAPPING_USE_OM4_SUBCELLS = True ! [Boolean] default = True
15321530
! If true, use the OM4 remapping-via-subcells algorithm for calculating EBT
15331531
! structure. See REMAPPING_USE_OM4_SUBCELLS for details. We recommend setting
15341532
! this option to false.
1533+
ACCURATE_NONBOUS_THICK_CELLO = False ! [Boolean] default = False
1534+
! If true, use the same careful integrals to find the diagnosed non-Boussinesq
1535+
! layer thicknesses as are used to find the free surface height, instead of
1536+
! using an approximate thickness based on division by the mid-layer density.
15351537

15361538
! === module MOM_diabatic_driver ===
15371539
! The following parameters are used for diabatic processes.
@@ -1585,7 +1587,7 @@ USE_NEUTRAL_DIFFUSION = False ! [Boolean] default = False
15851587
! === module MOM_hor_bnd_diffusion ===
15861588
! This module implements horizontal diffusion of tracers near boundaries
15871589
USE_HORIZONTAL_BOUNDARY_DIFFUSION = False ! [Boolean] default = False
1588-
! If true, enables the horizonal boundary tracer's diffusion module.
1590+
! If true, enables the horizontal boundary tracer's diffusion module.
15891591
OBSOLETE_DIAGNOSTIC_IS_FATAL = True ! [Boolean] default = True
15901592
! If an obsolete diagnostic variable appears in the diag_table, cause a FATAL
15911593
! error rather than issue a WARNING.
@@ -1631,7 +1633,7 @@ ENERGYSAVEDAYS_GEOMETRIC = 0.0 ! [days] default = 0.0
16311633

16321634
! === module ocean_stochastics_init ===
16331635
DO_SPPT = False ! [Boolean] default = False
1634-
! If true, then stochastically perturb the thermodynamic tendencies of T,S, amd
1636+
! If true, then stochastically perturb the thermodynamic tendencies of T,S, and
16351637
! h. Amplitude and correlations are controlled by the nam_stoch namelist in the
16361638
! UFS model only.
16371639
DO_SKEB = False ! [Boolean] default = False

‎exps/NWA12.tidesonly/MOM_parameter_doc.short‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -269,7 +269,7 @@ SMAG_BI_CONST = 0.06 ! [nondim] default = 0.0
269269
! The nondimensional biharmonic Smagorinsky constant, typically 0.015 - 0.06.
270270
FRICTWORK_BUG = True ! [Boolean] default = False
271271
! If true, retain an answer-changing bug in calculating the FrictWork, which
272-
! cancels the h in thickness flux and the h at velocity point. This isnot
272+
! cancels the h in thickness flux and the h at velocity point. This is not
273273
! recommended.
274274

275275
! === module MOM_vert_friction ===

‎exps/NWA12.tidesonly/ref/docker-linux-gnu-repro/ocean.stats‎

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -1,8 +1,8 @@
11
Step, Day, Truncs, Energy/Mass, Maximum CFL, Mean sea level, Total Mass, Frac Mass Err
22
[days] [m2 s-2] [Nondim] [m] [kg] [Nondim]
33
0, 0.000, 0, En 1.5092494254117544E-22, CFL 0.00000, SL -3.3409E-10, Mass 8.11438E+19, Me 0.00E+00
4-
12, 0.083, 0, En 1.4064603249932218E-04, CFL 0.07039, SL 1.2228E-01, Mass 8.11465E+19, Me 3.37E-05
5-
30, 0.208, 0, En 2.1074439918370203E-04, CFL 0.05460, SL 1.7971E-01, Mass 8.11478E+19, Me 1.58E-05
6-
42, 0.292, 0, En 2.2870458476936418E-04, CFL 0.11157, SL 9.0051E-02, Mass 8.11458E+19, Me -2.47E-05
7-
60, 0.417, 0, En 4.2397923960871975E-04, CFL 0.09462, SL -8.1320E-02, Mass 8.11420E+19, Me -4.73E-05
8-
72, 0.500, 0, En 4.2475960184297262E-04, CFL 0.11075, SL -8.1583E-02, Mass 8.11420E+19, Me -7.26E-08
4+
12, 0.083, 0, En 3.9834182255687178E-05, CFL 0.04150, SL -5.2157E-02, Mass 8.11426E+19, Me -1.44E-05
5+
30, 0.208, 0, En 1.3680829452031957E-04, CFL 0.11149, SL 7.8741E-02, Mass 8.11456E+19, Me 3.61E-05
6+
42, 0.292, 0, En 2.1273120693558430E-04, CFL 0.22428, SL 1.7739E-01, Mass 8.11478E+19, Me 2.72E-05
7+
60, 0.417, 0, En 2.3324317419697868E-04, CFL 0.07936, SL 1.2945E-01, Mass 8.11467E+19, Me -1.32E-05
8+
72, 0.500, 0, En 2.6186161010510728E-04, CFL 0.09273, SL -4.1470E-03, Mass 8.11437E+19, Me -3.69E-05

‎exps/NWA12.tidesonly/ref/docker-linux-intel-repro/ocean.stats‎

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -1,8 +1,8 @@
11
Step, Day, Truncs, Energy/Mass, Maximum CFL, Mean sea level, Total Mass, Frac Mass Err
22
[days] [m2 s-2] [Nondim] [m] [kg] [Nondim]
33
0, 0.000, 0, En 1.5092494254117544E-22, CFL 0.00000, SL -3.3409E-10, Mass 8.11438E+19, Me 0.00E+00
4-
12, 0.083, 0, En 1.4064603249952431E-04, CFL 0.07039, SL 1.2228E-01, Mass 8.11465E+19, Me 3.37E-05
5-
30, 0.208, 0, En 2.1074440062917064E-04, CFL 0.05460, SL 1.7971E-01, Mass 8.11478E+19, Me 1.58E-05
6-
42, 0.292, 0, En 2.2870458432501452E-04, CFL 0.11157, SL 9.0051E-02, Mass 8.11458E+19, Me -2.47E-05
7-
60, 0.417, 0, En 4.2397924051754935E-04, CFL 0.09462, SL -8.1320E-02, Mass 8.11420E+19, Me -4.73E-05
8-
72, 0.500, 0, En 4.2475960530033571E-04, CFL 0.11075, SL -8.1583E-02, Mass 8.11420E+19, Me -7.26E-08
4+
12, 0.083, 0, En 3.9834182256339820E-05, CFL 0.04150, SL -5.2157E-02, Mass 8.11426E+19, Me -1.44E-05
5+
30, 0.208, 0, En 1.3680829028481556E-04, CFL 0.11149, SL 7.8741E-02, Mass 8.11456E+19, Me 3.61E-05
6+
42, 0.292, 0, En 2.1273119489915567E-04, CFL 0.22428, SL 1.7739E-01, Mass 8.11478E+19, Me 2.72E-05
7+
60, 0.417, 0, En 2.3324317202228520E-04, CFL 0.07936, SL 1.2945E-01, Mass 8.11467E+19, Me -1.32E-05
8+
72, 0.500, 0, En 2.6186160724886855E-04, CFL 0.09273, SL -4.1470E-03, Mass 8.11437E+19, Me -3.69E-05

0 commit comments

Comments
 (0)
⚡