Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

025deg jra55do ryf.cherrypicks #103

Merged
merged 5 commits into from
Aug 23, 2024
Merged

025deg jra55do ryf.cherrypicks #103

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
5 commits
Select commit Hold shift + click to select a range
1b16de5
Update exe (https://github.com/COSIMA/access-om3/issues/188), use env…
dougiesquire Aug 2, 2024
c21f761
Use netcdf4 for MOM6 (https://github.com/COSIMA/access-om3/issues/188)
dougiesquire Jul 29, 2024
d066f74
Use Payu userscripts from om3-scripts (https://github.com/COSIMA/acce…
dougiesquire Aug 2, 2024
69f4a22
Update input directory name from "input" to "INPUT" (https://github.c…
dougiesquire Aug 2, 2024
883e870
Set hist_suffix for cice history output. This can only be one charact…
anton-seaice Aug 9, 2024
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 1 addition & 1 deletion MOM_input
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -71,7 +71,7 @@ NJGLOBAL = 1080 !
! domain. With STATIC_MEMORY_ this is set in MOM_memory.h at compile time.

! === module MOM_fixed_initialization ===
INPUTDIR = "./input/" ! default = "."
INPUTDIR = "./INPUT/" ! default = "."
! The directory in which input files are found.

! === module MOM_grid_init ===
Expand Down
2 changes: 1 addition & 1 deletion README.md
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -14,4 +14,4 @@ information.

## Requirements

This configuration requires payu v1.0.29 or greater to run correctly.
This configuration requires [Payu](https://github.com/payu-org/payu) > v1.1.3 to run.
12 changes: 0 additions & 12 deletions archive_cice_restarts.sh
View file
Open in desktop

This file was deleted.

14 changes: 11 additions & 3 deletions config.yaml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -18,7 +18,7 @@ jobname: 025deg_jra55do_ryf

model: access-om3

exe: /g/data/ik11/spack/0.21.2/opt/linux-rocky8-cascadelake/intel-2021.10.0/access-om3-69f719964a27e23deae3923d60af01a081cc3fc0_main-fkzzqnp/bin/access-om3-MOM6-CICE6
exe: access-om3-MOM6-CICE6
input:
- /g/data/vk83/experiments/inputs/access-om3/share/meshes/global.025deg/2024.03.26/access-om2-025deg-ESMFmesh.nc
- /g/data/vk83/experiments/inputs/access-om3/share/meshes/global.025deg/2024.03.26/access-om2-025deg-nomask-ESMFmesh.nc
Expand All @@ -38,5 +38,13 @@ metadata:
enable: false

userscripts:
setup: ./setup_cice_restarts.sh
archive: ./archive_cice_restarts.sh
setup: /usr/bin/bash /g/data/vk83/apps/om3-scripts/payu_config/setup.sh
archive: /usr/bin/bash /g/data/vk83/apps/om3-scripts/payu_config/archive.sh

modules:
use:
- /g/data/ik11/spack/0.21.2/modules/access-om3/0.x.0/linux-rocky8-cascadelake
- /g/data/hh5/public/modules
load:
- access-om3/63ed4a4777aeac0c62720ddbe7f85e4ed16f82eb_main
- conda/analysis3-24.01
36 changes: 18 additions & 18 deletions datm.streams.xml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -11,10 +11,10 @@
<year_last>1900</year_last>
<year_align>1900</year_align>
<vectors>null</vectors>
<meshfile>./input/JRA55do-ESMFmesh.nc</meshfile>
<meshfile>./INPUT/JRA55do-ESMFmesh.nc</meshfile>
<lev_dimname>null</lev_dimname>
<datafiles>
<file>./input/RYF.prsn.1990_1991.nc</file>
<file>./INPUT/RYF.prsn.1990_1991.nc</file>
</datafiles>
<datavars>
<var>prsn Faxa_prsn</var>
Expand All @@ -32,10 +32,10 @@
<year_last>1900</year_last>
<year_align>1900</year_align>
<vectors>null</vectors>
<meshfile>./input/JRA55do-ESMFmesh.nc</meshfile>
<meshfile>./INPUT/JRA55do-ESMFmesh.nc</meshfile>
<lev_dimname>null</lev_dimname>
<datafiles>
<file>./input/RYF.prra.1990_1991.nc</file>
<file>./INPUT/RYF.prra.1990_1991.nc</file>
</datafiles>
<datavars>
<var>prra Faxa_prrn</var>
Expand All @@ -53,10 +53,10 @@
<year_last>1900</year_last>
<year_align>1900</year_align>
<vectors>null</vectors>
<meshfile>./input/JRA55do-ESMFmesh.nc</meshfile>
<meshfile>./INPUT/JRA55do-ESMFmesh.nc</meshfile>
<lev_dimname>null</lev_dimname>
<datafiles>
<file>./input/RYF.rlds.1990_1991.nc</file>
<file>./INPUT/RYF.rlds.1990_1991.nc</file>
</datafiles>
<datavars>
<var>rlds Faxa_lwdn</var>
Expand All @@ -75,10 +75,10 @@
<year_last>1900</year_last>
<year_align>1900</year_align>
<vectors>null</vectors>
<meshfile>./input/JRA55do-ESMFmesh.nc</meshfile>
<meshfile>./INPUT/JRA55do-ESMFmesh.nc</meshfile>
<lev_dimname>null</lev_dimname>
<datafiles>
<file>./input/RYF.rsds.1990_1991.nc</file>
<file>./INPUT/RYF.rsds.1990_1991.nc</file>
</datafiles>
<datavars>
<var>rsds Faxa_swdn</var>
Expand All @@ -97,10 +97,10 @@
<year_last>1900</year_last>
<year_align>1900</year_align>
<vectors>null</vectors>
<meshfile>./input/JRA55do-ESMFmesh.nc</meshfile>
<meshfile>./INPUT/JRA55do-ESMFmesh.nc</meshfile>
<lev_dimname>null</lev_dimname>
<datafiles>
<file>./input/RYF.huss.1990_1991.nc</file>
<file>./INPUT/RYF.huss.1990_1991.nc</file>
</datafiles>
<datavars>
<var>huss Sa_shum</var>
Expand All @@ -119,10 +119,10 @@
<year_last>1900</year_last>
<year_align>1900</year_align>
<vectors>null</vectors>
<meshfile>./input/JRA55do-ESMFmesh.nc</meshfile>
<meshfile>./INPUT/JRA55do-ESMFmesh.nc</meshfile>
<lev_dimname>null</lev_dimname>
<datafiles>
<file>./input/RYF.psl.1990_1991.nc</file>
<file>./INPUT/RYF.psl.1990_1991.nc</file>
</datafiles>
<datavars>
<var>psl Sa_pslv</var>
Expand All @@ -141,10 +141,10 @@
<year_last>1900</year_last>
<year_align>1900</year_align>
<vectors>null</vectors>
<meshfile>./input/JRA55do-ESMFmesh.nc</meshfile>
<meshfile>./INPUT/JRA55do-ESMFmesh.nc</meshfile>
<lev_dimname>null</lev_dimname>
<datafiles>
<file>./input/RYF.tas.1990_1991.nc</file>
<file>./INPUT/RYF.tas.1990_1991.nc</file>
</datafiles>
<datavars>
<var>tas Sa_tbot</var>
Expand All @@ -163,10 +163,10 @@
<year_last>1900</year_last>
<year_align>1900</year_align>
<vectors>null</vectors>
<meshfile>./input/JRA55do-ESMFmesh.nc</meshfile>
<meshfile>./INPUT/JRA55do-ESMFmesh.nc</meshfile>
<lev_dimname>null</lev_dimname>
<datafiles>
<file>./input/RYF.uas.1990_1991.nc</file>
<file>./INPUT/RYF.uas.1990_1991.nc</file>
</datafiles>
<datavars>
<var>uas Sa_u</var>
Expand All @@ -185,10 +185,10 @@
<year_last>1900</year_last>
<year_align>1900</year_align>
<vectors>null</vectors>
<meshfile>./input/JRA55do-ESMFmesh.nc</meshfile>
<meshfile>./INPUT/JRA55do-ESMFmesh.nc</meshfile>
<lev_dimname>null</lev_dimname>
<datafiles>
<file>./input/RYF.vas.1990_1991.nc</file>
<file>./INPUT/RYF.vas.1990_1991.nc</file>
</datafiles>
<datavars>
<var>vas Sa_v</var>
Expand Down
4 changes: 2 additions & 2 deletions datm_in
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -8,8 +8,8 @@
flds_preso3 = .false.
flds_wiso = .false.
iradsw = 1
model_maskfile = "./input/access-om2-025deg-nomask-ESMFmesh.nc"
model_meshfile = "./input/access-om2-025deg-nomask-ESMFmesh.nc"
model_maskfile = "./INPUT/access-om2-025deg-nomask-ESMFmesh.nc"
model_meshfile = "./INPUT/access-om2-025deg-nomask-ESMFmesh.nc"
nx_global = 1440
ny_global = 1080
restfilm = "null"
Expand Down
8 changes: 4 additions & 4 deletions drof.streams.xml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -11,10 +11,10 @@
<year_last>1900</year_last>
<year_align>1900</year_align>
<vectors>null</vectors>
<meshfile>./input/JRA55do-ESMFmesh.nc</meshfile>
<meshfile>./INPUT/JRA55do-ESMFmesh.nc</meshfile>
<lev_dimname>null</lev_dimname>
<datafiles>
<file>./input/RYF.friver.1990_1991.nc</file>
<file>./INPUT/RYF.friver.1990_1991.nc</file>
</datafiles>
<datavars>
<var>friver Forr_rofl</var>
Expand All @@ -32,10 +32,10 @@
<year_last>1900</year_last>
<year_align>1900</year_align>
<vectors>null</vectors>
<meshfile>./input/JRA55do-ESMFmesh.nc</meshfile>
<meshfile>./INPUT/JRA55do-ESMFmesh.nc</meshfile>
<lev_dimname>null</lev_dimname>
<datafiles>
<file>./input/RYF.licalvf.1990_1991.nc</file>
<file>./INPUT/RYF.licalvf.1990_1991.nc</file>
</datafiles>
<datavars>
<var>licalvf Forr_rofi</var>
Expand Down
4 changes: 2 additions & 2 deletions drof_in
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
&drof_nml
datamode = "copyall"
model_maskfile = "./input/access-om2-025deg-nomask-ESMFmesh.nc"
model_meshfile = "./input/access-om2-025deg-nomask-ESMFmesh.nc"
model_maskfile = "./INPUT/access-om2-025deg-nomask-ESMFmesh.nc"
model_meshfile = "./INPUT/access-om2-025deg-nomask-ESMFmesh.nc"
nx_global = 1440
ny_global = 1080
restfilm = "null"
Expand Down
7 changes: 4 additions & 3 deletions ice_in
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -5,6 +5,7 @@
dumpfreq = "y"
dump_last = .true.
histfreq = "d", "m", "x", "x", "x"
hist_suffix = "", "m", "x", "x", "x" !limited to one character due to https://github.com/COSIMA/access-om3/issues/201
hist_time_axis = "middle"
history_deflate = 1
history_chunksize = 720, 540
Expand All @@ -17,15 +18,15 @@
print_global = .false.
/
&grid_nml
bathymetry_file = "./input/topog.nc"
bathymetry_file = "./INPUT/topog.nc"
grid_atm = "A"
grid_file = "./input/grid.nc"
grid_file = "./INPUT/grid.nc"
grid_format = "nc"
grid_ice = "B"
grid_ocn = "A"
grid_type = "tripole"
kcatbound = 0
kmt_file = "./input/kmt.nc"
kmt_file = "./INPUT/kmt.nc"
nblyr = 1
ncat = 5
nfsd = 1
Expand Down
6 changes: 6 additions & 0 deletions input.nml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -20,3 +20,9 @@
cf_compliance = .true.
/

&fms2_io_nml
ncchksz = 4194304
netcdf_default_format = "netcdf4"
deflate_level = 4
shuffle = .true.
/
6 changes: 3 additions & 3 deletions manifests/exe.yaml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,7 @@ format: yamanifest
version: 1.0
---
work/access-om3-MOM6-CICE6:
fullpath: /g/data/ik11/spack/0.21.2/opt/linux-rocky8-cascadelake/intel-2021.10.0/access-om3-69f719964a27e23deae3923d60af01a081cc3fc0_main-fkzzqnp/bin/access-om3-MOM6-CICE6
fullpath: /g/data/ik11/spack/0.21.2/opt/linux-rocky8-cascadelake/intel-2021.10.0/access-om3-63ed4a4777aeac0c62720ddbe7f85e4ed16f82eb_main-xekfuu4/bin/access-om3-MOM6-CICE6
hashes:
binhash: 2b81c015c844fe20b7f03eb463c2badf
md5: bf9a7bdcc4c1e6fa94dc248431b9aa3d
binhash: c844e55e3f2b6cf2721df80c4188bcd4
md5: 4c1c67bc68526dd70db43175f117c1a5
Loading