Skip to content

Conversation

@cbegeman
Copy link
Contributor

@cbegeman cbegeman commented May 4, 2024

The option to have non-zero land ice frazil salinity was not fully supported. Here, we remove that option. This is BFB when land ice frazil salinity is zero, which has been the case in every configuration I am aware of.

See E3SM-Ocean-Discussion#91 for further discussion.

[NML]
[BFB]

@cbegeman cbegeman added MPAS-ocean Concerning the MPAS-ocean model coupled to E3SM. BFB PR leaves answers BFB labels May 4, 2024
@cbegeman cbegeman requested review from darincomeau, jonbob and xylar May 4, 2024 19:57
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.

This looks exactly like what we want. Thanks @cbegeman!

Copy link
Member

@darincomeau darincomeau left a comment

Choose a reason for hiding this comment

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

Passes e3sm_cryo_developer test suite.

Approved based on testing and visual inspection.

Thanks @cbegeman !

@jonbob jonbob added the NML label May 20, 2024
jonbob added a commit that referenced this pull request May 22, 2024
…(PR #6397)

Disable land ice frazil salinity

The option to have non-zero land ice frazil salinity was not fully
supported. Here, we remove that option. This is BFB when land ice frazil
salinity is zero, which has been the case in every configuration I am
aware of.

[NML]
[BFB]
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 checking bld file changes with semi-automated scripts and testing

@jonbob
Copy link
Contributor

jonbob commented May 22, 2024

Passes:

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

with expected NML DIFFs. Merged to next

@jonbob jonbob merged commit 1b15de4 into E3SM-Project:master May 23, 2024
@jonbob
Copy link
Contributor

jonbob commented May 23, 2024

merged to master and expected NML DIFFs blessed -- except for pm-cpu prod and pm-cpu developer_gnu which have yet to report

@jonbob
Copy link
Contributor

jonbob commented May 23, 2024

Also blessed NML DIFFs on pm-cpu prod and pm-cpu developer_gnu

xylar added a commit to xylar/compass that referenced this pull request Jun 4, 2024
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
@cbegeman cbegeman deleted the ocn/fixup-land-ice-frazil-salinity branch April 22, 2025 15:21
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment

Labels

BFB PR leaves answers BFB MPAS-ocean Concerning the MPAS-ocean model coupled to E3SM. NML

Projects

None yet

Development

Successfully merging this pull request may close these issues.

4 participants