From cec21deefbafa08260c7a75624a7de40bd9a0a18 Mon Sep 17 00:00:00 2001 From: dougiesquire Date: Fri, 5 Apr 2024 14:13:47 +1100 Subject: [PATCH 1/5] comment out project and shortpath from config.yaml Signed-off-by: dougiesquire --- config.yaml | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/config.yaml b/config.yaml index f24f6c6..bfa6403 100644 --- a/config.yaml +++ b/config.yaml @@ -2,11 +2,11 @@ # If submitting to a different project to your default, uncomment line below # and change project code as appropriate; also set shortpath below -project: x77 +# project: x77 # Force payu to always find, and save, files in this scratch project directory # (you may need to add the corresponding PBS -l storage flag in sync_data.sh) -shortpath: /scratch/v45 +# shortpath: /scratch/v45 queue: normal ncpus: 48 From 319384f591efd3b842768646656fa472115902ce Mon Sep 17 00:00:00 2001 From: Micael Oliveira Date: Fri, 5 Apr 2024 12:14:36 +1100 Subject: [PATCH 2/5] Update field dictionary. --- fd.yaml | 12 ++++++++++++ 1 file changed, 12 insertions(+) diff --git a/fd.yaml b/fd.yaml index c09a63c..f5a6abc 100644 --- a/fd.yaml +++ b/fd.yaml @@ -487,6 +487,18 @@ canonical_units: m description: atmosphere import # + - standard_name: So_ugustOut + canonical_units: m/s + description: atmosphere import + # + - standard_name: So_u10withGust + canonical_units: m/s + description: atmosphere import + # + - standard_name: So_u10res + canonical_units: m/s + description: atmosphere import + # #----------------------------------- # section: land-ice export # Note that the fields sent from glc->med do NOT have elevation classes, From 1d5732dee5d2c740ac4826a9e203e4957a01ffad Mon Sep 17 00:00:00 2001 From: Micael Oliveira Date: Fri, 5 Apr 2024 12:37:49 +1100 Subject: [PATCH 3/5] Update OM3 executable to use. --- config.yaml | 2 +- manifests/exe.yaml | 6 +++--- 2 files changed, 4 insertions(+), 4 deletions(-) diff --git a/config.yaml b/config.yaml index bfa6403..238cf29 100644 --- a/config.yaml +++ b/config.yaml @@ -18,7 +18,7 @@ jobname: 1deg_jra55do_ryf model: access-om3 -exe: /g/data/ik11/spack/0.20.1/opt/linux-rocky8-cascadelake/intel-2021.6.0/access-om3-main-lxbeca7/bin/access-om3-MOM6-CICE6 +exe: /g/data/ik11/spack/0.21.2/opt/linux-rocky8-cascadelake/intel-2021.10.0/access-om3-main-6pue372/bin/access-om3-MOM6-CICE6 input: - /g/data/ik11/inputs/access-om3/0.x.0/1deg/share # shared grids and topography - /g/data/ik11/inputs/access-om3/0.x.0/1deg/mom # grids, ICs etc diff --git a/manifests/exe.yaml b/manifests/exe.yaml index bdc61b7..af3058d 100644 --- a/manifests/exe.yaml +++ b/manifests/exe.yaml @@ -2,7 +2,7 @@ format: yamanifest version: 1.0 --- work/access-om3-MOM6-CICE6: - fullpath: /g/data/ik11/spack/0.20.1/opt/linux-rocky8-cascadelake/intel-2021.6.0/access-om3-main-lxbeca7/bin/access-om3-MOM6-CICE6 + fullpath: /g/data/ik11/spack/0.21.2/opt/linux-rocky8-cascadelake/intel-2021.10.0/access-om3-main-6pue372/bin/access-om3-MOM6-CICE6 hashes: - binhash: e9a7281fa7602ea36407c1a6a6406764 - md5: 507f2fad9c41ae46eca4145c180cda37 + binhash: f28129ea2dfe30a3b48932b40b40b9ab + md5: 2889850d155a1986dabfbc443dcb4eb7 From 1bad3aee5400b908535fea7aff5f8073f0c7876d Mon Sep 17 00:00:00 2001 From: Micael Oliveira Date: Fri, 5 Apr 2024 12:38:22 +1100 Subject: [PATCH 4/5] Remove environment modules stuff from config.yaml. Because we are now using a spack built executable, all dependencies are handled through rpath and we can leave payu to figure out whatever is missing. --- config.yaml | 8 -------- 1 file changed, 8 deletions(-) diff --git a/config.yaml b/config.yaml index 238cf29..0dd79c1 100644 --- a/config.yaml +++ b/config.yaml @@ -32,11 +32,3 @@ runlog: false userscripts: setup: ./setup_cice_restarts.sh archive: ./archive_cice_restarts.sh - -modules: - use: - - /g/data/ik11/spack/0.20.1/modules/access-om3/0.x.0/linux-rocky8-cascadelake - load: - - intel-compiler/2021.6.0 - - openmpi/4.1.4 - - parallelio/2.5.10 From a6e2f2d3c1cf4d5845b08a1238187de9cebdca50 Mon Sep 17 00:00:00 2001 From: Micael Oliveira Date: Thu, 18 Apr 2024 15:25:26 +1000 Subject: [PATCH 5/5] Update OM3 executable to latest version. Note that the path now includes the git commit hash of OM3. --- config.yaml | 2 +- manifests/exe.yaml | 6 +++--- 2 files changed, 4 insertions(+), 4 deletions(-) diff --git a/config.yaml b/config.yaml index 0dd79c1..a7602ba 100644 --- a/config.yaml +++ b/config.yaml @@ -18,7 +18,7 @@ jobname: 1deg_jra55do_ryf model: access-om3 -exe: /g/data/ik11/spack/0.21.2/opt/linux-rocky8-cascadelake/intel-2021.10.0/access-om3-main-6pue372/bin/access-om3-MOM6-CICE6 +exe: /g/data/ik11/spack/0.21.2/opt/linux-rocky8-cascadelake/intel-2021.10.0/access-om3-d6813d6b9e1df560ac3f6ba6a605daab9cfd9569_main-5pjh7z2/bin/access-om3-MOM6-CICE6 input: - /g/data/ik11/inputs/access-om3/0.x.0/1deg/share # shared grids and topography - /g/data/ik11/inputs/access-om3/0.x.0/1deg/mom # grids, ICs etc diff --git a/manifests/exe.yaml b/manifests/exe.yaml index af3058d..8303aed 100644 --- a/manifests/exe.yaml +++ b/manifests/exe.yaml @@ -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-main-6pue372/bin/access-om3-MOM6-CICE6 + fullpath: /g/data/ik11/spack/0.21.2/opt/linux-rocky8-cascadelake/intel-2021.10.0/access-om3-d6813d6b9e1df560ac3f6ba6a605daab9cfd9569_main-5pjh7z2/bin/access-om3-MOM6-CICE6 hashes: - binhash: f28129ea2dfe30a3b48932b40b40b9ab - md5: 2889850d155a1986dabfbc443dcb4eb7 + binhash: 4b05dc495b4fe5ce2e71fa9a7ff62f72 + md5: ba3b677b7c386c09e6430617c26cab58