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

Fixes gotm interface for vertical mixing #6509

Merged
merged 1 commit into from
Aug 21, 2024

Conversation

vanroekel
Copy link
Contributor

@vanroekel vanroekel commented Jul 11, 2024

if GOTM is enabled surface friction velocity is not calculated at present. This fixes that issue by allowing KPP_input_fields to be calculated for cvmix and gotm

Fixes #6507
[BFB]

if GOTM is enabled surface friction velocity is not calculated at
present.  This fixes that issue

Addresses #6507
@vanroekel
Copy link
Contributor Author

This only affects simulations where config_use_gotm=.true. and config_use_cvmix_kpp=.false.. No E3SM configurations use this at present

@vanroekel
Copy link
Contributor Author

@qingli411 can you also have a look at this change?

Copy link

PR Preview Action v1.4.7
🚀 Deployed preview to https://E3SM-Project.github.io/E3SM/pr-preview/pr-6509/
on branch gh-pages at 2024-07-11 21:41 UTC

@qingli411
Copy link
Contributor

This looks good to me.

@mark-petersen mark-petersen self-requested a review July 30, 2024 14:35
@rljacob
Copy link
Member

rljacob commented Aug 15, 2024

@mark-petersen please review.

Copy link
Contributor

@mark-petersen mark-petersen left a comment

Choose a reason for hiding this comment

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

Yes, this looks right. If GOTM is on then the KPP input fields are computed. This does not affect any E3SM simulations, which don't use GOTM. I compiled stand-alone with gnu on chicoma and intel on chrysalis without any trouble.

Copy link
Contributor

@jonbob jonbob left a comment

Choose a reason for hiding this comment

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

Approved based on visual inspection and testing

jonbob added a commit that referenced this pull request Aug 20, 2024
Fixes gotm interface for vertical mixing

If GOTM is enabled surface friction velocity is not calculated at
present. This fixes that issue by allowing KPP_input_fields to be
calculated for cvmix and gotm

Fixes #6507
[BFB]
@jonbob
Copy link
Contributor

jonbob commented Aug 20, 2024

Passes:

  • ERP_Ld3.ne30pg2_r05_IcoswISC30E3r5.WCYCL1850.chrysalis_intel.allactive-pioroot1
  • ERS.ne4pg2_oQU480.WCYCL1850NS.chrysalis_intel
  • PET_Ln5.T62_oQU240wLI.GMPAS-DIB-IAF-PISMF.chrysalis_intel

merged to next

@jonbob jonbob merged commit 0439e66 into master Aug 21, 2024
13 checks passed
@jonbob jonbob deleted the vanroekel/ocean/mixing-interface-fix branch August 21, 2024 17:12
@jonbob
Copy link
Contributor

jonbob commented Aug 21, 2024

merged to master

xylar added a commit to xylar/compass that referenced this pull request Oct 26, 2024
This merge updates the E3SM-Project submodule from [727ad81](https://github.com/E3SM-Project/E3SM/tree/727ad81) to [1442143](https://github.com/E3SM-Project/E3SM/tree/1442143).

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#6509
- [ ]  (ocn) E3SM-Project/E3SM#6508
- [ ]  (fwk) E3SM-Project/E3SM#6575
- [ ]  (ocn) E3SM-Project/E3SM#6590
- [ ]  (fwk) E3SM-Project/E3SM#6643
- [ ]  (ocn) E3SM-Project/E3SM#6656
- [ ]  (ocn) E3SM-Project/E3SM#6672
- [ ]  (ocn) E3SM-Project/E3SM#6659
- [ ]  (ocn) E3SM-Project/E3SM#6497
- [ ]  (ocn) E3SM-Project/E3SM#6485
- [ ]  (ocn) E3SM-Project/E3SM#6566
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
BFB PR leaves answers BFB bug fix PR mpas-ocean
Projects
None yet
Development

Successfully merging this pull request may close these issues.

Compute KPP input fields
5 participants