From a281f25f1937e373bd95c2824cd56ed979f25ab5 Mon Sep 17 00:00:00 2001 From: anton-climate Date: Wed, 17 Apr 2024 16:20:40 +1000 Subject: [PATCH 1/3] New CICE grid --- config.yaml | 4 ++-- manifests/input.yaml | 12 ++++++------ 2 files changed, 8 insertions(+), 8 deletions(-) diff --git a/config.yaml b/config.yaml index ac665f44..56641c0c 100644 --- a/config.yaml +++ b/config.yaml @@ -76,10 +76,10 @@ submodels: model: cice5 exe: /g/data/vk83/apps/spack/0.20/release/linux-rocky8-x86_64/intel-19.0.5.281/cice5-git.2023.10.19=2023.10.19-v3zncpqjj2gyseudbwiudolcjq3k3leo/bin/cice_auscom_360x300_24x1_24p.exe input: + - /g/data/vk83/experiments/inputs/access-om2/ice/grids/global.1deg/2024.04.17/grid.nc + - /g/data/vk83/experiments/inputs/access-om2/ice/grids/global.1deg/2024.04.17/kmt.nc - /g/data/vk83/experiments/inputs/access-om2/ice/initial_conditions_biogeochemistry/global.1deg/2022.02.24/i2o.nc - /g/data/vk83/experiments/inputs/access-om2/ice/initial_conditions_biogeochemistry/global.1deg/2022.02.24/o2i.nc - - /g/data/vk83/experiments/inputs/access-om2/ice/grids/global.1deg/2020.05.30/grid.nc - - /g/data/vk83/experiments/inputs/access-om2/ice/grids/global.1deg/2020.10.22/kmt.nc - /g/data/vk83/experiments/inputs/access-om2/ice/initial_conditions/global.1deg/2020.05.30/u_star.nc - /g/data/vk83/experiments/inputs/access-om2/ice/initial_conditions/global.1deg/2020.05.30/monthly_sstsss.nc ncpus: 24 diff --git a/manifests/input.yaml b/manifests/input.yaml index 45971c33..bc152b55 100644 --- a/manifests/input.yaml +++ b/manifests/input.yaml @@ -3443,10 +3443,10 @@ work/atmosphere/INPUT/vas_input4MIPs_atmosphericState_OMIP_MRI-JRA55-do-1-4-0_gr md5: b0e514bfac0d9dfbf538d36b8ecd17f9 work/ice/RESTART/grid.nc: copy: true - fullpath: /g/data/vk83/experiments/inputs/access-om2/ice/grids/global.1deg/2020.05.30/grid.nc + fullpath: /g/data/vk83/experiments/inputs/access-om2/ice/grids/global.1deg/2024.04.17/grid.nc hashes: - binhash: e7108317ae28b1f9ae77711728925cb6 - md5: 1213e346055ee073fe33dc12578d99c6 + binhash: 588f0b40bf750559434e425e7d039bca + md5: 7dd9ee5bce7f2eaeb75355684ddba599 work/ice/RESTART/i2o.nc: copy: true fullpath: /g/data/vk83/experiments/inputs/access-om2/ice/initial_conditions_biogeochemistry/global.1deg/2022.02.24/i2o.nc @@ -3455,10 +3455,10 @@ work/ice/RESTART/i2o.nc: md5: cc4cc9b60706470beddce59b600fef9f work/ice/RESTART/kmt.nc: copy: true - fullpath: /g/data/vk83/experiments/inputs/access-om2/ice/grids/global.1deg/2020.10.22/kmt.nc + fullpath: /g/data/vk83/experiments/inputs/access-om2/ice/grids/global.1deg/2024.04.17/kmt.nc hashes: - binhash: 13a23d6d9331abc9d677c6fd466a4433 - md5: 1f9806c646a620378e5257e480bc9df7 + binhash: 2b659d429cbf9e12701709ff0185405f + md5: 9609d3db04f58cba200d7186dfe68ebd work/ice/RESTART/monthly_sstsss.nc: copy: true fullpath: /g/data/vk83/experiments/inputs/access-om2/ice/initial_conditions/global.1deg/2020.05.30/monthly_sstsss.nc From bae0ba7c3121ac3f02fcb399653a85ae82770d8e Mon Sep 17 00:00:00 2001 From: Tommy Gatti Date: Wed, 19 Jun 2024 13:30:23 +1000 Subject: [PATCH 2/3] Updated CI in line with 0e6c9b61abeb51bbb6074af4ff8a66845d958bb9 --- .github/workflows/call-pr-1-ci.yml | 25 ------------ .github/workflows/call-pr-3-bump-tag.yml | 19 --------- .github/workflows/ci.yml | 51 ++++++++++++++++++++++++ .github/workflows/validate-json.yml | 13 ------ 4 files changed, 51 insertions(+), 57 deletions(-) delete mode 100644 .github/workflows/call-pr-1-ci.yml delete mode 100644 .github/workflows/call-pr-3-bump-tag.yml create mode 100644 .github/workflows/ci.yml delete mode 100644 .github/workflows/validate-json.yml diff --git a/.github/workflows/call-pr-1-ci.yml b/.github/workflows/call-pr-1-ci.yml deleted file mode 100644 index 57dbf1ba..00000000 --- a/.github/workflows/call-pr-1-ci.yml +++ /dev/null @@ -1,25 +0,0 @@ -# This workflow is used to convert the `.version` in the `metadata.yaml` file into a valid `git tag` on push to `main`. -# We use the `.version` field in that file to denote the version of the config once a PR is merged. -name: pr-1-ci.yml -on: - pull_request: - branches: - - 'release-*' - - 'dev-*' - paths-ignore: - # These are ignored because they don't have anything to do with the model itself - - .github/** - - tools/** - - doc/** - - .* - - README.md -jobs: - call: - # We simply call the workflow on main so we don't have to propagate CI changes to - # multiple config branches all the time. - uses: access-nri/access-om2-configs/.github/workflows/pr-1-ci.yml@main - secrets: inherit - permissions: - contents: write - pull-requests: write - checks: write diff --git a/.github/workflows/call-pr-3-bump-tag.yml b/.github/workflows/call-pr-3-bump-tag.yml deleted file mode 100644 index a9e2e37a..00000000 --- a/.github/workflows/call-pr-3-bump-tag.yml +++ /dev/null @@ -1,19 +0,0 @@ -# This workflow is used to convert the `.version` in the `metadata.yaml` file -# into a valid `git tag` on push to `main`. -# We use the `.version` field in that file to denote the version of the config -# once a PR is merged. -name: Call pr-3-bump-tag.yml -on: - push: - branches: - - 'release-*' - paths: - - 'metadata.yaml' -jobs: - call: - # We simply call the workflow on main so we don't have to propagate CI changes to - # multiple config branches all the time. - uses: access-nri/access-om2-configs/.github/workflows/pr-3-bump-tag.yml@main - secrets: inherit - permissions: - contents: write diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml new file mode 100644 index 00000000..487ae3b6 --- /dev/null +++ b/.github/workflows/ci.yml @@ -0,0 +1,51 @@ +name: CI +run-name: CI (${{ github.event_name }}) for ${{ github.ref_name }} +on: + pull_request: + branches: + - 'release-*' + - 'dev-*' + paths-ignore: + # These are ignored because they don't have anything to do with the model itself + - .github/** + - tools/** + - doc/** + - config/** + - .* + - README.md + push: + branches: + - 'release-*' + paths: + - 'metadata.yaml' + issue_comment: + types: + - created + - edited +jobs: + pr: + name: PR + if: github.event_name == 'pull_request' + uses: access-nri/model-config-tests/.github/workflows/config-pr-1-ci.yml@main + secrets: inherit + permissions: + contents: write + pull-requests: write # For pull request comments denoting failure of the workflow + checks: write + + pr-comment: + name: Comment + if: github.event_name == 'issue_comment' + uses: access-nri/model-config-tests/.github/workflows/config-pr-2-confirm.yml@main + secrets: inherit + permissions: + contents: write # For updating metadata.yaml version and committing checksums + pull-requests: write # For commenting on PR + + bump-tag: + name: Tag Bump + if: github.event_name == 'push' + uses: access-nri/model-config-tests/.github/workflows/config-pr-3-bump-tag.yml@main + secrets: inherit + permissions: + contents: write # For creating a new release diff --git a/.github/workflows/validate-json.yml b/.github/workflows/validate-json.yml deleted file mode 100644 index a23beac2..00000000 --- a/.github/workflows/validate-json.yml +++ /dev/null @@ -1,13 +0,0 @@ -name: Validate JSON files -on: - pull_request: - branches: - - main - paths: - - '**.json' -jobs: - validate: - name: Validate - uses: access-nri/actions/.github/workflows/validate-json.yml@main - with: - src: "config" From dcc2e79d0858487772f1e4a6bf84e59570aade13 Mon Sep 17 00:00:00 2001 From: dougiesquire Date: Wed, 3 Jul 2024 10:10:58 +1000 Subject: [PATCH 3/3] Update to access-om2-bgc 2024.07.0 --- config.yaml | 8 ++++---- manifests/exe.yaml | 18 +++++++++--------- manifests/input.yaml | 2 +- 3 files changed, 14 insertions(+), 14 deletions(-) diff --git a/config.yaml b/config.yaml index 56641c0c..317f3984 100644 --- a/config.yaml +++ b/config.yaml @@ -31,7 +31,7 @@ input: submodels: - name: atmosphere model: yatm - exe: /g/data/vk83/apps/spack/0.20/release/linux-rocky8-x86_64/intel-19.0.5.281/libaccessom2-git.2023.10.26=2023.10.26-ltfg7jcn6t4cefotvj3kjnyu5nru26xo/bin/yatm.exe + exe: /g/data/vk83/apps/spack/0.22/release/linux-rocky8-x86_64/intel-19.0.5.281/libaccessom2-git.2023.10.26_2023.10.26-xarvbgn4yf4mxy5hxixm4gfbp7rbzsfh/bin/yatm.exe input: - /g/data/vk83/experiments/inputs/access-om2/remapping_weights/JRA55/global.1deg/2020.05.30/rmp_jrar_to_cict_CONSERV.nc - /g/data/qv56/replicas/input4MIPs/CMIP6/OMIP/MRI/MRI-JRA55-do-1-4-0/atmos/3hr/rsds/gr/v20190429 @@ -49,7 +49,7 @@ submodels: - name: ocean model: mom - exe: /g/data/vk83/apps/spack/0.20/release/linux-rocky8-x86_64/intel-19.0.5.281/mom5-git.2023.11.09=2023.11.09-64l5azdtcoxhrgb5ynn2vued5lmjvn33/bin/fms_ACCESS-OM-BGC.x + exe: /g/data/vk83/apps/spack/0.22/release/linux-rocky8-x86_64/intel-19.0.5.281/mom5-git.2024.06.27_2024.06.27-q6bpwu526xql2gm6dbpnvf36yvnfxynj/bin/fms_ACCESS-OM-BGC.x input: - /g/data/vk83/experiments/inputs/access-om2/ocean/biogeochemistry/global.1deg/2022.02.24/bgc_param.nc - /g/data/vk83/experiments/inputs/access-om2/ocean/biogeochemistry/global.1deg/2022.02.24/co2_iaf.nc @@ -74,7 +74,7 @@ submodels: - name: ice model: cice5 - exe: /g/data/vk83/apps/spack/0.20/release/linux-rocky8-x86_64/intel-19.0.5.281/cice5-git.2023.10.19=2023.10.19-v3zncpqjj2gyseudbwiudolcjq3k3leo/bin/cice_auscom_360x300_24x1_24p.exe + exe: /g/data/vk83/apps/spack/0.22/release/linux-rocky8-x86_64/intel-19.0.5.281/cice5-git.2023.10.19_2023.10.19-4tttbvaxg4afg3hjcrfaah6qngp43e5e/bin/cice_auscom_360x300_24x1_24p.exe input: - /g/data/vk83/experiments/inputs/access-om2/ice/grids/global.1deg/2024.04.17/grid.nc - /g/data/vk83/experiments/inputs/access-om2/ice/grids/global.1deg/2024.04.17/kmt.nc @@ -91,7 +91,7 @@ collate: mem: 30GB ncpus: 4 queue: normal - exe: /g/data/vk83/apps/spack/0.20/release/linux-rocky8-x86_64/intel-19.0.5.281/mom5-git.2023.11.09=2023.11.09-64l5azdtcoxhrgb5ynn2vued5lmjvn33/bin/mppnccombine.spack + exe: /g/data/vk83/apps/spack/0.22/release/linux-rocky8-x86_64/intel-19.0.5.281/mom5-git.2024.06.27_2024.06.27-q6bpwu526xql2gm6dbpnvf36yvnfxynj/bin/mppnccombine.spack manifest: reproduce: diff --git a/manifests/exe.yaml b/manifests/exe.yaml index fec7972a..91c1691d 100644 --- a/manifests/exe.yaml +++ b/manifests/exe.yaml @@ -2,17 +2,17 @@ format: yamanifest version: 1.0 --- work/atmosphere/yatm.exe: - fullpath: /g/data/vk83/apps/spack/0.20/release/linux-rocky8-x86_64/intel-19.0.5.281/libaccessom2-git.2023.10.26=2023.10.26-ltfg7jcn6t4cefotvj3kjnyu5nru26xo/bin/yatm.exe + fullpath: /g/data/vk83/apps/spack/0.22/release/linux-rocky8-x86_64/intel-19.0.5.281/libaccessom2-git.2023.10.26_2023.10.26-xarvbgn4yf4mxy5hxixm4gfbp7rbzsfh/bin/yatm.exe hashes: - binhash: 4e8b4ef76e971c4af3b26cfac632e160 - md5: 5baa1d417fe6708fc30cbeaa57d82f96 + binhash: 4f968e4cf41d6e51cf3cd59bd070e393 + md5: eccfeb3f49d620b4e5f6b8c2bc5d8c36 work/ice/cice_auscom_360x300_24x1_24p.exe: - fullpath: /g/data/vk83/apps/spack/0.20/release/linux-rocky8-x86_64/intel-19.0.5.281/cice5-git.2023.10.19=2023.10.19-v3zncpqjj2gyseudbwiudolcjq3k3leo/bin/cice_auscom_360x300_24x1_24p.exe + fullpath: /g/data/vk83/apps/spack/0.22/release/linux-rocky8-x86_64/intel-19.0.5.281/cice5-git.2023.10.19_2023.10.19-4tttbvaxg4afg3hjcrfaah6qngp43e5e/bin/cice_auscom_360x300_24x1_24p.exe hashes: - binhash: 3a65f67d21152e77034da28c22a94c66 - md5: 37866455b057c85c3ea50c0ef0ea840b + binhash: 6d1d90c6ba37b4dbbd3173fab98d32d1 + md5: 1ee0b63f488f38619cba0000586bc0c4 work/ocean/fms_ACCESS-OM-BGC.x: - fullpath: /g/data/vk83/apps/spack/0.20/release/linux-rocky8-x86_64/intel-19.0.5.281/mom5-git.2023.11.09=2023.11.09-64l5azdtcoxhrgb5ynn2vued5lmjvn33/bin/fms_ACCESS-OM-BGC.x + fullpath: /g/data/vk83/apps/spack/0.22/release/linux-rocky8-x86_64/intel-19.0.5.281/mom5-git.2024.06.27_2024.06.27-q6bpwu526xql2gm6dbpnvf36yvnfxynj/bin/fms_ACCESS-OM-BGC.x hashes: - binhash: 45352e33876da49ca042014a9f6686e5 - md5: a909552e85690be692ad3ec94016181b + binhash: efb3edca9d546723c29f92f7c8eb1856 + md5: 1297c30c1b945e55fa08acdeb301b3d0 diff --git a/manifests/input.yaml b/manifests/input.yaml index bc152b55..a3b5f400 100644 --- a/manifests/input.yaml +++ b/manifests/input.yaml @@ -3505,7 +3505,7 @@ work/ocean/INPUT/csiro_bgc.res.nc: work/ocean/INPUT/csiro_bgc_sediment.res.nc: fullpath: /g/data/vk83/experiments/inputs/access-om2/ocean/biogeochemistry/global.1deg/2022.02.24/csiro_bgc_sediment.res.nc hashes: - binhash: 5dcf7a15477f488cd7d2f85a1d39a176 + binhash: fff3375ad2ae36b7d0521dd67912a9fd md5: 12488f7cf8f9c2f714c0ff2dbbb33a9b work/ocean/INPUT/dust.nc: fullpath: /g/data/vk83/experiments/inputs/access-om2/ocean/biogeochemistry/global.1deg/2022.02.24/dust.nc