Skip to content

Commit b8bbae6

Browse files
minghangli-unianton-seaicedougiesquire
authored
Cherry-pick 0.4.0 release related changes into 0.25deg ryf configuration (#169)
* License file * Update incorrect note in MOM_override See https://github.com/COSIMA/access-om3/issues/251 Co-authored-by: minghangli-uni <[email protected]> * Add non-default from MOM_parameter_doc.layout in the middle reorder MOM_input to follow MOM_parameter_doc.short Put non-default values from MOM_parameter_doc.debugging at the top Co-authored-by: Dougie Squire <[email protected]> * Add WIND_STAGGER to MOM_INPUT for clarity This only affects the logging, the actual value is hardcoded through a #ifdef CESMCOUPLED * Change atm and ice mesh from 1deg -> 025deg Change ice_ntasks to be 96 Remove unused components payu-org/payu#496 Removed some checks in Payu which required unused components to be present in the nuopc.runconfig file. Co-authored-by: Dougie Squire <[email protected]> * Update to ACCESS-NRI/ACCESS-OM3 deployment 25.01.0 * Update field dictionary with latest from CMEPS * add_gusts parameter needed for 0.4.0 build * Update nuopc.runconfig to turn-off dates in restart_pointers * Turn on netcdf4 per https://github.com/COSIMA/access-om3/issues/81 The new build uses openmpi4.1.7, which fixes some bugs preventing parallel reads over symlinks. This allows use of parallelio netcdf4 option, even though at this resolution for most components we will still only use one PE for IO. * Use .d and .m in CICE history output filenames Per https://github.com/COSIMA/access-om3/issues/201 * Turn off extra cice restarts and remove non functioning write_restart_at_endofrun per https://github.com/COSIMA/access-om3/issues/175 * Set Earth radius the same as the UM * Update MOM6 parameters and docs See https://github.com/COSIMA/access-om3/issues/274 --------- Co-authored-by: anton-seaice <[email protected]> Co-authored-by: Dougie Squire <[email protected]> Co-authored-by: Anton Steketee <[email protected]> Co-authored-by: dougiesquire <[email protected]>
1 parent 90a3e99 commit b8bbae6

12 files changed

+1287
-757
lines changed

LICENSE

+396
Large diffs are not rendered by default.

MOM_input

+91-48
Large diffs are not rendered by default.

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-2
Original file line numberDiff line numberDiff line change
@@ -46,7 +46,7 @@ modules:
4646
use:
4747
- /g/data/vk83/modules
4848
load:
49-
- access-om3/2024.09.0
49+
- access-om3/2025.01.0
5050
- nco/5.0.5
5151

52-
payu_minimum_version: 1.1.4
52+
payu_minimum_version: 1.1.6

docs/MOM_parameter_doc.all

+195-193
Large diffs are not rendered by default.

docs/MOM_parameter_doc.debugging

+3
Original file line numberDiff line numberDiff line change
@@ -77,6 +77,9 @@ DEBUG_BT = False ! [Boolean] default = False
7777
! The following parameters are used for diabatic processes.
7878
DEBUG_CONSERVATION = False ! [Boolean] default = False
7979
! If true, monitor conservation and extrema.
80+
WRITE_TRACER_MIN_MAX = False ! [Boolean] default = False
81+
! If true, write the maximum and minimum values of temperature, salinity and
82+
! some tracer concentrations to stdout when the energy files are written.
8083

8184
! === module MOM_file_parser ===
8285
REPORT_UNUSED_PARAMS = True ! [Boolean] default = True

docs/MOM_parameter_doc.layout

+6-6
Original file line numberDiff line numberDiff line change
@@ -7,7 +7,7 @@ GLOBAL_INDEXING = False ! [Boolean] default = False
77
! static memory.
88

99
! === module MOM_domains ===
10-
!SYMMETRIC_MEMORY_ = False ! [Boolean]
10+
!SYMMETRIC_MEMORY_ = True ! [Boolean]
1111
! If defined, the velocity point data domain includes every face of the
1212
! thickness points. In other words, some arrays are larger than others,
1313
! depending on where they are on the staggered grid. Also, the starting index
@@ -25,7 +25,7 @@ THIN_HALO_UPDATES = True ! [Boolean] default = True
2525
! the PE count to be changed at run time. This can only be set at compile time.
2626
AUTO_MASKTABLE = True ! [Boolean] default = False
2727
! Turn on automatic mask table generation to eliminate land blocks.
28-
MASKTABLE = "MOM_auto_mask_table" ! default = "MOM_mask_table"
28+
MASKTABLE = "MOM_auto_mask_table" ! default = "MOM_mask_table"
2929
! A text file to specify n_mask, layout and mask_list. This feature masks out
3030
! processors that contain only land points. The first line of mask_table is the
3131
! number of regions to be masked out. The second line is the layout of the model
@@ -38,19 +38,19 @@ MASKTABLE = "MOM_auto_mask_table" ! default = "MOM_mask_table"
3838
! 4,6
3939
! 1,2
4040
! 3,6
41-
NIPROC = 36 !
41+
NIPROC = 31 !
4242
! The number of processors in the x-direction. With STATIC_MEMORY_ this is set
4343
! in MOM_memory.h at compile time.
44-
NJPROC = 30 !
44+
NJPROC = 56 !
4545
! The number of processors in the y-direction. With STATIC_MEMORY_ this is set
4646
! in MOM_memory.h at compile time.
47-
LAYOUT = 36, 30 !
47+
LAYOUT = 31, 56 !
4848
! The processor layout that was actually used.
4949
AUTO_IO_LAYOUT_FAC = 0 ! default = 0
5050
! When AUTO_MASKTABLE is enabled, io layout is calculated by performing integer
5151
! division of the runtime-determined domain layout with this factor. If the
5252
! factor is set to 0 (default), the io layout is set to 1,1.
53-
IO_LAYOUT = 1, 1 ! default = 1
53+
IO_LAYOUT = 1, 1 !
5454
! The processor layout to be used, or 0,0 to automatically set the io_layout to
5555
! be the same as the layout.
5656

docs/MOM_parameter_doc.short

+64-28
Large diffs are not rendered by default.

0 commit comments

Comments
 (0)