Update mpas-ocean version #15
Merged
Conversation
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
The vanroekel/ocean/update-nonhydro-2-15-2023 branch of https://github.com/vanroekel/E3SM is ported into the MPAS-Ocean component so that GPU acceleration may begin. This update also features a nonhydrostatic treatment of the vertical coordinate. This port also includes updates to the MPAS_framework component. The framework updates require updates to the MPAS-Seaice component. CMEPS is updated as well.
The buildlib script had troubles with all the includes in the PPR source files. I have done the includes by hand and now have that one ppr file in the repository, and I have removed the PPR submodule. I don't expect PPR to be something that will change in the future.
dazlich
requested review from
sherimickelson,
supreethms1809,
gdicker1 and
areanddee
|
Also, I have merge issues to deal with with EarthWorksOrg /mpas-ocean PR #15 |
Merge remote-tracking branch 'origin/ew-develop' into update/ocean The compile line in buildlib had to be reconciled. Needed config_archive.xml added to the update/ocean branch. Needed to remove buildnmlcpython-310.pyc from the update/ocean branch.
|
Ok, the merge conflicts have been eliminated - have at reviewing this. I am going to email Pranay - I didn't see him in the review list but he will be keenly interested in this. |
This was referenced Oct 11, 2024
gdicker1
approved these changes
Oct 18, 2024
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
The mpas-ocean component is updated to a new version: branch 'vanroekel/ocean/update-nonhydro-2-15-2023' of https://github.com/vanroekel/E3SM . This new version permits GPU acceleration to be implemented to the ocean, and features a non-hydrostatic treatment of the vertical coordinate in the split-implicit time integration scheme.
The changes in here are extensive - they are a wholesale import of the new version code, then the calls to mpas-framework routines are modified for the necessary pre-processing. The driver code is modified to add new wave to ocean coupling variables.
This is part of a package of PRs for branches named update/ocean:
EarthWorksOrg /mpas-ocean PR #15
EarthWorksOrg /mpas-seaice PR #17
EarthWorksOrg /mpas-framework PR #10
EarthWorksOrg /CMEPS PR #12
EarthWorksOrg/EarthWorks PR #75 (incorporates above)
To clone this version of Earthworks use the update/ocean branch.