From 88e31aedbd58ab85dd0c013b5b359a23ab07002c Mon Sep 17 00:00:00 2001 From: Tommy Gatti Date: Wed, 19 Jun 2024 13:28:24 +1000 Subject: [PATCH 1/5] Updated CI in line with 0e6c9b61abeb51bbb6074af4ff8a66845d958bb9 --- .github/workflows/call-pr-1-ci.yml | 26 ---- .github/workflows/call-pr-3-bump-tag.yml | 19 --- .github/workflows/ci.yml | 51 ++++++++ .github/workflows/pr-2-confirm.yml | 160 ----------------------- .github/workflows/validate-json.yml | 13 -- 5 files changed, 51 insertions(+), 218 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/pr-2-confirm.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 a817c111..00000000 --- a/.github/workflows/call-pr-1-ci.yml +++ /dev/null @@ -1,26 +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/** - - .* - - metadata.yaml - - 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/pr-2-confirm.yml b/.github/workflows/pr-2-confirm.yml deleted file mode 100644 index adbcb472..00000000 --- a/.github/workflows/pr-2-confirm.yml +++ /dev/null @@ -1,160 +0,0 @@ -# This workflow is used to do a major/minor version bump to the `metadata.yaml` file, -# through a comment on the PR. It also commits and pushes the checksum file, -# as this is the last stage before merging. -# This is not done automatically because users may want to modify their config -# based on the result of the reproducibility check. -name: Confirm -on: - issue_comment: - types: - - created - - edited -env: - GH_TOKEN: ${{ secrets.GITHUB_TOKEN }} - RUN_URL: ${{ github.server_url }}/${{ github.repository }}/actions/runs/${{ github.run_id }} -jobs: - bump-version: - name: Bump metadata.yaml - # Bump the `metadata.yaml` file if the comment is made on a PR and starts with '!bump' - if: github.event.issue.pull_request && startsWith(github.event.comment.body, '!bump') - runs-on: ubuntu-latest - outputs: - # metadata.yaml version before being bumped - before: ${{ steps.bump.outputs.before }} - # metadata.yaml version after being bumped - after: ${{ steps.bump.outputs.after }} - # The type of bump - 'major' or 'minor' - type: ${{ steps.type.outputs.bump }} - steps: - - uses: actions/checkout@v4 - with: - fetch-depth: 0 - token: ${{ secrets.GH_COMMIT_CHECK_TOKEN }} - - - name: Checkout Associated PR ${{ github.event.issue.number }} - # Since the trigger for this workflow was on.issue_comment, we need - # to do a bit more wrangling to checkout the pull request - id: pr - run: gh pr checkout ${{ github.event.issue.number }} - - - name: Get Type of Bump - id: type - run: | - if [[ "${{ contains(github.event.comment.body, 'minor') }}" == "true" ]]; then - echo "bump=minor" >> $GITHUB_OUTPUT - elif [[ ${{ contains(github.event.comment.body, 'major') }} == "true" ]]; then - echo "bump=major" >> $GITHUB_OUTPUT - else - echo "::error::Comment was not of the form: '!bump [major|minor]'" - exit 1 - fi - - - name: Bump - # Regarding the regex in the script: `([0-9]+)\.([0-9]+)` is broken down into: - # `([0-9]+)`: Major version (eg. `12`) - # `\.`: Version separator (eg. `.`) - # `([0-9]+)`: Minor version (eg. `1`) - # which would give `12.1` - id: bump - run: | - version=$(yq '.version' metadata.yaml) - regex="([0-9]+)\.([0-9]+)" - if [[ $version =~ $regex ]]; then - major_version="${BASH_REMATCH[1]}" - minor_version="${BASH_REMATCH[2]}" - else - echo "::error::Invalid version format in metadata.yaml file!" - exit 1 - fi - - if [[ "${{ steps.type.outputs.bump }}" == "minor" ]]; then - minor_version=$((minor_version + 1)) - elif [[ "${{ steps.type.outputs.bump }}" == "major" ]]; then - major_version=$((major_version + 1)) - minor_version=0 - fi - new_version="${major_version}.${minor_version}" - echo "before=$version" >> $GITHUB_OUTPUT - echo "after=$new_version" >> $GITHUB_OUTPUT - - commit: - name: Commit metadata.yaml and Checksum - needs: - - bump-version - runs-on: ubuntu-latest - permissions: - contents: write - pull-requests: write - env: - GH_TOKEN: ${{ secrets.GH_COMMIT_CHECK_TOKEN }} - ARTIFACT_LOCAL_LOCATION: /opt/artifact - steps: - - uses: actions/checkout@v4 - with: - fetch-depth: 0 - token: ${{ secrets.GH_COMMIT_CHECK_TOKEN }} - - - name: Checkout Associated PR ${{ github.event.issue.number }} - # Since the trigger for this workflow was on.issue_comment, we need - # to do a bit more wrangling to checkout the pull request and get the branch name - id: pr - run: | - gh pr checkout ${{ github.event.issue.number }} - echo "branch=$(git rev-parse --abbrev-ref HEAD)" >> $GITHUB_OUTPUT - - - name: Download Newly Created Checksum - # Given the PR branch, we need to find the latest associated workflow run - # on this branch we can then download the associated artifact - run: | - associated_run=$(gh run list \ - --json='databaseId,headBranch,updatedAt,status' \ - --jq='[.[] | select(.headBranch == "${{ steps.pr.outputs.branch }}" and .status == "completed")] | sort_by(.updatedAt) | last | .databaseId') - gh run download $associated_run -D ${{ env.ARTIFACT_LOCAL_LOCATION }} - - - name: Update metadata.yaml and Checksum files - run: | - yq -i '.version = "${{ needs.bump-version.outputs.after }}"' metadata.yaml - cp --recursive --verbose ${{ env.ARTIFACT_LOCAL_LOCATION }}/*/* testing - - - name: Commit and Push Updates - run: | - git config user.name github-actions - git config user.email github-actions@github.com - - if [[ "${{ needs.bump-version.outputs.type }}" == "minor" ]]; then - git commit -am "Bumped version to ${{ needs.bump-version.outputs.after }} as part of ${{ env.RUN_URL }}" - elif [[ "${{ needs.bump-version.outputs.type }}" == "major" ]]; then - git commit -am "Updated checksums and bumped version to ${{ needs.bump-version.outputs.after }} as part of ${{ env.RUN_URL }}" - fi - git push - - - name: Comment Success - env: - BODY: | - :white_check_mark: Version bumped from `${{ needs.bump-version.outputs.before }}` to `${{ needs.bump-version.outputs.after }}` :white_check_mark: - run: gh pr comment --body '${{ env.BODY }}' - - failure-notifier: - name: Failure Notifier - if: failure() - needs: - - commit - runs-on: ubuntu-latest - permissions: - pull-requests: write - env: - GH_TOKEN: ${{ secrets.GITHUB_TOKEN }} - GH_REPO: ${{ github.repository }} - steps: - - uses: actions/checkout@v4 - with: - fetch-depth: 0 - - - name: Checkout Associated PR ${{ github.event.issue.number }} - run: gh pr checkout ${{ github.event.issue.number }} - - - name: Comment Failure - env: - BODY: | - :x: Failed to bump VERSION or commit changes, see ${{ env.RUN_URL }} :x: - run: gh pr comment --body '${{ env.BODY }}' 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 5ee5151b13c8bf99f14a79106b0cf2381b3d7adc Mon Sep 17 00:00:00 2001 From: dougiesquire Date: Wed, 3 Jul 2024 09:14:40 +1000 Subject: [PATCH 2/5] Update exes to latest release (including WOMBAT i2o BGC coupling bug fix) --- config.yaml | 6 +++--- manifests/exe.yaml | 18 +++++++++--------- 2 files changed, 12 insertions(+), 12 deletions(-) diff --git a/config.yaml b/config.yaml index eb0d1f11..2f3781e7 100644 --- a/config.yaml +++ b/config.yaml @@ -27,7 +27,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.21/release/linux-rocky8-x86_64/intel-2021.10.0/libaccessom2-git.2023.10.26_2023.10.26-uzxs6bzbk5j5a3uz5uyallnb65iihllp/bin/yatm.exe input: - /g/data/vk83/experiments/inputs/access-om2/remapping_weights/JRA55/global.025deg/2020.05.30/rmp_jrar_to_cict_CONSERV.nc - /g/data/vk83/experiments/inputs/JRA-55/RYF/v1-4/data @@ -35,7 +35,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.21/release/linux-rocky8-x86_64/intel-2021.10.0/mom5-git.2024.06.27_2024.06.27-omyzessq2c636dguuzxac6i2onh3rsmf/bin/fms_ACCESS-OM-BGC.x input: - /g/data/vk83/experiments/inputs/access-om2/ocean/grids/mosaic/global.025deg/2020.05.30/grid_spec.nc - /g/data/vk83/experiments/inputs/access-om2/ocean/grids/mosaic/global.025deg/2020.05.30/ocean_hgrid.nc @@ -60,7 +60,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_1440x1080_48x40_480p.exe + exe: /g/data/vk83/apps/spack/0.21/release/linux-rocky8-x86_64/intel-2021.10.0/cice5-git.2023.10.19_2023.10.19-5fsgo7ngu72sepcoz4vho5737eiibmkf/bin/cice_auscom_1440x1080_48x40_480p.exe input: - /g/data/vk83/experiments/inputs/access-om2/ice/grids/global.025deg/2024.04.17/grid.nc - /g/data/vk83/experiments/inputs/access-om2/ice/grids/global.025deg/2024.04.17/kmt.nc diff --git a/manifests/exe.yaml b/manifests/exe.yaml index 2e311903..1e5ed1ae 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.21/release/linux-rocky8-x86_64/intel-2021.10.0/libaccessom2-git.2023.10.26_2023.10.26-uzxs6bzbk5j5a3uz5uyallnb65iihllp/bin/yatm.exe hashes: - binhash: 4e8b4ef76e971c4af3b26cfac632e160 - md5: 5baa1d417fe6708fc30cbeaa57d82f96 + binhash: fc2345a914935d87651afbd31fa60051 + md5: 4aa238b39c2eb807c9f32ea50d80968f work/ice/cice_auscom_1440x1080_48x40_480p.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_1440x1080_48x40_480p.exe + fullpath: /g/data/vk83/apps/spack/0.21/release/linux-rocky8-x86_64/intel-2021.10.0/cice5-git.2023.10.19_2023.10.19-5fsgo7ngu72sepcoz4vho5737eiibmkf/bin/cice_auscom_1440x1080_48x40_480p.exe hashes: - binhash: 22813654d4a52914003c563fa083e245 - md5: 38bbb933238af1adc63c6d7eb0b6f7d1 + binhash: 47e978c41be190d4cabcc1a928f3b13b + md5: a2de688633ddf65e42335e6490525c92 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.21/release/linux-rocky8-x86_64/intel-2021.10.0/mom5-git.2024.06.27_2024.06.27-omyzessq2c636dguuzxac6i2onh3rsmf/bin/fms_ACCESS-OM-BGC.x hashes: - binhash: 45352e33876da49ca042014a9f6686e5 - md5: a909552e85690be692ad3ec94016181b + binhash: d89df46a962b16bd33b61dfbedeb7dcf + md5: 14f6f88062bb997eb6313bf454635ea2 From e471aec3fa038b819dfcbf7cee7db56a397c9b5e Mon Sep 17 00:00:00 2001 From: dougiesquire Date: Tue, 9 Jul 2024 20:43:08 +1000 Subject: [PATCH 3/5] Update to access-om2-bgc 2024.07.0 --- config.yaml | 6 +++--- manifests/exe.yaml | 18 +++++++++--------- 2 files changed, 12 insertions(+), 12 deletions(-) diff --git a/config.yaml b/config.yaml index 2f3781e7..73f185ff 100644 --- a/config.yaml +++ b/config.yaml @@ -27,7 +27,7 @@ input: submodels: - name: atmosphere model: yatm - exe: /g/data/vk83/apps/spack/0.21/release/linux-rocky8-x86_64/intel-2021.10.0/libaccessom2-git.2023.10.26_2023.10.26-uzxs6bzbk5j5a3uz5uyallnb65iihllp/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.025deg/2020.05.30/rmp_jrar_to_cict_CONSERV.nc - /g/data/vk83/experiments/inputs/JRA-55/RYF/v1-4/data @@ -35,7 +35,7 @@ submodels: - name: ocean model: mom - exe: /g/data/vk83/apps/spack/0.21/release/linux-rocky8-x86_64/intel-2021.10.0/mom5-git.2024.06.27_2024.06.27-omyzessq2c636dguuzxac6i2onh3rsmf/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/grids/mosaic/global.025deg/2020.05.30/grid_spec.nc - /g/data/vk83/experiments/inputs/access-om2/ocean/grids/mosaic/global.025deg/2020.05.30/ocean_hgrid.nc @@ -60,7 +60,7 @@ submodels: - name: ice model: cice5 - exe: /g/data/vk83/apps/spack/0.21/release/linux-rocky8-x86_64/intel-2021.10.0/cice5-git.2023.10.19_2023.10.19-5fsgo7ngu72sepcoz4vho5737eiibmkf/bin/cice_auscom_1440x1080_48x40_480p.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_1440x1080_48x40_480p.exe input: - /g/data/vk83/experiments/inputs/access-om2/ice/grids/global.025deg/2024.04.17/grid.nc - /g/data/vk83/experiments/inputs/access-om2/ice/grids/global.025deg/2024.04.17/kmt.nc diff --git a/manifests/exe.yaml b/manifests/exe.yaml index 1e5ed1ae..11b2a83c 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.21/release/linux-rocky8-x86_64/intel-2021.10.0/libaccessom2-git.2023.10.26_2023.10.26-uzxs6bzbk5j5a3uz5uyallnb65iihllp/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: fc2345a914935d87651afbd31fa60051 - md5: 4aa238b39c2eb807c9f32ea50d80968f + binhash: 4f968e4cf41d6e51cf3cd59bd070e393 + md5: eccfeb3f49d620b4e5f6b8c2bc5d8c36 work/ice/cice_auscom_1440x1080_48x40_480p.exe: - fullpath: /g/data/vk83/apps/spack/0.21/release/linux-rocky8-x86_64/intel-2021.10.0/cice5-git.2023.10.19_2023.10.19-5fsgo7ngu72sepcoz4vho5737eiibmkf/bin/cice_auscom_1440x1080_48x40_480p.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_1440x1080_48x40_480p.exe hashes: - binhash: 47e978c41be190d4cabcc1a928f3b13b - md5: a2de688633ddf65e42335e6490525c92 + binhash: 9eaf834d110efa19b906fb89fd22bb87 + md5: 2be6e6cee7f9c7c14d2198d04f83b48b work/ocean/fms_ACCESS-OM-BGC.x: - fullpath: /g/data/vk83/apps/spack/0.21/release/linux-rocky8-x86_64/intel-2021.10.0/mom5-git.2024.06.27_2024.06.27-omyzessq2c636dguuzxac6i2onh3rsmf/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: d89df46a962b16bd33b61dfbedeb7dcf - md5: 14f6f88062bb997eb6313bf454635ea2 + binhash: efb3edca9d546723c29f92f7c8eb1856 + md5: 1297c30c1b945e55fa08acdeb301b3d0 From b61dd664755fd1b43e0d6aa461f40864946ba518 Mon Sep 17 00:00:00 2001 From: dougiesquire Date: Wed, 3 Jul 2024 09:14:40 +1000 Subject: [PATCH 4/5] Update exes to latest release (including WOMBAT i2o BGC coupling bug fix) --- config.yaml | 6 +++--- manifests/exe.yaml | 18 +++++++++--------- 2 files changed, 12 insertions(+), 12 deletions(-) diff --git a/config.yaml b/config.yaml index eb0d1f11..2f3781e7 100644 --- a/config.yaml +++ b/config.yaml @@ -27,7 +27,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.21/release/linux-rocky8-x86_64/intel-2021.10.0/libaccessom2-git.2023.10.26_2023.10.26-uzxs6bzbk5j5a3uz5uyallnb65iihllp/bin/yatm.exe input: - /g/data/vk83/experiments/inputs/access-om2/remapping_weights/JRA55/global.025deg/2020.05.30/rmp_jrar_to_cict_CONSERV.nc - /g/data/vk83/experiments/inputs/JRA-55/RYF/v1-4/data @@ -35,7 +35,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.21/release/linux-rocky8-x86_64/intel-2021.10.0/mom5-git.2024.06.27_2024.06.27-omyzessq2c636dguuzxac6i2onh3rsmf/bin/fms_ACCESS-OM-BGC.x input: - /g/data/vk83/experiments/inputs/access-om2/ocean/grids/mosaic/global.025deg/2020.05.30/grid_spec.nc - /g/data/vk83/experiments/inputs/access-om2/ocean/grids/mosaic/global.025deg/2020.05.30/ocean_hgrid.nc @@ -60,7 +60,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_1440x1080_48x40_480p.exe + exe: /g/data/vk83/apps/spack/0.21/release/linux-rocky8-x86_64/intel-2021.10.0/cice5-git.2023.10.19_2023.10.19-5fsgo7ngu72sepcoz4vho5737eiibmkf/bin/cice_auscom_1440x1080_48x40_480p.exe input: - /g/data/vk83/experiments/inputs/access-om2/ice/grids/global.025deg/2024.04.17/grid.nc - /g/data/vk83/experiments/inputs/access-om2/ice/grids/global.025deg/2024.04.17/kmt.nc diff --git a/manifests/exe.yaml b/manifests/exe.yaml index 2e311903..1e5ed1ae 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.21/release/linux-rocky8-x86_64/intel-2021.10.0/libaccessom2-git.2023.10.26_2023.10.26-uzxs6bzbk5j5a3uz5uyallnb65iihllp/bin/yatm.exe hashes: - binhash: 4e8b4ef76e971c4af3b26cfac632e160 - md5: 5baa1d417fe6708fc30cbeaa57d82f96 + binhash: fc2345a914935d87651afbd31fa60051 + md5: 4aa238b39c2eb807c9f32ea50d80968f work/ice/cice_auscom_1440x1080_48x40_480p.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_1440x1080_48x40_480p.exe + fullpath: /g/data/vk83/apps/spack/0.21/release/linux-rocky8-x86_64/intel-2021.10.0/cice5-git.2023.10.19_2023.10.19-5fsgo7ngu72sepcoz4vho5737eiibmkf/bin/cice_auscom_1440x1080_48x40_480p.exe hashes: - binhash: 22813654d4a52914003c563fa083e245 - md5: 38bbb933238af1adc63c6d7eb0b6f7d1 + binhash: 47e978c41be190d4cabcc1a928f3b13b + md5: a2de688633ddf65e42335e6490525c92 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.21/release/linux-rocky8-x86_64/intel-2021.10.0/mom5-git.2024.06.27_2024.06.27-omyzessq2c636dguuzxac6i2onh3rsmf/bin/fms_ACCESS-OM-BGC.x hashes: - binhash: 45352e33876da49ca042014a9f6686e5 - md5: a909552e85690be692ad3ec94016181b + binhash: d89df46a962b16bd33b61dfbedeb7dcf + md5: 14f6f88062bb997eb6313bf454635ea2 From a45d2eef047183bad7714abb1e108c4d62d4e85d Mon Sep 17 00:00:00 2001 From: "access-bot[bot]" <113399144+access-bot@users.noreply.github.com> Date: Wed, 10 Jul 2024 01:54:48 +0000 Subject: [PATCH 5/5] Updated checksums and bumped version to 3.0 as part of https://github.com/ACCESS-NRI/access-om2-configs/actions/runs/9866899875 --- metadata.yaml | 2 +- testing/checksum/historical-3hr-checksum.json | 20 +++++++++---------- 2 files changed, 11 insertions(+), 11 deletions(-) diff --git a/metadata.yaml b/metadata.yaml index 36724aad..463e28cb 100644 --- a/metadata.yaml +++ b/metadata.yaml @@ -25,5 +25,5 @@ nominal_resolution: 25 km reference: https://doi.org/10.5194/gmd-13-401-2020 license: CC-BY-4.0 model: ACCESS-OM2 -version: '2.0' +version: '3.0' url: https://github.com/ACCESS-NRI/access-om2-configs.git diff --git a/testing/checksum/historical-3hr-checksum.json b/testing/checksum/historical-3hr-checksum.json index e034530f..162ce500 100644 --- a/testing/checksum/historical-3hr-checksum.json +++ b/testing/checksum/historical-3hr-checksum.json @@ -147,34 +147,34 @@ "-4066888309637314240" ], "adic": [ - "-2455395460635865998" + "-2455395406223065760" ], "caco3": [ - "-1946311099822526178" + "-1946001330455210348" ], "alk": [ - "666550672134593837" + "666550666703468188" ], "dic": [ - "-8109352984002592935" + "-8109352923411889020" ], "no3": [ - "7992606673146220590" + "-3927355164901111661" ], "phy": [ - "-8977775330410481366" + "-5332833466290796183" ], "o2": [ - "-2977305693613054852" + "-2977306008655971539" ], "fe": [ - "-8926867780862610659" + "-8926870080351100871" ], "zoo": [ - "3652579702518992198" + "3652619569480272960" ], "det": [ - "-1773221676325612934" + "-1771932541263243583" ], "age_global": [ "6681076922393753426"