Home

ACCESS‐NRI MOM6 wiki

This is the ACCESS-NRI fork of the MOM6 Ocean Model.

The canonical MOM6 repository is here: https://github.com/mom-ocean/MOM6

Fork Management

The default dev/access branch in this fork tracks the main branch of canonical MOM6 repository. Changes are accumulated in dev/access prior to being proposed upstream.

The process for proposing changes is as follows:

• Open an issue describing the need and context for your changes.
• Sync the dev/access branch with mom-ocean/MOM6:main. If there are no conflicts, this can be done using the "Sync fork" button from the Github web UI. If there are conflicts, they will need to be resolved at the command line - see the Github docs on syncing a fork.
• Checkout a feature branch from dev/access and make your changes.
• Submit a PR to merge your feature branch into dev/access.

The maintainers of this fork will periodically submit PRs to mom-ocean/MOM6:main to merge the accumulated changes in dev/access. PRs to upstream are submitted from "PR candidate" branches named dev-access-candidate-YYYYMMDD so that dev/access can continue during the review process (which can be slow).

Rejected changes cannot be included in dev/access since it is important that dev/access shares a common history with upstream and other MOM6 development centres. This means that in the case of rejected changes:

• those changes will need to be moved to another branch, fork or patch file(s).
• the dev/access branch will need to be reset to upstream.

Reviewing/testing PR candidates from other centres

New temporary branches should be created for testing PRs submitted to mom-ocean/MOM6:main from other centres.

For example, to create a branch to test this PR:

git remote add ncar git@github.com:NCAR/MOM6.git
git fetch ncar
git checkout dev/ncar-candidate-240319
git push origin dev/ncar-candidate-240319

Test branches should be deleted once the PR is closed.