-
Notifications
You must be signed in to change notification settings - Fork 1
Home
Welcome to the ACCESS-CICE wiki!
This is fork of CICE, used for ACCCES3 models (currently ACCESS-OM3, see http://access-om3-configs.access-hive.org.au/ and https://github.com/accESS-NRI/access-om3-configs for details )
Versions in this repository follow the upstream version, with a modifier for any fork (i.e. ACCESS) specific commits.
e.g.
CICE6.6.0-1 is ACCESS version 1 based on the upstream version CICE6.6.0
versions in this repository should be added to the access-cice spack package
To update from upstream, any local commits need to be re-applied on top of the upstream commits. e.g. cherry-pick the access specific commits which are needed onto the desired upstream version
For a release, make a new branch with the name <upstream-version>-x and version the release <upstream-version>-0, to represent the first ACCESS release based on <upstream-version>. For changes without updating from upstream (or updating between upstream releases), add the changes to this same branch and increment the access version only.
For example, the CICE6.6.0-x branch contains some CICE-consortium and some ACCESS specific commits since the CICE-consortium release of CICE6.6.0. The git tags on this repository, CICE6.6.0-0, CICE6.6.0-1, CICE6.6.0-2 etc all used commits from that branch.
In the future, some ACCESS specific commits from CICE6.6.0-x will be re-applied to a new CICE6.7.0-x branch if they are needed. Because they are re-applied ontop of a new upstream version, they become new commits (with the same content) and have a new commit hash.