-
Notifications
You must be signed in to change notification settings - Fork 0
New issue
Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.
By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.
Already on GitHub? Sign in to your account
Update to CMEPS 1.0.25 #4
Update to CMEPS 1.0.25 #4
Conversation
Notes on the merge conflicts:
Here I used the
Again I used the change from There's an analogous conflict in |
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
Looks good - nice work getting this running!
Just some old comments and logging of mine that I think we can delete now
Co-authored-by: Kieran Ricardo <[email protected]>
Thanks @kieranricardo! Merging now |
This PR forms part of the work for ACCESS-NRI/dev_coupling#51
It merges our version of CMEPS, based on version 0.14.35, with CMEPS1.0.25, which is the version currently used in OM3.
I'm using a duplicate
access-cmeps-0.14.35-merge-copy
branch because resolving the merge conflicts applies a merge commit to the feature branch, and I'm hoping to not break our originalaccess-cmeps-0.14.35
branch. I'll add separate comments elaborating on the choices for the different merge conflicts.