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

Ocean maintenance #629

Merged
merged 2 commits into from
Aug 22, 2023
Merged

Ocean maintenance #629

merged 2 commits into from
Aug 22, 2023

Conversation

sanAkel
Copy link
Collaborator

@sanAkel sanAkel commented Aug 1, 2023

Uptick versions of MOM6 and Ocean GC.

No change in answers.

Uptick MOM6 and Ocean GC versions
@sanAkel sanAkel added the 0 diff The changes in this pull request have verified to be zero-diff with the target branch. label Aug 1, 2023
@sanAkel sanAkel requested a review from mathomp4 August 1, 2023 19:13
@sanAkel sanAkel self-assigned this Aug 1, 2023
@sanAkel sanAkel requested a review from a team as a code owner August 1, 2023 19:13
@mathomp4
Copy link
Member

mathomp4 commented Aug 1, 2023

Hmm. GNU is not happy running coupled.

@sanAkel
Copy link
Collaborator Author

sanAkel commented Aug 1, 2023

Hmm. GNU is not happy running coupled.

I'll need to reproduce the error in the diabatic driver.

@sanAkel
Copy link
Collaborator Author

sanAkel commented Aug 1, 2023

Hmm. GNU is not happy running coupled.

I'll need to reproduce the error in the diabatic driver.

Is the CI running this resolution: https://github.com/GEOS-ESM/GEOS_OceanGridComp/tree/develop/MOM6_GEOSPlug/mom6_app/72x36 ? Had no issues with ifort!

@mathomp4
Copy link
Member

mathomp4 commented Aug 2, 2023

Hmm. GNU is not happy running coupled.

I'll need to reproduce the error in the diabatic driver.

Is the CI running this resolution: https://github.com/GEOS-ESM/GEOS_OceanGridComp/tree/develop/MOM6_GEOSPlug/mom6_app/72x36 ? Had no issues with ifort!

Yes. It runs my usual 1-day c12 1x6 job I think.

@sanAkel
Copy link
Collaborator Author

sanAkel commented Aug 2, 2023

(to remind) We'll get back to this when this PR is merged.

@sanAkel sanAkel marked this pull request as draft August 2, 2023 17:04
@sanAkel
Copy link
Collaborator Author

sanAkel commented Aug 14, 2023

@mathomp4 your PR has been merged.

@sanAkel sanAkel marked this pull request as ready for review August 14, 2023 21:44
@mathomp4
Copy link
Member

@mathomp4 your PR has been merged.

Nice! Fork has been updated!

@sanAkel
Copy link
Collaborator Author

sanAkel commented Aug 15, 2023

  • Please update our MOM6 fork.
  • Once ⬆️ is done, you/I can make a new release

Release done as well!
https://github.com/GEOS-ESM/MOM6/tree/geos/v2.2.1

@mathomp4 can you please have the test(s) run again?

@mathomp4
Copy link
Member

@mathomp4 can you please have the test(s) run again?

@sanAkel Something is off. I don't think geos/v2.2.1 got the GNU fix commit in. The tag is based on two commits back.

@sanAkel
Copy link
Collaborator Author

sanAkel commented Aug 16, 2023

@mathomp4 can you please have the test(s) run again?

@sanAkel Something is off. I don't think geos/v2.2.1 got the GNU fix commit in. The tag is based on two commits back.

Sorry @mathomp4, I didn't delete the (old) tag, see this one. If okay, please try again! Thanks!

@mathomp4
Copy link
Member

@mathomp4 can you please have the test(s) run again?

@sanAkel Something is off. I don't think geos/v2.2.1 got the GNU fix commit in. The tag is based on two commits back.

Sorry @mathomp4, I didn't delete the (old) tag, see this one. If okay, please try again! Thanks!

Okay. I've retriggered it. I think. CircleCI is good at caching things, so I might need to make a dumb "add a blank line" or some such commit.

@mathomp4
Copy link
Member

Huzzah! 😄

@sanAkel
Copy link
Collaborator Author

sanAkel commented Aug 16, 2023

@mathomp4 can you ✅ reviewer box?!!

@mathomp4
Copy link
Member

@mathomp4 can you ✅ reviewer box?!!

I can, but if I do I approve for GCM Gatekeepers as well. I usually leave that to @sdrabenh

Would you like this in main quickly? Or do you require a tag?

@sanAkel
Copy link
Collaborator Author

sanAkel commented Aug 16, 2023

@mathomp4 can you ✅ reviewer box?!!

I can, but if I do I approve for GCM Gatekeepers as well. I usually leave that to @sdrabenh

Would you like this in main quickly? Or do you require a tag?

I don't see any urgency. Let it go through @sdrabenh ... Thank you!

@sdrabenh sdrabenh merged commit 0c22ad9 into main Aug 22, 2023
6 checks passed
@sdrabenh sdrabenh deleted the sanAkel-patch-1 branch August 22, 2023 15:18
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
0 diff The changes in this pull request have verified to be zero-diff with the target branch.
Projects
None yet
Development

Successfully merging this pull request may close these issues.

3 participants