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 |
kieranricardo
left a comment
There was a problem hiding this comment.
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 <u5824685@anu.edu.au>
|
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-copybranch 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.35branch. I'll add separate comments elaborating on the choices for the different merge conflicts.