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

Switch global ocean in init mode to E3SM shared constants #6481

Merged
merged 2 commits into from
Jul 1, 2024

Conversation

xylar
Copy link
Contributor

@xylar xylar commented Jun 21, 2024

This merge also migrates the computation of the Coriolis parameter to using E3SM shared constants.

The unused constants module imports are removed from several init mode utilities to ensure that they don't use constants that are inconsistent with E3SM's versions.

I have made local symlinks to the shared constants and kinds file for convenience in building using MPAS-Ocean's not-very-sophisticated build system.

This merge also migrates the computation of the coriolis parameter
to using E3SM shared constants.

The unused constants module imports are removed from several
init mode utilities to ensure that they don't use constants
that are inconsistent with E3SM's versions.
@xylar xylar added BFB PR leaves answers BFB MPAS-Ocean standalone Issues and features for standalone MPAS-Ocean code that dont impact E3SM. labels Jun 21, 2024
@xylar xylar assigned xylar and jonbob and unassigned xylar Jun 21, 2024
@xylar
Copy link
Contributor Author

xylar commented Jun 21, 2024

See E3SM-Ocean-Discussion#96 for some relevant discussion/

@xylar xylar changed the title Switch global ocean in init mode to E3SM shared constants [mpaso-standalone] Switch global ocean in init mode to E3SM shared constants Jun 21, 2024
@xylar
Copy link
Contributor Author

xylar commented Jun 21, 2024

@proteanplanet and @mark-petersen, if you could approve this based on the revierw you already did in E3SM-Ocean-Discussion#96, that would be great!

Copy link
Contributor

@proteanplanet proteanplanet 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 previous review during development.

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.

Approved based on previous review.

@jonbob jonbob changed the title [mpaso-standalone] Switch global ocean in init mode to E3SM shared constants Switch global ocean in init mode to E3SM shared constants Jun 27, 2024
jonbob added a commit that referenced this pull request Jun 27, 2024
…6481)

Switch global ocean in init mode to E3SM shared constants

The unused constants module imports are removed from several init mode
utilities to ensure that they don't use constants that are inconsistent
with E3SM's versions. This merge also migrates the computation of the
Coriolis parameter to using E3SM shared constants.

Also made local symlinks to the shared constants and kinds file for
convenience in building using MPAS-Ocean's not-very-sophisticated build
system.

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

jonbob commented Jun 27, 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 115ad3c into E3SM-Project:master Jul 1, 2024
13 checks passed
@jonbob
Copy link
Contributor

jonbob commented Jul 1, 2024

merged to master

@xylar xylar deleted the ocn/fix-coriolis-shared-constants branch July 1, 2024 17:10
@xylar
Copy link
Contributor Author

xylar commented Jul 1, 2024

Thanks @jonbob, @mark-petersen and @proteanplanet!

xylar added a commit to xylar/compass that referenced this pull request Jul 3, 2024
This merge updates the E3SM-Project submodule from [31f771c](https://github.com/E3SM-Project/E3SM/tree/31f771c) to [c7d7998](https://github.com/E3SM-Project/E3SM/tree/c7d7998).

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#6472
- [ ]  (ocn) E3SM-Project/E3SM#6471
- [ ]  (ocn) E3SM-Project/E3SM#6481
xylar added a commit to xylar/compass that referenced this pull request Jul 4, 2024
This merge updates the E3SM-Project submodule from [31f771c](https://github.com/E3SM-Project/E3SM/tree/31f771c) to [c7d7998](https://github.com/E3SM-Project/E3SM/tree/c7d7998).

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#6472
- [ ]  (ocn) E3SM-Project/E3SM#6471
- [ ]  (ocn) E3SM-Project/E3SM#6481
xylar added a commit to xylar/compass that referenced this pull request Jul 4, 2024
This merge updates the E3SM-Project submodule from [31f771c](https://github.com/E3SM-Project/E3SM/tree/31f771c) to [c7d7998](https://github.com/E3SM-Project/E3SM/tree/c7d7998).

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#6472
- [ ]  (ocn) E3SM-Project/E3SM#6471
- [ ]  (ocn) E3SM-Project/E3SM#6481
xylar added a commit to xylar/compass that referenced this pull request Jul 4, 2024
This merge updates the E3SM-Project submodule from [31f771c](https://github.com/E3SM-Project/E3SM/tree/31f771c) to [c7d7998](https://github.com/E3SM-Project/E3SM/tree/c7d7998).

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#6472
- [ ]  (ocn) E3SM-Project/E3SM#6471
- [ ]  (ocn) E3SM-Project/E3SM#6481
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 standalone Issues and features for standalone MPAS-Ocean code that dont impact E3SM.
Projects
None yet
Development

Successfully merging this pull request may close these issues.

None yet

4 participants