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

Restructuring under GEOSocean_GridComp #448

Merged
merged 4 commits into from
Oct 4, 2021

Conversation

yvikhlya
Copy link

@yvikhlya yvikhlya commented Jul 30, 2021

This PR addresses #447 and is contingent on GEOS-ESM/GEOSgcm#317.

@yvikhlya yvikhlya added Contingent - DNA These changes are contingent on other PRs (DNA=do not approve) 0 diff structural Structural changes to repository that are zero-diff labels Jul 30, 2021
@yvikhlya yvikhlya requested review from sanAkel and zhaobin74 July 30, 2021 18:57
@yvikhlya yvikhlya requested a review from a team as a code owner July 30, 2021 18:57
@yvikhlya yvikhlya self-assigned this Jul 30, 2021
@yvikhlya yvikhlya requested a review from a team as a code owner July 30, 2021 18:57
Copy link
Collaborator

@tclune tclune left a comment

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

cmake changes ok

@mathomp4 mathomp4 requested a review from a team August 2, 2021 12:31
@mathomp4
Copy link
Member

mathomp4 commented Aug 2, 2021

I'm adding @GEOS-ESM/gcm-gatekeepers (aka @sdrabenh) as this PR, as @yvikhlya says, is one of those "must be done at the same time as a GEOSgcm update" things. Want to make sure he knows about this so we can coordinate it.

@mathomp4
Copy link
Member

mathomp4 commented Aug 2, 2021

Note: This will never pass CI here.

It's a fun dependency issue, but the main thing is that by the time the CI system knows to checkout this branch, it's already done a mepo clone on the main of GEOSgcm. Thus, MOM5 and MOM6 are in the "wrong place" and so things go boom. You can see that the GEOSgcm CI in GEOS-ESM/GEOSgcm#317 did build because it put MOM5 and MOM6 in the "right place". (Well, AWS failed but that's wonky at the best of times).

So, I'll need to work with @sdrabenh when this goes in to turn off CI.

@yvikhlya
Copy link
Author

yvikhlya commented Aug 2, 2021

Also note that I renamed GEOSocean_GridComp to GEOS_OceanGridComp. This way there is no need in "OVERRIDE" statement in CmakeLists.

@sdrabenh sdrabenh removed the Contingent - DNA These changes are contingent on other PRs (DNA=do not approve) label Oct 4, 2021
Copy link
Member

@mathomp4 mathomp4 left a comment

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Approving as superuser.

@sdrabenh sdrabenh merged commit 870affb into develop Oct 4, 2021
@sdrabenh sdrabenh deleted the feature/yury/ocean-refactor branch October 4, 2021 19:44
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
0 diff structural Structural changes to repository that are zero-diff
Projects
None yet
Development

Successfully merging this pull request may close these issues.

4 participants