Skip to content
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 MOM6: routine maintenance-2022-11-10 #12

Merged
merged 2 commits into from
Nov 14, 2022

Conversation

sanAkel
Copy link
Collaborator

@sanAkel sanAkel commented Nov 11, 2022

This PR updates GEOS- MOM6 CMakeLists.txt to be consistent with mom-ocean/MOM6#1586 once that is merged.

This PR changes answers because of community agreed upon change in MOM6 defaults, impacts only the MOM6 based GEOS coupled model.

Steps to follow:

Thank you!

@sanAkel sanAkel added Non 0-diff The changes in this pull request are non-zero-diff enhancement New feature or request labels Nov 11, 2022
@sanAkel sanAkel self-assigned this Nov 11, 2022
@sanAkel sanAkel marked this pull request as ready for review November 12, 2022 17:02
@sanAkel sanAkel requested a review from a team as a code owner November 12, 2022 17:02
@mathomp4
Copy link
Member

@sanAkel It looks like @marshallward did the merge. If all is good for you, I can update the fork.

@sanAkel
Copy link
Collaborator Author

sanAkel commented Nov 14, 2022

@sanAkel It looks like @marshallward did the merge. If all is good for you, I can update the fork.

@mathomp4 Please go ahead with the update. However, until the @GEOS-ESM/cmake-team approves, the CMakeLists.txt will be inconsistent with the updated source code.

If possible, first review the PR and then merge. Thanks!

@mathomp4
Copy link
Member

@sanAkel It looks like @marshallward did the merge. If all is good for you, I can update the fork.

@mathomp4 Please go ahead with the update. However, until the @GEOS-ESM/cmake-team approves, the CMakeLists.txt will be inconsistent with the updated source code.

If possible, first review the PR and then merge. Thanks!

@sanAkel I did both. Obviously, you'll need/want to make a release of MOM6 so you eventually component-ize this.

@sanAkel
Copy link
Collaborator Author

sanAkel commented Nov 14, 2022

Great! Thanks!!

Looks like I can't merge, would you please do it ?

Or should I first make a release of MOM6? Done!

@mathomp4
Copy link
Member

As this will never pass CI until a new version of MOM6 is in the components.yaml of GEOSgcm, for now I'll force merge. Then @sanAkel can merge to main, make a new version of GEOS_OceanGridComp, and can make a PR to GEOSgcm for @sdrabenh

@mathomp4 mathomp4 merged commit 625109e into develop Nov 14, 2022
@mathomp4 mathomp4 deleted the update/sanAkel/maintenance_mom6_pr1586 branch November 14, 2022 17:22
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
enhancement New feature or request Non 0-diff The changes in this pull request are non-zero-diff
Projects
None yet
Development

Successfully merging this pull request may close these issues.

2 participants