From 960fc2570501923565ff564c2150a91da26dce47 Mon Sep 17 00:00:00 2001 From: anton-climate Date: Thu, 18 Apr 2024 08:58:44 +1000 Subject: [PATCH 1/5] 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 3f8b0b18..0b74b350 100644 --- a/config.yaml +++ b/config.yaml @@ -63,8 +63,8 @@ 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_3600x2700_90x90_722p.exe input: - - /g/data/vk83/experiments/inputs/access-om2/ice/grids/global.01deg/2020.05.30/grid.nc - - /g/data/vk83/experiments/inputs/access-om2/ice/grids/global.01deg/2020.05.30/kmt.nc + - /g/data/vk83/experiments/inputs/access-om2/ice/grids/global.01deg/2024.04.17/grid.nc + - /g/data/vk83/experiments/inputs/access-om2/ice/grids/global.01deg/2024.04.17/kmt.nc - /g/data/vk83/experiments/inputs/access-om2/ice/initial_conditions_biogeochemistry/global.01deg/2022.02.24/o2i.nc - /g/data/vk83/experiments/inputs/access-om2/ice/initial_conditions_biogeochemistry/global.01deg/2022.02.24/i2o.nc - /g/data/vk83/experiments/inputs/access-om2/ice/initial_conditions/global.01deg/2020.05.30/u_star.nc diff --git a/manifests/input.yaml b/manifests/input.yaml index 79f19bfc..e84c66be 100644 --- a/manifests/input.yaml +++ b/manifests/input.yaml @@ -83,10 +83,10 @@ work/atmosphere/INPUT/rmp_jrar_to_cict_CONSERV.nc: md5: 08f3f762a1b005d4ba90f5ceef5ccc74 work/ice/RESTART/grid.nc: copy: true - fullpath: /g/data/vk83/experiments/inputs/access-om2/ice/grids/global.01deg/2020.05.30/grid.nc + fullpath: /g/data/vk83/experiments/inputs/access-om2/ice/grids/global.01deg/2024.04.17/grid.nc hashes: - binhash: 6747a890dcea1c980c81835c74b80c08 - md5: 189f572cf886440edd5ac6dab40df3d8 + binhash: d71c0256388855eb6c2e7ab27997fdde + md5: ab3458bf0c16cc5e2e72f59b705de313 work/ice/RESTART/i2o.nc: copy: true fullpath: /g/data/vk83/experiments/inputs/access-om2/ice/initial_conditions_biogeochemistry/global.01deg/2022.02.24/i2o.nc @@ -95,10 +95,10 @@ work/ice/RESTART/i2o.nc: md5: c06055d70383aec3de3573b97f57c7fc work/ice/RESTART/kmt.nc: copy: true - fullpath: /g/data/vk83/experiments/inputs/access-om2/ice/grids/global.01deg/2020.05.30/kmt.nc + fullpath: /g/data/vk83/experiments/inputs/access-om2/ice/grids/global.01deg/2024.04.17/kmt.nc hashes: - binhash: edb45020ad070277a5773fe057c9f18c - md5: a46c01045f519b9002b10f82df6ad376 + binhash: f17083b7d13413de60466ba220b05860 + md5: 8c12f286b56ff171287753986e72d5cb work/ice/RESTART/monthly_sstsss.nc: copy: true fullpath: /g/data/vk83/experiments/inputs/access-om2/ice/initial_conditions/global.01deg/2020.05.30/monthly_sstsss.nc From ad1419071b3007fa8e771cfbb8e67536c763caa8 Mon Sep 17 00:00:00 2001 From: Tommy Gatti Date: Wed, 19 Jun 2024 13:24:43 +1000 Subject: [PATCH 2/5] 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/pr-2-confirm.yml | 160 ----------------------- .github/workflows/validate-json.yml | 13 -- 5 files changed, 51 insertions(+), 217 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 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/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 042fbe75f63ca40dcd9629a11fd47f43b3284362 Mon Sep 17 00:00:00 2001 From: dougiesquire Date: Wed, 3 Jul 2024 10:19:36 +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 0b74b350..c88df6af 100644 --- a/config.yaml +++ b/config.yaml @@ -28,7 +28,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.01deg/2020.05.30/rmp_jrar_to_cict_CONSERV.nc - /g/data/vk83/experiments/inputs/JRA-55/RYF/v1-4/data @@ -36,7 +36,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.01deg/2022.02.24/bgc_param.nc - /g/data/vk83/experiments/inputs/access-om2/ocean/biogeochemistry/global.01deg/2022.02.24/co2_iaf.nc @@ -61,7 +61,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_3600x2700_90x90_722p.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_3600x2700_90x90_722p.exe input: - /g/data/vk83/experiments/inputs/access-om2/ice/grids/global.01deg/2024.04.17/grid.nc - /g/data/vk83/experiments/inputs/access-om2/ice/grids/global.01deg/2024.04.17/kmt.nc diff --git a/manifests/exe.yaml b/manifests/exe.yaml index 947728b5..2f4842e0 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_3600x2700_90x90_722p.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_3600x2700_90x90_722p.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_3600x2700_90x90_722p.exe hashes: - binhash: 67dd37413d389fc240c8ca24e3337fba - md5: f2787a34fcedaedc63a979c260e1c82d + binhash: 867400f6e6f168218c25c7dbc2d1062e + md5: bec4ef9abc0eb0299e449e0c8b5c57e5 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 From 6cd10fa841219fd7819565d6af3cc7cde684e4b8 Mon Sep 17 00:00:00 2001 From: anton-climate Date: Thu, 18 Apr 2024 08:58:44 +1000 Subject: [PATCH 4/5] 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 3f8b0b18..0b74b350 100644 --- a/config.yaml +++ b/config.yaml @@ -63,8 +63,8 @@ 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_3600x2700_90x90_722p.exe input: - - /g/data/vk83/experiments/inputs/access-om2/ice/grids/global.01deg/2020.05.30/grid.nc - - /g/data/vk83/experiments/inputs/access-om2/ice/grids/global.01deg/2020.05.30/kmt.nc + - /g/data/vk83/experiments/inputs/access-om2/ice/grids/global.01deg/2024.04.17/grid.nc + - /g/data/vk83/experiments/inputs/access-om2/ice/grids/global.01deg/2024.04.17/kmt.nc - /g/data/vk83/experiments/inputs/access-om2/ice/initial_conditions_biogeochemistry/global.01deg/2022.02.24/o2i.nc - /g/data/vk83/experiments/inputs/access-om2/ice/initial_conditions_biogeochemistry/global.01deg/2022.02.24/i2o.nc - /g/data/vk83/experiments/inputs/access-om2/ice/initial_conditions/global.01deg/2020.05.30/u_star.nc diff --git a/manifests/input.yaml b/manifests/input.yaml index 79f19bfc..e84c66be 100644 --- a/manifests/input.yaml +++ b/manifests/input.yaml @@ -83,10 +83,10 @@ work/atmosphere/INPUT/rmp_jrar_to_cict_CONSERV.nc: md5: 08f3f762a1b005d4ba90f5ceef5ccc74 work/ice/RESTART/grid.nc: copy: true - fullpath: /g/data/vk83/experiments/inputs/access-om2/ice/grids/global.01deg/2020.05.30/grid.nc + fullpath: /g/data/vk83/experiments/inputs/access-om2/ice/grids/global.01deg/2024.04.17/grid.nc hashes: - binhash: 6747a890dcea1c980c81835c74b80c08 - md5: 189f572cf886440edd5ac6dab40df3d8 + binhash: d71c0256388855eb6c2e7ab27997fdde + md5: ab3458bf0c16cc5e2e72f59b705de313 work/ice/RESTART/i2o.nc: copy: true fullpath: /g/data/vk83/experiments/inputs/access-om2/ice/initial_conditions_biogeochemistry/global.01deg/2022.02.24/i2o.nc @@ -95,10 +95,10 @@ work/ice/RESTART/i2o.nc: md5: c06055d70383aec3de3573b97f57c7fc work/ice/RESTART/kmt.nc: copy: true - fullpath: /g/data/vk83/experiments/inputs/access-om2/ice/grids/global.01deg/2020.05.30/kmt.nc + fullpath: /g/data/vk83/experiments/inputs/access-om2/ice/grids/global.01deg/2024.04.17/kmt.nc hashes: - binhash: edb45020ad070277a5773fe057c9f18c - md5: a46c01045f519b9002b10f82df6ad376 + binhash: f17083b7d13413de60466ba220b05860 + md5: 8c12f286b56ff171287753986e72d5cb work/ice/RESTART/monthly_sstsss.nc: copy: true fullpath: /g/data/vk83/experiments/inputs/access-om2/ice/initial_conditions/global.01deg/2020.05.30/monthly_sstsss.nc From 45800aa633767de553d201b6984cf930b2ba9408 Mon Sep 17 00:00:00 2001 From: "access-bot[bot]" <113399144+access-bot@users.noreply.github.com> Date: Wed, 10 Jul 2024 06:56:40 +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/9869583861 --- metadata.yaml | 2 +- testing/checksum/historical-3hr-checksum.json | 140 +++++++++--------- 2 files changed, 71 insertions(+), 71 deletions(-) diff --git a/metadata.yaml b/metadata.yaml index 310dd0bb..d98b68a5 100644 --- a/metadata.yaml +++ b/metadata.yaml @@ -17,7 +17,7 @@ keywords: - JRA55 - repeat-year - access-om2-01 -version: "2.0" +version: "3.0" realm: - ocean - seaIce diff --git a/testing/checksum/historical-3hr-checksum.json b/testing/checksum/historical-3hr-checksum.json index 81ffd778..ec43c07e 100644 --- a/testing/checksum/historical-3hr-checksum.json +++ b/testing/checksum/historical-3hr-checksum.json @@ -102,115 +102,115 @@ ], "Zonal velocity": [ "-7041711812585786936", - "2209613583122447350" + "3612293351038297976" ], "Meridional velocity": [ "-7041711812585786936", - "5866309096039620874" + "2843643331271722923" ], "Advection of u": [ "0", - "3269416833538101082" + "7446314475939700289" ], "Advection of v": [ "0", - "9008899800792792331" + "5965934963573859500" ], "rho(taup1)": [ "-4870574186649091102", - "4238227500205652782" + "4238375569859789186" ], "pressure_at_depth": [ "1166850967010087432", - "-8463758729819842106" + "-8464894103092080396" ], "denominator_r": [ "-8577873584889190525", - "-4891031132296079024" + "-4898098533718063292" ], "drhodT": [ "0", - "-6869149931132111786" + "2817429130986226571" ], "drhodS": [ "0", - "1856297141636817094" + "1852789056854081012" ], "drhodz_zt": [ "-5564988440240921457", - "2071007823644450272" + "-1485651185568638328" ], "temp": [ - "1199424367935570975" + "-7940027653892287650" ], "salt": [ - "408347774827208613" + "414402651807747534" ], "adic": [ - "-2151692493267595483" + "-2124219583297735995" ], "caco3": [ - "3332393285617432108" + "3339408138713623481" ], "alk": [ - "-4072446080574095178" + "-4046802534292793754" ], "dic": [ - "7430142665278272667" + "7454434872451272687" ], "no3": [ - "-2939932578607334281" + "-5555018474261351512" ], "phy": [ - "-5265560010569185180" + "-5242623108391672978" ], "o2": [ - "4372872681746629634" + "4279734637591915305" ], "fe": [ - "-3177973020211090333" + "-3007744198098506338" ], "zoo": [ - "3539289586974762895" + "3538045983300644381" ], "det": [ - "3960272014591520404" + "3922516877910181299" ], "age_global": [ - "4252633210674942326" + "4148331904752166117" ], "pot_temp": [ - "4824307663960508367" + "4778314304440155751" ], "frazil": [ - "3840699642962569304" + "2677826302059084477" ], "ending bih_viscosity": [ - "7386812743710318054" + "8765406410628393893" ], "eta_t": [ - "8141245579483241554" + "8739633841000397743" ], "eta_u": [ - "-3474792745038800471" + "-3306639180699478955" ], "deta_dt": [ - "8258890714450900634" + "7148745994202877642" ], "eta_t_bar": [ - "-7183343825994028741" + "2282466167729428327" ], "pbot_t": [ - "4050815580543237396" + "4050706414668770867" ], "pbot_u": [ - "7531157969929004360" + "7531076614787383880" ], "dpbot_dt": [ "0" ], "anompb": [ - "-7804227339924074432" + "-7765772085435972740" ], "anompb_bar": [ "0" @@ -222,13 +222,13 @@ "0" ], "ps": [ - "-1889696007881033786" + "7547106267454675353" ], "grad_ps_1": [ - "-7390995698768506841" + "1807713838339047878" ], "grad_ps_2": [ - "-6600451034346391349" + "3619681500662019755" ], "grad_anompb_1": [ "0" @@ -237,103 +237,103 @@ "0" ], "udrho": [ - "-4599964166425989526" + "4514222201887830617" ], "vdrho": [ - "-7225122048948425362" + "2132332501384444378" ], "conv_rho_ud_t": [ - "2716901144073649854" + "-6491529326615932912" ], "source": [ - "4959696770796471306" + "409202167469658323" ], "eta smoother": [ - "4959696770796471306" + "409202167469658323" ], "pbot smoother": [ "0" ], "eta_nonbouss": [ - "-7136709439376006934" + "2226254793708050671" ], "forcing_u_bt": [ - "-6394599357229800577" + "-5267733391992342833" ], "forcing_v_bt": [ - "7973681832051215301" + "-998714559845908536" ], "Thickness%rho_dzt(taup1)": [ - "-6873646558002525651" + "-6875108292843370161" ], "Thickness%rho_dzu(taup1)": [ - "-1087607075488071437" + "-1089081121939787732" ], "Thickness%mass_u(taup1)": [ - "-7492929477618011276" + "-7493039825394266360" ], "Thickness%rho_dzten(1)": [ - "874026185282251948" + "872320632203239374" ], "Thickness%rho_dzten(2)": [ - "3571429753290406774" + "3569729339681972142" ], "Thickness%rho_dztr": [ - "-8584486403045294508" + "-8583016650458562109" ], "Thickness%rho_dzur": [ - "6329576181268532563" + "6331054569911096567" ], "Thickness%rho_dzt_tendency": [ - "-4846612015677003116" + "12400312994221079" ], "Thickness%dzt": [ - "-3621450657057409904" + "-3622940892379777900" ], "Thickness%dzten(1)": [ - "5904860497719498240" + "5903127670426054197" ], "Thickness%dzten(2)": [ - "8557773332995625804" + "8556041908578831231" ], "Thickness%dztlo": [ - "9006909437692098163" + "9005419203723270167" ], "Thickness%dztup": [ - "8934318083026765215" + "8932827846166540599" ], "Thickness%dzt_dst": [ - "-2768078500611171570" + "-2770320222427359165" ], "Thickness%dzwt(k=0)": [ - "-7922396055587008117" + "-7922476128553489549" ], "Thickness%dzwt(k=1:nk)": [ - "348552172105768568" + "347076093351425965" ], "Thickness%dzu": [ - "-571800376000738434" + "-573299716548898021" ], "Thickness%dzwu(k=0)": [ - "7926854635784243528" + "7926770785801639587" ], "Thickness%dzwu(k=1:nk)": [ - "2334682829424596292" + "2333194400786323259" ], "Thickness%depth_zt": [ - "-2640158535584578912" + "-2641597691773818437" ], "Thickness%geodepth_zt": [ - "6847440890387087412" + "6841597408880394908" ], "Thickness%depth_zu": [ - "2079771486541170883" + "2078323704927479157" ], "Thickness%depth_zwt": [ - "-2931829302064674510" + "-2933237607170919130" ], "Thickness%depth_zwu": [ - "-8803441900329072681" + "-8804859498976608780" ], "Thickness%depth_st": [ "-1759098274750011954" @@ -360,10 +360,10 @@ "-8921843325764352856" ], "Thickness%mass_en(1)": [ - "-6511026612940068958" + "-6511116636501260662" ], "Thickness%mass_en(2)": [ - "-5172360688956963424" + "-5172444857085166924" ] } } \ No newline at end of file