ACCESS-NRI / access-om3-configs

ACCESS-OM3 MOM6-CICE6 configurations
1 stars 8 forks source link

fix JRA55do inputs #123

Closed aekiss closed 1 month ago

aekiss commented 1 month ago

This PR replaces https://github.com/ACCESS-NRI/access-om3-configs/pull/113.

When cherry-picked to other branches, this will addresses https://github.com/COSIMA/access-om3/issues/208 https://github.com/COSIMA/om3-scripts/issues/27 https://github.com/COSIMA/om3-scripts/issues/29

Separate commits are used to facilitate the differing PRs needed for different configs (e.g. IAF).

aekiss commented 1 month ago

Oops, I should've used /g/data/vk83/configurations instead of /g/data/vk83/experiments. I'll fix it.

aekiss commented 1 month ago

Thanks @ezhilsabareesh8 has https://github.com/COSIMA/access-om3/commit/96f91599f746b4866bbd3f05ee6eb192ba70d391 been built? It's not in /g/data/ik11/spack/0.21.2/modules/access-om3/0.x.0/linux-rocky8-cascadelake/access-om3/

aekiss commented 1 month ago

PR now updated to use /g/data/vk83/configurations and datamode=JRA55do with updated exe. Test run seems ok.

@ezhilsabareesh8 can you have another look and approve if this look ok?

anton-seaice commented 1 month ago

!cherry-pick 3933627904916c7b08c54950abaf2abce0c23ad3..a5fd61b2c5b79556ef8a873f9f23f291796641b2 into dev-1deg_jra55do_ryf_wombatlite

github-actions[bot] commented 1 month ago

!cherry-pick 3933627904916c7b08c54950abaf2abce0c23ad3..a5fd61b2c5b79556ef8a873f9f23f291796641b2 into dev-1deg_jra55do_ryf_wombatlite

Automatic cherry-pick failed. Could not find commit(s) 3933627904916c7b08c54950abaf2abce0c23ad3..a5fd61b2c5b79556ef8a873f9f23f291796641b2 in dev-1deg_jra55do_ryf.

anton-seaice commented 1 month ago

!cherry-pick 3933627904916c7b08c54950abaf2abce0c23ad3 db5e8e8c77f3a595ec0e9a2726b4a610f4e57c79 654dbd78088208812de94fea87a9d43cb194cefa 3e839234e6dd762161473b8b7625dbfd61bf6663 1707a792ecadc1a39df2cdf110ad95290bab51e8 a5fd61b2c5b79556ef8a873f9f23f291796641b2 into dev-1deg_jra55do_ryf_wombatlite

github-actions[bot] commented 1 month ago

Automatic Git cherry-picking of commit(s) 3933627904916c7b08c54950abaf2abce0c23ad3 db5e8e8c77f3a595ec0e9a2726b4a610f4e57c79 654dbd78088208812de94fea87a9d43cb194cefa 3e839234e6dd762161473b8b7625dbfd61bf6663 1707a792ecadc1a39df2cdf110ad95290bab51e8 a5fd61b2c5b79556ef8a873f9f23f291796641b2 into dev-1deg_jra55do_ryf_wombatlite failed. This usually happens when cherry-picking results in a conflic or an empty commit. To manually cherry-pick the commits and open a pull request, please follow these instructions:

  1. Create new branch from target branch:
    git checkout dev-1deg_jra55do_ryf_wombatlite
    git pull
    git checkout -b cherry_pick_from_pr123_into_dev-1deg_jra55do_ryf_wombatlite
  2. Cherry-pick commits:
    git cherry-pick 3933627904916c7b08c54950abaf2abce0c23ad3 db5e8e8c77f3a595ec0e9a2726b4a610f4e57c79 654dbd78088208812de94fea87a9d43cb194cefa 3e839234e6dd762161473b8b7625dbfd61bf6663 1707a792ecadc1a39df2cdf110ad95290bab51e8 a5fd61b2c5b79556ef8a873f9f23f291796641b2
  3. Fix any conflicts and/or empty commits by following the instructions provided by Git.
  4. Push the new branch:
    git push --set-upstream origin cherry_pick_from_pr123_into_dev-1deg_jra55do_ryf_wombatlite
  5. Open a new pull request on github making sure the target branch is set to dev-1deg_jra55do_ryf_wombatlite.
anton-seaice commented 1 month ago

!cherry-pick https://github.com/ACCESS-NRI/access-om3-configs/commit/3933627904916c7b08c54950abaf2abce0c23ad3 https://github.com/ACCESS-NRI/access-om3-configs/commit/db5e8e8c77f3a595ec0e9a2726b4a610f4e57c79 https://github.com/ACCESS-NRI/access-om3-configs/commit/654dbd78088208812de94fea87a9d43cb194cefa https://github.com/ACCESS-NRI/access-om3-configs/commit/3e839234e6dd762161473b8b7625dbfd61bf6663 https://github.com/ACCESS-NRI/access-om3-configs/commit/1707a792ecadc1a39df2cdf110ad95290bab51e8 https://github.com/ACCESS-NRI/access-om3-configs/commit/a5fd61b2c5b79556ef8a873f9f23f291796641b2 into dev-025deg_jra55do_ryf

github-actions[bot] commented 1 month ago

!cherry-pick https://github.com/ACCESS-NRI/access-om3-configs/commit/3933627904916c7b08c54950abaf2abce0c23ad3 https://github.com/ACCESS-NRI/access-om3-configs/commit/db5e8e8c77f3a595ec0e9a2726b4a610f4e57c79 https://github.com/ACCESS-NRI/access-om3-configs/commit/654dbd78088208812de94fea87a9d43cb194cefa https://github.com/ACCESS-NRI/access-om3-configs/commit/3e839234e6dd762161473b8b7625dbfd61bf6663 https://github.com/ACCESS-NRI/access-om3-configs/commit/1707a792ecadc1a39df2cdf110ad95290bab51e8 https://github.com/ACCESS-NRI/access-om3-configs/commit/a5fd61b2c5b79556ef8a873f9f23f291796641b2 into dev-025deg_jra55do_ryf

Automatic cherry-pick failed. Could not find commit(s) https://github.com/ACCESS-NRI/access-om3-configs/commit/3933627904916c7b08c54950abaf2abce0c23ad3 https://github.com/ACCESS-NRI/access-om3-configs/commit/db5e8e8c77f3a595ec0e9a2726b4a610f4e57c79 https://github.com/ACCESS-NRI/access-om3-configs/commit/654dbd78088208812de94fea87a9d43cb194cefa https://github.com/ACCESS-NRI/access-om3-configs/commit/3e839234e6dd762161473b8b7625dbfd61bf6663 https://github.com/ACCESS-NRI/access-om3-configs/commit/1707a792ecadc1a39df2cdf110ad95290bab51e8 https://github.com/ACCESS-NRI/access-om3-configs/commit/a5fd61b2c5b79556ef8a873f9f23f291796641b2 in dev-1deg_jra55do_ryf.

anton-seaice commented 1 month ago

!cherry-pick 3933627904916c7b08c54950abaf2abce0c23ad3 db5e8e8c77f3a595ec0e9a2726b4a610f4e57c79 654dbd78088208812de94fea87a9d43cb194cefa 3e839234e6dd762161473b8b7625dbfd61bf6663 1707a792ecadc1a39df2cdf110ad95290bab51e8 a5fd61b2c5b79556ef8a873f9f23f291796641b2 into dev-025deg_jra55do_ryf

github-actions[bot] commented 1 month ago

Automatic Git cherry-picking of commit(s) 3933627904916c7b08c54950abaf2abce0c23ad3 db5e8e8c77f3a595ec0e9a2726b4a610f4e57c79 654dbd78088208812de94fea87a9d43cb194cefa 3e839234e6dd762161473b8b7625dbfd61bf6663 1707a792ecadc1a39df2cdf110ad95290bab51e8 a5fd61b2c5b79556ef8a873f9f23f291796641b2 into dev-025deg_jra55do_ryf failed. This usually happens when cherry-picking results in a conflic or an empty commit. To manually cherry-pick the commits and open a pull request, please follow these instructions:

  1. Create new branch from target branch:
    git checkout dev-025deg_jra55do_ryf
    git pull
    git checkout -b cherry_pick_from_pr123_into_dev-025deg_jra55do_ryf
  2. Cherry-pick commits:
    git cherry-pick 3933627904916c7b08c54950abaf2abce0c23ad3 db5e8e8c77f3a595ec0e9a2726b4a610f4e57c79 654dbd78088208812de94fea87a9d43cb194cefa 3e839234e6dd762161473b8b7625dbfd61bf6663 1707a792ecadc1a39df2cdf110ad95290bab51e8 a5fd61b2c5b79556ef8a873f9f23f291796641b2
  3. Fix any conflicts and/or empty commits by following the instructions provided by Git.
  4. Push the new branch:
    git push --set-upstream origin cherry_pick_from_pr123_into_dev-025deg_jra55do_ryf
  5. Open a new pull request on github making sure the target branch is set to dev-025deg_jra55do_ryf.