From 43e91745cc9b8cb0738f185618170b68bb763e0a Mon Sep 17 00:00:00 2001 From: "github-actions[bot]" <41898282+github-actions[bot]@users.noreply.github.com> Date: Thu, 11 Apr 2024 04:08:46 +0000 Subject: [PATCH 1/6] Added initial checksums generated from release-01deg_jra55_iaf_bgc --- metadata.yaml | 4 +- testing/checksum/historical-3hr-checksum.json | 369 ++++++++++++++++++ 2 files changed, 371 insertions(+), 2 deletions(-) create mode 100644 testing/checksum/historical-3hr-checksum.json diff --git a/metadata.yaml b/metadata.yaml index 06bd18f6..6fe0d3b7 100644 --- a/metadata.yaml +++ b/metadata.yaml @@ -26,7 +26,7 @@ keywords: - JRA55 - interannual - access-om2-01 -version: null +version: "2.0" realm: - ocean - seaIce @@ -35,4 +35,4 @@ nominal_resolution: 10 km reference: https://doi.org/10.5194/gmd-13-401-2020 license: CC-BY-4.0 url: https://github.com/ACCESS-NRI/access-om2-configs/tree/release-01deg_jra55_iaf_bgc -model: access-om2-bgc +model: access-om2-bgc diff --git a/testing/checksum/historical-3hr-checksum.json b/testing/checksum/historical-3hr-checksum.json new file mode 100644 index 00000000..d2c37cd8 --- /dev/null +++ b/testing/checksum/historical-3hr-checksum.json @@ -0,0 +1,369 @@ +{ + "schema_version": "1-0-0", + "output": { + "xt": [ + "-8034147111494819151" + ], + "xu": [ + "1181928651118804837" + ], + "yt": [ + "8201450824554186114" + ], + "yu": [ + "8207976630208734077" + ], + "dxt": [ + "-3705614679736144149" + ], + "dxu": [ + "-3702264151164812765" + ], + "dyt": [ + "-2742960789918998709" + ], + "dyu": [ + "-2740063750834574862" + ], + "dat": [ + "5092331269373388838" + ], + "dau": [ + "5098525894210749656" + ], + "dxtn": [ + "-3702418682898777446" + ], + "dytn": [ + "-2739938610493522510" + ], + "dxte": [ + "-3705461952009937526" + ], + "dyte": [ + "-2743086076374193657" + ], + "dxun": [ + "-3699071737375098495" + ], + "dyun": [ + "-2737017152527893107" + ], + "dxue": [ + "-3702110994572392515" + ], + "dyue": [ + "-2740195414294629316" + ], + "dtn+dts": [ + "-2742960789918998709" + ], + "dun+dus": [ + "-2740063750834574862" + ], + "dte+dtw": [ + "-3705614679736144149" + ], + "due+duw": [ + "-3702264151164812765" + ], + "dte": [ + "-4885481042972946538" + ], + "dtw": [ + "-4885634831786780675" + ], + "due": [ + "-4882131202881836232" + ], + "duw": [ + "-4882284672318520472" + ], + "sin_rot": [ + "-2708234264262665098" + ], + "cos_rot": [ + "5911012626299441831" + ], + "ht": [ + "-6115399843444686848" + ], + "hu": [ + "-3150563670392569856" + ], + "htr": [ + "-1383399679723272254" + ], + "kmu": [ + "212348" + ], + "kmt": [ + "215089" + ], + "Zonal velocity": [ + "-7041711812585786936", + "6827696125224651764" + ], + "Meridional velocity": [ + "-7041711812585786936", + "-2015881717187427893" + ], + "Advection of u": [ + "0", + "-6030637310235604706" + ], + "Advection of v": [ + "0", + "-185742899745698524" + ], + "rho(taup1)": [ + "-4870574186649091102", + "4196049486174998091" + ], + "pressure_at_depth": [ + "1166850967010087432", + "-8094756630547342305" + ], + "denominator_r": [ + "-8577873584889190525", + "-5114652064464666028" + ], + "drhodT": [ + "0", + "-1018066369609856155" + ], + "drhodS": [ + "0", + "1409226365063228960" + ], + "drhodz_zt": [ + "-5564988440240921457", + "667895960666276144" + ], + "temp": [ + "2012956832363876583" + ], + "salt": [ + "-6199328179223031808" + ], + "adic": [ + "-6021080377389855517" + ], + "caco3": [ + "3376180104569768636" + ], + "alk": [ + "-2849321546074927639" + ], + "dic": [ + "-8812798457300790526" + ], + "no3": [ + "7715344992415358761" + ], + "phy": [ + "-5806027024382247154" + ], + "o2": [ + "-7053371167279765929" + ], + "fe": [ + "8146029611621377111" + ], + "zoo": [ + "4389444046236972878" + ], + "det": [ + "-6014276422023825515" + ], + "age_global": [ + "-3012559306835433806" + ], + "pot_temp": [ + "-5844855379287172632" + ], + "frazil": [ + "-7376446845324287717" + ], + "ending bih_viscosity": [ + "-6883842654311872118" + ], + "eta_t": [ + "-8880247787235429980" + ], + "eta_u": [ + "-6423898340638421351" + ], + "deta_dt": [ + "8621933274870720187" + ], + "eta_t_bar": [ + "2448827562614526943" + ], + "pbot_t": [ + "4094002110405051708" + ], + "pbot_u": [ + "7579523562263384935" + ], + "dpbot_dt": [ + "0" + ], + "anompb": [ + "7135124254037105776" + ], + "anompb_bar": [ + "0" + ], + "patm_t": [ + "0" + ], + "dpatm_dt": [ + "0" + ], + "ps": [ + "3544131118026999512" + ], + "grad_ps_1": [ + "-1131444633336875982" + ], + "grad_ps_2": [ + "5405865035096511711" + ], + "grad_anompb_1": [ + "0" + ], + "grad_anompb_2": [ + "0" + ], + "udrho": [ + "-120869054089417423" + ], + "vdrho": [ + "4295395860269501033" + ], + "conv_rho_ud_t": [ + "-4636260355079558862" + ], + "source": [ + "-2490895151513198494" + ], + "eta smoother": [ + "-2490895151513198494" + ], + "pbot smoother": [ + "0" + ], + "eta_nonbouss": [ + "-3909177206647941254" + ], + "forcing_u_bt": [ + "3778113873852941758" + ], + "forcing_v_bt": [ + "8753527312505484173" + ], + "Thickness%rho_dzt(taup1)": [ + "-6158638367159175018" + ], + "Thickness%rho_dzu(taup1)": [ + "-20274190879418989" + ], + "Thickness%mass_u(taup1)": [ + "-7409693107027317456" + ], + "Thickness%rho_dzten(1)": [ + "1889846198171387320" + ], + "Thickness%rho_dzten(2)": [ + "4602134097123408758" + ], + "Thickness%rho_dztr": [ + "-9195934179368444144" + ], + "Thickness%rho_dzur": [ + "5336092687421654010" + ], + "Thickness%rho_dzt_tendency": [ + "9204702115326724140" + ], + "Thickness%dzt": [ + "-2949945077572729267" + ], + "Thickness%dzten(1)": [ + "6893098008364569319" + ], + "Thickness%dzten(2)": [ + "-8889086696537590410" + ], + "Thickness%dztlo": [ + "-8768331654639173838" + ], + "Thickness%dztup": [ + "-8840917840356356324" + ], + "Thickness%dzt_dst": [ + "-446612494965599123" + ], + "Thickness%dzwt(k=0)": [ + "-7892237458583830276" + ], + "Thickness%dzwt(k=1:nk)": [ + "987158147498255044" + ], + "Thickness%dzu": [ + "468807661367685448" + ], + "Thickness%dzwu(k=0)": [ + "7991260398710831347" + ], + "Thickness%dzwu(k=1:nk)": [ + "3322791242666882708" + ], + "Thickness%depth_zt": [ + "-2033043237935273486" + ], + "Thickness%geodepth_zt": [ + "8795879425777356928" + ], + "Thickness%depth_zu": [ + "3063832067587426167" + ], + "Thickness%depth_zwt": [ + "-2281127648346647995" + ], + "Thickness%depth_zwu": [ + "-7788005483518300569" + ], + "Thickness%depth_st": [ + "-1759098274750011954" + ], + "Thickness%depth_swt": [ + "-3279862611256016896" + ], + "Thickness%dst": [ + "-561797207821385728" + ], + "Thickness%dstlo": [ + "-6380092873483100976" + ], + "Thickness%dstup": [ + "-6452889649401759616" + ], + "Thickness%dswt(k=0)": [ + "-4040621995610603520" + ], + "Thickness%dswt(k=1:nk)": [ + "462104465433539992" + ], + "Thickness%pbot0": [ + "-8921843325764352856" + ], + "Thickness%mass_en(1)": [ + "-6447840589883442827" + ], + "Thickness%mass_en(2)": [ + "-5100448633121009369" + ] + } +} \ No newline at end of file From 191810cecf07d0dc6eccace294956dcec55ddf16 Mon Sep 17 00:00:00 2001 From: anton-climate Date: Thu, 18 Apr 2024 08:58:44 +1000 Subject: [PATCH 2/6] 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 e0c978ff..7197b431 100644 --- a/config.yaml +++ b/config.yaml @@ -73,8 +73,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 6bc5fb52..c3c90802 100644 --- a/manifests/input.yaml +++ b/manifests/input.yaml @@ -3433,10 +3433,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.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 @@ -3445,10 +3445,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 1fdf72d0cffdb101330db56f40e1e940b9a40f76 Mon Sep 17 00:00:00 2001 From: Tommy Gatti Date: Wed, 19 Jun 2024 13:22:28 +1000 Subject: [PATCH 3/6] 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 850a8f62c743bd7cee7177b85fc863764c1f223b Mon Sep 17 00:00:00 2001 From: dougiesquire Date: Wed, 3 Jul 2024 10:27:12 +1000 Subject: [PATCH 4/6] 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 7197b431..17057374 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/qv56/replicas/input4MIPs/CMIP6/OMIP/MRI/MRI-JRA55-do-1-4-0/atmos/3hr/rsds/gr/v20190429 @@ -46,7 +46,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 @@ -71,7 +71,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 d8cb73c0e4eb9fa30e503ea3fa022068929be4e4 Mon Sep 17 00:00:00 2001 From: anton-climate Date: Thu, 18 Apr 2024 08:58:44 +1000 Subject: [PATCH 5/6] 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 e0c978ff..7197b431 100644 --- a/config.yaml +++ b/config.yaml @@ -73,8 +73,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 6bc5fb52..c3c90802 100644 --- a/manifests/input.yaml +++ b/manifests/input.yaml @@ -3433,10 +3433,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.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 @@ -3445,10 +3445,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 4f8bba9b337ef78348156773980fd1d9839f9cfa Mon Sep 17 00:00:00 2001 From: "access-bot[bot]" <113399144+access-bot@users.noreply.github.com> Date: Wed, 10 Jul 2024 06:58:11 +0000 Subject: [PATCH 6/6] Updated checksums and bumped version to 3.0 as part of https://github.com/ACCESS-NRI/access-om2-configs/actions/runs/9869599671 --- 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 6fe0d3b7..5ebe7f3e 100644 --- a/metadata.yaml +++ b/metadata.yaml @@ -26,7 +26,7 @@ keywords: - JRA55 - interannual - 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 d2c37cd8..67410a65 100644 --- a/testing/checksum/historical-3hr-checksum.json +++ b/testing/checksum/historical-3hr-checksum.json @@ -102,115 +102,115 @@ ], "Zonal velocity": [ "-7041711812585786936", - "6827696125224651764" + "5995667360690666869" ], "Meridional velocity": [ "-7041711812585786936", - "-2015881717187427893" + "-7787270711746013894" ], "Advection of u": [ "0", - "-6030637310235604706" + "-6851658256333481521" ], "Advection of v": [ "0", - "-185742899745698524" + "-2231802981572564633" ], "rho(taup1)": [ "-4870574186649091102", - "4196049486174998091" + "4196127688229595629" ], "pressure_at_depth": [ "1166850967010087432", - "-8094756630547342305" + "-8095049290669182001" ], "denominator_r": [ "-8577873584889190525", - "-5114652064464666028" + "-5116940411442309538" ], "drhodT": [ "0", - "-1018066369609856155" + "-841076459126988268" ], "drhodS": [ "0", - "1409226365063228960" + "1408049286525551722" ], "drhodz_zt": [ "-5564988440240921457", - "667895960666276144" + "-6891231040355891139" ], "temp": [ - "2012956832363876583" + "-7799433604392859163" ], "salt": [ - "-6199328179223031808" + "-6196098734158114608" ], "adic": [ - "-6021080377389855517" + "-6007455668426316164" ], "caco3": [ - "3376180104569768636" + "3320289178517618906" ], "alk": [ - "-2849321546074927639" + "-2845810857591310851" ], "dic": [ - "-8812798457300790526" + "-8800616104883273003" ], "no3": [ - "7715344992415358761" + "-1699556764921069701" ], "phy": [ - "-5806027024382247154" + "533303249623320816" ], "o2": [ - "-7053371167279765929" + "-7132712779843794846" ], "fe": [ - "8146029611621377111" + "8180905996017189683" ], "zoo": [ - "4389444046236972878" + "4389380523546907845" ], "det": [ - "-6014276422023825515" + "-6411278977161766880" ], "age_global": [ - "-3012559306835433806" + "-2501238604226907475" ], "pot_temp": [ - "-5844855379287172632" + "-6523620436425024955" ], "frazil": [ - "-7376446845324287717" + "319920196120269569" ], "ending bih_viscosity": [ - "-6883842654311872118" + "-6834291218683894874" ], "eta_t": [ - "-8880247787235429980" + "-8816933854789166933" ], "eta_u": [ - "-6423898340638421351" + "2862209628155854215" ], "deta_dt": [ - "8621933274870720187" + "8246917867594749708" ], "eta_t_bar": [ - "2448827562614526943" + "2324093158712943689" ], "pbot_t": [ - "4094002110405051708" + "4093973165897788228" ], "pbot_u": [ - "7579523562263384935" + "7579492982533287788" ], "dpbot_dt": [ "0" ], "anompb": [ - "7135124254037105776" + "7139757520869300040" ], "anompb_bar": [ "0" @@ -222,13 +222,13 @@ "0" ], "ps": [ - "3544131118026999512" + "3424704929495140745" ], "grad_ps_1": [ - "-1131444633336875982" + "8848296604629659861" ], "grad_ps_2": [ - "5405865035096511711" + "6070419862538717584" ], "grad_anompb_1": [ "0" @@ -237,103 +237,103 @@ "0" ], "udrho": [ - "-120869054089417423" + "-9041855402149857170" ], "vdrho": [ - "4295395860269501033" + "4317654600428520546" ], "conv_rho_ud_t": [ - "-4636260355079558862" + "3737631733144753449" ], "source": [ - "-2490895151513198494" + "7192499051317460726" ], "eta smoother": [ - "-2490895151513198494" + "7192499051317460726" ], "pbot smoother": [ "0" ], "eta_nonbouss": [ - "-3909177206647941254" + "-3832789143566820051" ], "forcing_u_bt": [ - "3778113873852941758" + "-4349007597236944578" ], "forcing_v_bt": [ - "8753527312505484173" + "508881505260474815" ], "Thickness%rho_dzt(taup1)": [ - "-6158638367159175018" + "-6159071676320755769" ], "Thickness%rho_dzu(taup1)": [ - "-20274190879418989" + "-20864707059974072" ], "Thickness%mass_u(taup1)": [ - "-7409693107027317456" + "-7409728202622784155" ], "Thickness%rho_dzten(1)": [ - "1889846198171387320" + "1889265545537116378" ], "Thickness%rho_dzten(2)": [ - "4602134097123408758" + "4601659257535094358" ], "Thickness%rho_dztr": [ - "-9195934179368444144" + "-9195489705774684241" ], "Thickness%rho_dzur": [ - "5336092687421654010" + "5336704871966747727" ], "Thickness%rho_dzt_tendency": [ - "9204702115326724140" + "-4049541272562096384" ], "Thickness%dzt": [ - "-2949945077572729267" + "-2950394897217244850" ], "Thickness%dzten(1)": [ - "6893098008364569319" + "6892493311520991146" ], "Thickness%dzten(2)": [ - "-8889086696537590410" + "-8889580887192788593" ], "Thickness%dztlo": [ - "-8768331654639173838" + "-8768781474380023077" ], "Thickness%dztup": [ - "-8840917840356356324" + "-8841367660274834690" ], "Thickness%dzt_dst": [ - "-446612494965599123" + "-447349818855151573" ], "Thickness%dzwt(k=0)": [ - "-7892237458583830276" + "-7892257596803756839" ], "Thickness%dzwt(k=1:nk)": [ - "987158147498255044" + "986714355369028399" ], "Thickness%dzu": [ - "468807661367685448" + "468194407751654384" ], "Thickness%dzwu(k=0)": [ - "7991260398710831347" + "7991233343918013348" ], "Thickness%dzwu(k=1:nk)": [ - "3322791242666882708" + "3322189891386858104" ], "Thickness%depth_zt": [ - "-2033043237935273486" + "-2033474940647515054" ], "Thickness%geodepth_zt": [ - "8795879425777356928" + "8800705036341007617" ], "Thickness%depth_zu": [ - "3063832067587426167" + "3063237966504045151" ], "Thickness%depth_zwt": [ - "-2281127648346647995" + "-2281549737577527282" ], "Thickness%depth_zwu": [ - "-7788005483518300569" + "-7788588691378757057" ], "Thickness%depth_st": [ "-1759098274750011954" @@ -360,10 +360,10 @@ "-8921843325764352856" ], "Thickness%mass_en(1)": [ - "-6447840589883442827" + "-6447873548520734057" ], "Thickness%mass_en(2)": [ - "-5100448633121009369" + "-5100474835547961110" ] } } \ No newline at end of file