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

Fix bottom depth deepening in global_ocean init mode #6454

Merged
merged 1 commit into from
Jun 3, 2024
Merged

Fix bottom depth deepening in global_ocean init mode #6454

merged 1 commit into from
Jun 3, 2024

Conversation

xylar
Copy link
Contributor

@xylar xylar commented May 31, 2024 •
edited by jonbob
Loading

A bug was introduced in #6310 that made the ocean shallower rather than deeper than the minimum allowed depth. This merge fixes that bug.

Fixes #6453
[BFB] -- mpas-ocean standalone only

@xylar
Fix bottom depth deepening in global_ocean init mode
9b4046c 
A bug was introduced in E3SM-Project#6310 that made the ocean shallower
rather than deeper than the minimum allowed depth.  This
merge fixes that bug.
@xylar xylar added bug fix PR BFB PR leaves answers BFB MPAS-Ocean standalone Issues and features for standalone MPAS-Ocean code that dont impact E3SM. labels May 31, 2024
@xylar xylar requested a review from sbrus89 May 31, 2024 10:10
@xylar
Copy link
Contributor Author

xylar commented May 31, 2024 •
edited
Loading

Testing

With this fix cherry-picked onto #6310, the pr suite in Compass is now BFB with a baseline before #6310

See:

/lcrc/group/e3sm/ac.xylar/compass_1.4/chrysalis/test_20240531/pr_6310_with_bug_fix

sbrus89
sbrus89 approved these changes May 31, 2024
View reviewed changes
Copy link
Contributor

@sbrus89 sbrus89 left a comment

Choose a reason for hiding this comment

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

Thank you for catching and fixing this, @xylar.

jonbob added a commit that referenced this pull request May 31, 2024
@jonbob
Merge branch 'xylar/ocn/fix-global-ocean-init-mode-bottom-depth' into…
4e3614b 
… next (PR #6454)

Fix bottom depth deepening in global_ocean init mode

A bug was introduced in #6310 that made the ocean shallower rather than
deeper than the minimum allowed depth. This merge fixes that bug.

Fixes #6453
[BFB] -- mpas-ocean standalone only
@jonbob
Copy link
Contributor

jonbob commented May 31, 2024

Passes:

  • ERS_Ld5.T62_oQU120.CMPASO-NYF.chrysalis_intel
  • SMS_D_Ld1.TL319_IcoswISC30E3r5.GMPAS-JRA1p5-DIB-PISMF.chrysalis_intel.mpaso-jra_1958

merged to next

@jonbob jonbob merged commit 8939709 into E3SM-Project:master Jun 3, 2024
13 checks passed
@jonbob
Copy link
Contributor

jonbob commented Jun 3, 2024

merged to master

@xylar xylar mentioned this pull request Jun 4, 2024
Merged
xylar added a commit to xylar/compass that referenced this pull request Jun 4, 2024
@xylar
Update E3SM-Project submodule
450da5f 
This merge updates the E3SM-Project submodule from [31e0924](https://github.com/E3SM-Project/E3SM/tree/31e0924) to [8939709](https://github.com/E3SM-Project/E3SM/tree/8939709).

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#6263
- [ ]  (ocn) E3SM-Project/E3SM#6310
- [ ]  (fwk) E3SM-Project/E3SM#6427
- [ ]  (ocn) E3SM-Project/E3SM#6397
- [ ]  (ocn) E3SM-Project/E3SM#6306
- [ ]  (ocn) E3SM-Project/E3SM#6454
@xylar xylar mentioned this pull request Jun 4, 2024
Merged
6 tasks
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Reviewers

@sbrus89 sbrus89 sbrus89 approved these changes

Assignees

@jonbob jonbob

Labels
BFB PR leaves answers BFB bug fix PR MPAS-Ocean standalone Issues and features for standalone MPAS-Ocean code that dont impact E3SM.
Projects
None yet
Milestone
No milestone
Development

Successfully merging this pull request may close these issues.

Bug in bottom depth in MPAS-Ocean global_ocean init mode
3 participants
@xylar @jonbob @sbrus89