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.

Sign up for GitHub

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

Jump to bottom

Revert z-star PR #5564

Merged
merged 1 commit into from
Mar 29, 2023
Merged

Revert z-star PR #5564

merged 1 commit into from
Mar 29, 2023

Conversation

jonbob
Copy link
Contributor

@jonbob jonbob commented Mar 28, 2023 •
edited by rljacob
Loading

Reverts PR #5254, which modified ocean z-star ALE coordinate for inactive top cells. More testing shows it causes problems for cryo configurations with ice shelf cavities.

[non-BFB]

Fixes #5536

@jonbob
Revert "Merge branch 'cbegeman/ocn/modify-zstar-for-inactive-top-cell…
2293751 
…s' (PR #5254)"

This reverts commit 8266141, reversing
changes made to 3a59081.
@jonbob jonbob added mpas-ocean non-BFB PR makes roundoff changes to answers. labels Mar 28, 2023
@jonbob jonbob requested review from xylar and cbegeman March 28, 2023 15:58
@jonbob jonbob self-assigned this Mar 28, 2023
cbegeman
cbegeman approved these changes Mar 28, 2023
View reviewed changes
Copy link
Contributor

@cbegeman cbegeman left a comment

Choose a reason for hiding this comment

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

@jonbob This looks correct to me. Would you like me to do any testing?

@jonbob
Copy link
Contributor Author

jonbob commented Mar 28, 2023

Thanks @cbegeman -- I don't think that's necessary. I'll run the short test we know has problems during the merge process, but otherwise results should go back to what we had before the PR got into the repo

@ndkeen
Copy link
Contributor

ndkeen commented Mar 28, 2023 •
edited
Loading

Fixes #5536

I don't know if adding this string in a comment is the same as it being in the top comment.
And now I see that my comment here does affect the issue -- ie, it adds "May be fixed by..."

@jonbob jonbob changed the title Revert z-star PR #5254 Revert z-star PR Mar 28, 2023
xylar
xylar approved these changes Mar 28, 2023
View reviewed changes
Copy link
Contributor

@xylar xylar left a comment

Choose a reason for hiding this comment

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

Looks correct to me, too.

@jonbob
Copy link
Contributor Author

jonbob commented Mar 28, 2023

Thanks @xylar -- and thanks as well for the help understanding revert

jonbob added a commit that referenced this pull request Mar 28, 2023
@jonbob
Merge branch 'jonbob/ocean/revert-zstar' into next (PR #5564)
18720eb 
Revert z-star PR

Reverts PR #5254, which modified ocean z-star ALE coordinate for
inactive top cells. More testing shows it causes problems for cryo
configurations with ice shelf cavities.

Fixes #5536

[non-BFB]
@jonbob
Copy link
Contributor Author

jonbob commented Mar 28, 2023

successfully runs:

  • SMS_P480_Ld5.T62_ECwISC30to60E2r1.GMPAS-DIB-IAF-ISMF.chrysalis_gnu

which was previously failing

expected DIFFs for:

  • SMS_D_Ld3.T62_oQU120.CMPASO-IAF.chrysalis_intel

merged to next

@jonbob jonbob merged commit c822da9 into master Mar 29, 2023
@jonbob jonbob deleted the jonbob/ocean/revert-zstar branch March 29, 2023 16:43
@jonbob
Copy link
Contributor Author

jonbob commented Mar 29, 2023

merged to master and expected DIFFs blessed

xylar added a commit to xylar/compass that referenced this pull request Apr 2, 2023
@xylar
Update E3SM-Project submodule
50032c4 
This merge updates the E3SM-Project submodule from [c9201a4](https://github.com/E3SM-Project/E3SM/tree/c9201a4f44540bb74cb3650e32bcbe27fb762ab1) to [b4d5b10600](https://github.com/E3SM-Project/E3SM/tree/b4d5b10600).

This update includes the following MPAS-Ocean and MPAS-Frameworks PRs (check mark indicates bit-for-bit with previous PR in the list):
- [ ]  (ocn) E3SM-Project/E3SM#5254
- [ ]  (fwk) E3SM-Project/E3SM#5490
- [ ]  (ocn) E3SM-Project/E3SM#5541
- [ ]  (fwk) E3SM-Project/E3SM#5498
- [ ]  (ocn) E3SM-Project/E3SM#5564
- [ ]  (ocn) E3SM-Project/E3SM#5553
- [ ]  (ocn) E3SM-Project/E3SM#5519
@xylar xylar mentioned this pull request Apr 2, 2023
Merged
8 tasks
@cbegeman cbegeman mentioned this pull request May 23, 2024
Draft
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Reviewers

@cbegeman cbegeman cbegeman approved these changes

@xylar xylar xylar approved these changes

Assignees

@jonbob jonbob

Labels
mpas-ocean non-BFB PR makes roundoff changes to answers.
Projects
None yet
Milestone
No milestone
Development

Successfully merging this pull request may close these issues.

MPAS-seaice Error, Potential CFL violation in IR advection for T62_ECwISC30to60E2r1.GMPAS-DIB-IAF-ISMF
4 participants
@jonbob @ndkeen @xylar @cbegeman