Skip to content

Commit 99ecf8b

Browse files
authored
Merge pull request #259 from NOAA-GFDL/auto/update-submodules-20260309
Auto-update submodules to latest dev/cefi (auto/update-submodules-20260309)
2 parents 288f7e8 + ca92d21 commit 99ecf8b

6 files changed

Lines changed: 22 additions & 18 deletions

File tree

exps/NWA12.tidesonly/MOM_parameter_doc.all

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -198,10 +198,6 @@ NJHALO = 4 ! default = 4
198198
REFERENCE_HEIGHT = 0.0 ! [m] default = 0.0
199199
! A reference value for geometric height fields, such as bathyT.
200200

201-
! === module MOM_fixed_initialization ===
202-
INPUTDIR = "INPUT" ! default = "."
203-
! The directory in which input files are found.
204-
205201
! === module MOM_grid_init ===
206202
GRID_CONFIG = "mosaic" !
207203
! A character string that determines the method for defining the horizontal
@@ -416,6 +412,8 @@ OBC_PROJECTION_BUG = True ! [Boolean] default = True
416412
! like the potential vorticity used in the barotropic solver relies on
417413
! bathymetry or other fields being projected outward across OBCs. This option
418414
! changes answers for some configurations that use OBCs.
415+
416+
! === module MOM_fixed_initialization ===
419417
CHANNEL_CONFIG = "none" ! default = "none"
420418
! A parameter that determines which set of channels are
421419
! restricted to specific widths. Options are:
@@ -578,6 +576,8 @@ LIGHTEST_DENSITY = 1035.0 ! [kg m-3] default = 1035.0
578576
! The reference potential density used for layer 1.
579577

580578
! === module MOM_state_initialization ===
579+
INPUTDIR = "INPUT" ! default = "."
580+
! The directory in which input files are found.
581581
FATAL_INCONSISTENT_RESTART_TIME = False ! [Boolean] default = False
582582
! If true and a time_in value is provided to MOM_initialize_state, verify that
583583
! the time read from a restart file is the same as time_in, and issue a fatal

exps/NWA12.tidesonly/MOM_parameter_doc.short

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -37,10 +37,6 @@ NJGLOBAL = 845 !
3737
! The total number of thickness grid points in the y-direction in the physical
3838
! domain. With STATIC_MEMORY_ this is set in MOM_memory.h at compile time.
3939

40-
! === module MOM_fixed_initialization ===
41-
INPUTDIR = "INPUT" ! default = "."
42-
! The directory in which input files are found.
43-
4440
! === module MOM_grid_init ===
4541
GRID_CONFIG = "mosaic" !
4642
! A character string that determines the method for defining the horizontal
@@ -113,6 +109,8 @@ BRUSHCUTTER_MODE = True ! [Boolean] default = False
113109
OBC_TIDE_CONSTITUENTS = "M2,S2,N2,K2,K1,O1,P1,Q1,MM,MF" !
114110
! Names of tidal constituents being added to the open boundaries.
115111

112+
! === module MOM_fixed_initialization ===
113+
116114
! === module MOM_verticalGrid ===
117115
! Parameters providing information about the vertical grid.
118116
BOUSSINESQ = False ! [Boolean] default = True
@@ -153,6 +151,8 @@ GINT = 0.0164 ! [m s-2]
153151
! The reduced gravity across internal interfaces.
154152

155153
! === module MOM_state_initialization ===
154+
INPUTDIR = "INPUT" ! default = "."
155+
! The directory in which input files are found.
156156

157157
! === module MOM_diag_mediator ===
158158

exps/OM4.single_column.COBALT/MOM_parameter_doc.all

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -237,10 +237,6 @@ NJHALO = 3 ! default = 4
237237
REFERENCE_HEIGHT = 0.0 ! [m] default = 0.0
238238
! A reference value for geometric height fields, such as bathyT.
239239

240-
! === module MOM_fixed_initialization ===
241-
INPUTDIR = "INPUT" ! default = "."
242-
! The directory in which input files are found.
243-
244240
! === module MOM_grid_init ===
245241
GRID_CONFIG = "mosaic" !
246242
! A character string that determines the method for defining the horizontal
@@ -311,6 +307,8 @@ MAXIMUM_DEPTH = 6500.0 ! [m]
311307
! if any.
312308
OBC_NUMBER_OF_SEGMENTS = 0 ! default = 0
313309
! The number of open boundary segments.
310+
311+
! === module MOM_fixed_initialization ===
314312
CHANNEL_CONFIG = "none" ! default = "none"
315313
! A parameter that determines which set of channels are
316314
! restricted to specific widths. Options are:
@@ -619,6 +617,8 @@ REMAP_VEL_CONSERVE_KE = False ! [Boolean] default = False
619617
! (CS%BBL_h_vel_mask > 0.0) .and. (CS%h_vel_mask > 0.0)
620618

621619
! === module MOM_state_initialization ===
620+
INPUTDIR = "INPUT" ! default = "."
621+
! The directory in which input files are found.
622622
FATAL_INCONSISTENT_RESTART_TIME = False ! [Boolean] default = False
623623
! If true and a time_in value is provided to MOM_initialize_state, verify that
624624
! the time read from a restart file is the same as time_in, and issue a fatal

exps/OM4.single_column.COBALT/MOM_parameter_doc.short

Lines changed: 8 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -54,10 +54,6 @@ NJHALO = 3 ! default = 4
5454
! The number of halo points on each side in the y-direction. How this is set
5555
! varies with the calling component and static or dynamic memory configuration.
5656

57-
! === module MOM_fixed_initialization ===
58-
INPUTDIR = "INPUT" ! default = "."
59-
! The directory in which input files are found.
60-
6157
! === module MOM_grid_init ===
6258
GRID_CONFIG = "mosaic" !
6359
! A character string that determines the method for defining the horizontal
@@ -108,6 +104,12 @@ MASKING_DEPTH = 0.0 ! [m] default = -9999.0
108104
! zeroed out. MASKING_DEPTH is ignored if it has the special default value.
109105
MAXIMUM_DEPTH = 6500.0 ! [m]
110106
! The maximum depth of the ocean.
107+
108+
! === module MOM_open_boundary ===
109+
! Controls where open boundaries are located, what kind of boundary condition to impose, and what data to apply,
110+
! if any.
111+
112+
! === module MOM_fixed_initialization ===
111113
ROTATION = "betaplane" ! default = "2omegasinlat"
112114
! This specifies how the Coriolis parameter is specified:
113115
! 2omegasinlat - Use twice the planetary rotation rate
@@ -210,6 +212,8 @@ REMAPPING_SCHEME = "PPM_H4" ! default = "PLM"
210212
! PQM_IH6IH5 (5th-order accurate)
211213

212214
! === module MOM_state_initialization ===
215+
INPUTDIR = "INPUT" ! default = "."
216+
! The directory in which input files are found.
213217

214218
! === module MOM_diag_mediator ===
215219
NUM_DIAG_COORDS = 2 ! default = 1

src/MOM6

Submodule MOM6 updated 52 files

0 commit comments

Comments
 (0)