Skip to content

Commit 4dbb6b8

Browse files
anton-seaiceanton-seaice
authored
Merge pull request #161 from ACCESS-NRI/dev-1deg_jra55do_ryf-iss209
Changes related to 0.4.0 build release and general improvements
2 parents 3f930d5 + 1566f53 commit 4dbb6b8

9 files changed

+962
-509
lines changed

‎LICENSE

+396
Large diffs are not rendered by default.

‎MOM_input

+33-20
Original file line numberDiff line numberDiff line change
@@ -1,3 +1,22 @@
1+
! The top section contains non default debugging parameters which are set.
2+
3+
! === module MOM_vert_friction ===
4+
U_TRUNC_FILE = "U_velocity_truncations" ! default = ""
5+
! The absolute path to a file into which the accelerations leading to zonal
6+
! velocity truncations are written. Undefine this for efficiency if this
7+
! diagnostic is not needed.
8+
V_TRUNC_FILE = "V_velocity_truncations" ! default = ""
9+
! The absolute path to a file into which the accelerations leading to meridional
10+
! velocity truncations are written. Undefine this for efficiency if this
11+
! diagnostic is not needed.
12+
13+
! === module MOM_file_parser ===
14+
FATAL_UNUSED_PARAMS = True ! [Boolean] default = False
15+
! If true, kill the run if there are any unused parameters.
16+
17+
18+
! Below this line is formatted the same as the MOM_parameter_short.doc output file
19+
! ------------------------
120
! This file was written by the model and records the non-default parameters used at run-time.
221

322
! === module MOM ===
@@ -85,6 +104,8 @@ GRID_CONFIG = "mosaic" !
85104
! mercator - use a Mercator spherical grid.
86105
GRID_FILE = "ocean_hgrid.nc" !
87106
! Name of the file from which to read horizontal grid data.
107+
RAD_EARTH = 6.371229E+06 ! [m] default = 6.378E+06
108+
! The radius of the Earth.
88109
TOPO_CONFIG = "file" !
89110
! This specifies how bathymetry is specified:
90111
! file - read bathymetric information from the file
@@ -130,12 +151,6 @@ DTFREEZE_DP = -7.75E-08 ! [deg C Pa-1] default = 0.0
130151
! When TFREEZE_FORM=LINEAR, this is the derivative of the freezing potential
131152
! temperature with pressure.
132153

133-
EPS_OMESH = 1e-13
134-
! "default = 0.0001
135-
! An float which sets the allowable error (in degrees) between
136-
! grid angle defined in the ESMF mesh file used by CMEPS
137-
! and the ocean_hgrid file used by mom
138-
139154
! === module MOM_tracer_flow_control ===
140155
USE_IDEAL_AGE_TRACER = True ! [Boolean] default = False
141156
! If true, use the ideal_age_example tracer package.
@@ -152,7 +167,6 @@ REGRIDDING_COORDINATE_MODE = "ZSTAR" ! default = "LAYER"
152167
! RHO - continuous isopycnal
153168
! HYCOM1 - HyCOM-like hybrid coordinate
154169
! HYBGEN - Hybrid coordinate from the Hycom hybgen code
155-
! SLIGHT - stretched coordinates above continuous isopycnal
156170
! ADAPTIVE - optimize for smooth neutral density surfaces
157171
ALE_COORDINATE_CONFIG = "FILE:ocean_vgrid.nc,interfaces=zeta" ! default = "UNIFORM"
158172
! Determines how to specify the coordinate resolution. Valid options are:
@@ -171,8 +185,8 @@ ALE_COORDINATE_CONFIG = "FILE:ocean_vgrid.nc,interfaces=zeta" ! default = "UNIFO
171185
!ALE_RESOLUTION = 2.303499698638916, 2.6903486251831055, 3.1421399116516113, 3.6697616577148438, 4.285917282104492, 5.005424499511719, 5.845563888549805, 6.826459884643555, 7.971549987792969, 9.308074951171875, 10.867660522460938, 12.686931610107422, 14.808158874511719, 17.279945373535156, 20.157821655273438, 23.504684448242188, 27.390975952148438, 31.894271850585938, 37.097900390625, 43.088226318359375, 49.94970703125, 57.757049560546875, 66.56375122070312, 76.386962890625, 87.18865966796875, 98.85760498046875, 111.1953125, 123.914794921875, 136.6578369140625, 149.03271484375, 160.6646728515625, 171.2481689453125, 180.5816650390625, 188.5797119140625, 195.2608642578125, 200.720703125, 205.10205078125, 208.565185546875, 211.2705078125, 213.363525390625, 214.97119140625, 216.198974609375, 217.13232421875, 217.83984375, 218.37451171875, 218.7783203125, 219.08203125, 219.310546875, 219.482421875, 219.6123046875 ! [m]
172186
REMAPPING_SCHEME = "PPM_H4" ! default = "PLM"
173187
! This sets the reconstruction scheme used for vertical remapping for all
174-
! variables. It can be one of the following schemes: PCM (1st-order
175-
! accurate)
188+
! variables. It can be one of the following schemes:
189+
! PCM (1st-order accurate)
176190
! PLM (2nd-order accurate)
177191
! PLM_HYBGEN (2nd-order accurate)
178192
! PPM_H4 (3rd-order accurate)
@@ -374,6 +388,8 @@ MASS_WEIGHT_IN_PRESSURE_GRADIENT = True ! [Boolean] default = False
374388
! If true, use mass weighting when interpolating T/S for integrals near the
375389
! bathymetry in FV pressure gradient calculations.
376390

391+
! === module MOM_Zanna_Bolton ===
392+
377393
! === module MOM_hor_visc ===
378394
LAPLACIAN = True ! [Boolean] default = False
379395
! If true, use a Laplacian horizontal viscosity.
@@ -394,14 +410,6 @@ MAXVEL = 6.0 ! [m s-1] default = 3.0E+08
394410
CFL_TRUNCATE_RAMP_TIME = 7200.0 ! [s] default = 0.0
395411
! The time over which the CFL truncation value is ramped up at the beginning of
396412
! the run.
397-
U_TRUNC_FILE = "U_velocity_truncations" ! default = ""
398-
! The absolute path to a file into which the accelerations leading to zonal
399-
! velocity truncations are written. Undefine this for efficiency if this
400-
! diagnostic is not needed.
401-
V_TRUNC_FILE = "V_velocity_truncations" ! default = ""
402-
! The absolute path to a file into which the accelerations leading to meridional
403-
! velocity truncations are written. Undefine this for efficiency if this
404-
! diagnostic is not needed.
405413

406414
! === module MOM_barotropic ===
407415
BOUND_BT_CORRECTION = True ! [Boolean] default = False
@@ -431,6 +439,8 @@ MIXEDLAYER_RESTRAT = True ! [Boolean] default = False
431439
! If true, a density-gradient dependent re-stratifying flow is imposed in the
432440
! mixed layer. Can be used in ALE mode without restriction but in layer mode can
433441
! only be used if BULKMIXEDLAYER is true.
442+
MLE%
443+
%MLE
434444
FOX_KEMPER_ML_RESTRAT_COEF = 1.0 ! [nondim] default = 0.0
435445
! A nondimensional coefficient that is proportional to the ratio of the
436446
! deformation radius to the dominant lengthscale of the submesoscale mixed layer
@@ -595,6 +605,9 @@ OCEAN_SURFACE_STAGGER = "A" ! default = "C"
595605
! A case-insensitive character string to indicate the staggering of the surface
596606
! velocity field that is returned to the coupler. Valid values include 'A',
597607
! 'B', or 'C'.
608+
EPS_OMESH = 1.0E-13 ! [degrees] default = 1.0E-04
609+
! Maximum allowable difference between ESMF mesh and MOM6 domain coordinates in
610+
! nuopc cap.
598611
RESTORE_SALINITY = True ! [Boolean] default = False
599612
! If true, the coupled driver will add a globally-balanced fresh-water flux that
600613
! drives sea-surface salinity toward specified values.
@@ -607,6 +620,9 @@ LATENT_HEAT_VAPORIZATION = 2.501E+06 ! [J/kg] default = 2.5E+06
607620
ADJUST_NET_FRESH_WATER_TO_ZERO = True ! [Boolean] default = False
608621
! If true, adjusts the net fresh-water forcing seen by the ocean (including
609622
! restoring) to zero.
623+
WIND_STAGGER = "A" ! default = "C"
624+
! A case-insensitive character string to indicate the staggering of the input
625+
! wind stress field. Valid values are 'A', 'B', or 'C'.
610626
ENTHALPY_FROM_COUPLER = True ! [Boolean] default = False
611627
! If True, the heat (enthalpy) associated with mass entering/leaving the ocean
612628
! is provided via coupler.
@@ -621,6 +637,3 @@ SRESTORE_AS_SFLUX = True ! [Boolean] default = False
621637
GUST_CONST = 0.02 ! [Pa] default = 0.0
622638
! The background gustiness in the winds.
623639

624-
! === module MOM_file_parser ===
625-
FATAL_UNUSED_PARAMS = True ! [Boolean] default = False
626-
! If true, kill the run if there are any unused parameters.

‎MOM_override

+2-5
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,2 @@
1-
! WARNING: DO NOT EDIT this file! Any user change made in this file will be
2-
! overriden. This file is automatically generated. MOM6 parameter
3-
! changes may be made via SourceMods or user_nl_mom.
4-
!-------------------------------------------------------------------------
5-
1+
! NOTE: User made changes to this file override the settings in MOM_input
2+
! This provides a clear record of how your configuration differs from the standard

‎config.yaml

+2-3
Original file line numberDiff line numberDiff line change
@@ -29,7 +29,6 @@ input:
2929
- /g/data/vk83/configurations/inputs/access-om3/mom/grids/vertical/global.1deg/2023.07.28/ocean_vgrid.nc
3030
- /g/data/vk83/configurations/inputs/access-om3/mom/initial_conditions/global.1deg/2020.10.22/ocean_temp_salt.res.nc
3131
- /g/data/vk83/configurations/inputs/access-om3/mom/surface_salt_restoring/global.1deg/2020.05.30/salt_sfc_restore.nc
32-
- /g/data/vk83/configurations/inputs/access-om3/cice/grids/global.1deg/2024.05.14/grid.nc
3332
- /g/data/vk83/configurations/inputs/access-om3/cice/grids/global.1deg/2024.05.14/kmt.nc
3433
- /g/data/vk83/configurations/inputs/access-om3/cice/initial_conditions/global.1deg/2023.07.28/iced.1900-01-01-10800.nc
3534
- /g/data/vk83/configurations/inputs/JRA-55/RYF/v1-4/data
@@ -47,7 +46,7 @@ modules:
4746
use:
4847
- /g/data/vk83/modules
4948
load:
50-
- access-om3/2024.09.0
49+
- access-om3/2025.01.0
5150
- nco/5.0.5
5251

53-
payu_minimum_version: 1.1.4
52+
payu_minimum_version: 1.1.6

0 commit comments

Comments
 (0)