Skip to content

Commit f844faa

Browse files
uwagurauwagura
authored
Merge pull request #252 from NOAA-GFDL/auto/update-submodules-20251217
Auto-update submodules to latest dev/cefi (auto/update-submodules-20251217)
2 parents b304307 + b14522c commit f844faa

3 files changed

Lines changed: 35 additions & 18 deletions

File tree

‎exps/NWA12.tidesonly/MOM_parameter_doc.all‎

Lines changed: 25 additions & 17 deletions
Original file line numberDiff line numberDiff line change
@@ -335,6 +335,12 @@ OBC_TRACER_RESERVOIR_LENGTH_SCALE_OUT = 0.0 ! [m] default = 0.0
335335
OBC_TRACER_RESERVOIR_LENGTH_SCALE_IN = 0.0 ! [m] default = 0.0
336336
! An effective length scale for restoring the tracer concentration at the
337337
! boundaries to values from the interior when the flow is entering the domain.
338+
OBC_THICKNESS_RESERVOIR_LENGTH_SCALE_OUT = 0.0 ! [m] default = 0.0
339+
! An effective length scale for restoring the layer thickness at the boundaries
340+
! to externally imposed values when the flow is exiting the domain.
341+
OBC_THICKNESS_RESERVOIR_LENGTH_SCALE_IN = 0.0 ! [m] default = 0.0
342+
! An effective length scale for restoring the layer thickness at the boundaries
343+
! to values from the interior when the flow is entering the domain.
338344
OBC_REMAPPING_SCHEME = "PLM" ! default = "PLM"
339345
! This sets the reconstruction scheme used for OBC vertical remapping for all
340346
! variables. It can be one of the following schemes:
@@ -774,6 +780,9 @@ MIXING_COEFS_OBC_BUG = True ! [Boolean] default = True
774780
! If false, use only interior data for thickness weighting in lateral mixing
775781
! coefficient calculations and to calculate stratification and other fields at
776782
! open boundary condition faces.
783+
RESOLN_FUNCTION_OBC_BUG = True ! [Boolean] default = True
784+
! If false, use only interior data for calculating the resolution functions at
785+
! open boundary condition faces and vertices.
777786
KD_SMOOTH = 1.0E-06 ! [m2 s-1] default = 1.0E-06
778787
! A diapycnal diffusivity that is used to interpolate more sensible values of T
779788
! & S into thin layers.
@@ -829,6 +838,13 @@ DRAG_AS_BODY_FORCE = False ! [Boolean] default = False
829838
CHANNEL_DRAG = True ! [Boolean] default = False
830839
! If true, the bottom drag is exerted directly on each layer proportional to the
831840
! fraction of the bottom it overlies.
841+
CHANNEL_DRAG_SHELFBREAK_DEPTH = 0.0 ! [m] default = 0.0
842+
! When CHANNEL_DRAG is true, the bathymetric depth interpolated to the vorticity
843+
! point is a combination of the harmonic mean of the adjacent velocity point
844+
! depths below this depth and the arithmetic mean of the depths above it, to
845+
! roughly mimic a continental shelf break profile. Setting this to exceed
846+
! MAXIMUM_DEPTH leads to linear interpolation of the topography between velocity
847+
! points.
832848
LINEAR_DRAG = False ! [Boolean] default = False
833849
! If LINEAR_DRAG and BOTTOMDRAGLAW are defined the drag law is
834850
! cdrag*DRAG_BG_VEL*u.
@@ -843,6 +859,9 @@ HBBL = 10.0 ! [m]
843859
CDRAG = 0.003 ! [nondim] default = 0.003
844860
! CDRAG is the drag coefficient relating the magnitude of the velocity field to
845861
! the bottom stress. CDRAG is only used if BOTTOMDRAGLAW is defined.
862+
CDRAG_MAP = False ! [Boolean] default = False
863+
! If true, apply a spatially varying scaling factor to CDRAG, specified by
864+
! CDRAG_VAR in CDRAG_FILE.
846865
BBL_USE_TIDAL_BG = False ! [Boolean] default = False
847866
! Flag to use the tidal RMS amplitude in place of constant background velocity
848867
! for computing u* in the BBL. This flag is only used when BOTTOMDRAGLAW is true
@@ -940,6 +959,8 @@ TIDES = True ! [Boolean] default = False
940959
! If true, apply tidal momentum forcing.
941960
CALCULATE_SAL = True ! [Boolean] default = True
942961
! If true, calculate self-attraction and loading.
962+
USE_HA = False ! [Boolean] default = False
963+
! If true, perform inline harmonic analysis.
943964
BE = 0.6 ! [nondim] default = 0.6
944965
! If SPLIT is true, BE determines the relative weighting of a 2nd-order
945966
! Runga-Kutta baroclinic time stepping scheme (0.5) and a backward Euler scheme
@@ -1020,6 +1041,9 @@ CONT_PPM_USE_VISC_REM_MAX = True ! [Boolean] default = True
10201041
CONT_PPM_MARGINAL_FACE_AREAS = True ! [Boolean] default = True
10211042
! If true, use the marginal face areas from the continuity solver for use as the
10221043
! weights in the barotropic solver. Otherwise use the transport averaged areas.
1044+
CONT_USE_H_MARG_MIN = False ! [Boolean] default = False
1045+
! If true, the marginal thickness used and returned from continuity is bounded
1046+
! from below by a sub-roundoff value. Otherwise the minimum is 0.
10231047

10241048
! === module MOM_CoriolisAdv ===
10251049
NOSLIP = False ! [Boolean] default = False
@@ -1180,23 +1204,6 @@ TIDE_ADD_NODAL = False ! [Boolean] default = False
11801204
TIDE_NODAL_REF_DATE = 0, 0, 0 ! default = 0, 0, 0
11811205
! Fixed reference date to use for nodal modulation of astronomical tidal
11821206
! forcing.
1183-
HA_START_TIME = 0.0 ! [days] default = 0.0
1184-
! Start time of harmonic analysis, in units of days after the start of the
1185-
! current run segment. Must be smaller than HA_END_TIME, otherwise harmonic
1186-
! analysis will not be performed. If negative, |HA_START_TIME| determines the
1187-
! length of harmonic analysis, and harmonic analysis will start |HA_START_TIME|
1188-
! days before HA_END_TIME, or at the beginning of the run segment, whichever
1189-
! occurs later.
1190-
HA_END_TIME = 0.0 ! [days] default = 0.0
1191-
! End time of harmonic analysis, in units of days after the start of the current
1192-
! run segment. Must be positive and smaller than the length of the currnet run
1193-
! segment, otherwise harmonic analysis will not be performed.
1194-
HA_SSH = False ! [Boolean] default = False
1195-
! If true, perform harmonic analysis of sea serface height.
1196-
HA_UBT = False ! [Boolean] default = False
1197-
! If true, perform harmonic analysis of zonal barotropic velocity.
1198-
HA_VBT = False ! [Boolean] default = False
1199-
! If true, perform harmonic analysis of meridional barotropic velocity.
12001207

12011208
! === module MOM_PressureForce ===
12021209
ANALYTIC_FV_PGF = True ! [Boolean] default = True
@@ -1245,6 +1252,7 @@ PRESSURE_RECONSTRUCTION_SCHEME = 1 ! default = 1
12451252
! 0: PCM or no reconstruction.
12461253
! 1: PLM reconstruction.
12471254
! 2: PPM reconstruction.
1255+
! 3: PLM with least squares slope.
12481256
BOUNDARY_EXTRAPOLATION_PRESSURE = True ! [Boolean] default = True
12491257
! If true, the reconstruction of T & S for pressure in boundary cells is
12501258
! extrapolated, rather than using PCM in these cells. If true, the same order

‎exps/OM4.single_column.COBALT/MOM_parameter_doc.all‎

Lines changed: 9 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -849,6 +849,9 @@ HBBL = 10.0 ! [m]
849849
CDRAG = 0.003 ! [nondim] default = 0.003
850850
! CDRAG is the drag coefficient relating the magnitude of the velocity field to
851851
! the bottom stress. CDRAG is only used if BOTTOMDRAGLAW is defined.
852+
CDRAG_MAP = False ! [Boolean] default = False
853+
! If true, apply a spatially varying scaling factor to CDRAG, specified by
854+
! CDRAG_VAR in CDRAG_FILE.
852855
BBL_USE_TIDAL_BG = False ! [Boolean] default = False
853856
! Flag to use the tidal RMS amplitude in place of constant background velocity
854857
! for computing u* in the BBL. This flag is only used when BOTTOMDRAGLAW is true
@@ -941,6 +944,8 @@ TIDES = False ! [Boolean] default = False
941944
! If true, apply tidal momentum forcing.
942945
CALCULATE_SAL = False ! [Boolean] default = False
943946
! If true, calculate self-attraction and loading.
947+
USE_HA = False ! [Boolean] default = False
948+
! If true, perform inline harmonic analysis.
944949
BE = 0.6 ! [nondim] default = 0.6
945950
! If SPLIT is true, BE determines the relative weighting of a 2nd-order
946951
! Runga-Kutta baroclinic time stepping scheme (0.5) and a backward Euler scheme
@@ -1021,6 +1026,9 @@ CONT_PPM_USE_VISC_REM_MAX = True ! [Boolean] default = True
10211026
CONT_PPM_MARGINAL_FACE_AREAS = True ! [Boolean] default = True
10221027
! If true, use the marginal face areas from the continuity solver for use as the
10231028
! weights in the barotropic solver. Otherwise use the transport averaged areas.
1029+
CONT_USE_H_MARG_MIN = False ! [Boolean] default = False
1030+
! If true, the marginal thickness used and returned from continuity is bounded
1031+
! from below by a sub-roundoff value. Otherwise the minimum is 0.
10241032

10251033
! === module MOM_CoriolisAdv ===
10261034
NOSLIP = False ! [Boolean] default = False
@@ -1111,6 +1119,7 @@ PRESSURE_RECONSTRUCTION_SCHEME = 1 ! default = 1
11111119
! 0: PCM or no reconstruction.
11121120
! 1: PLM reconstruction.
11131121
! 2: PPM reconstruction.
1122+
! 3: PLM with least squares slope.
11141123
BOUNDARY_EXTRAPOLATION_PRESSURE = True ! [Boolean] default = True
11151124
! If true, the reconstruction of T & S for pressure in boundary cells is
11161125
! extrapolated, rather than using PCM in these cells. If true, the same order

‎src/MOM6‎

Submodule MOM6 updated 102 files

0 commit comments

Comments
 (0)
⚡