-
Notifications
You must be signed in to change notification settings - Fork 0
Home
This is the ACCESS fork of CMEPS (ESCOMP/CMEPS/ -- the canonical repository), 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). It's built into access3-share using submodules.
This fork management approach is also used in many OM3 components, examples:
- https://github.com/access-nri/mom6/wiki;
- https://github.com/ACCESS-NRI/WW3/wiki;
- https://github.com/ACCESS-NRI/CICE/wiki.
Versions in this repository follow the upstream version, with a modifier for any fork (i.e. ACCESS) specific commits.
e.g.
cmeps1.1.32-1 is ACCESS version 1 based on the upstream version cmeps1.1.32
versions in this repository should be added to the git submodule here.
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 cmeps1.1.32-x branch contains some upstream CMEPS and some ACCESS specific commits since the upstream release of cmeps1.1.32. The git tags on this repository, cmeps1.1.32-0, cmeps1.1.32-1, cmeps1.1.32-2 etc all used commits from that branch.
In the future, some ACCESS specific commits from cmeps1.1.32-x will be re-applied to a new cmeps1.1.32-x branch if they are needed. Because they are re-applied on top of a new upstream version, they become new commits (with the same content) and have a new commit hash.