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

Merge MPAS-framework dev into main for EWv2.2 Release #9

Merged
merged 20 commits into from
Jun 3, 2024

Conversation

gdicker1
Copy link
Contributor

No description provided.

dazlich and others added 19 commits February 19, 2024 09:31
This file is reverted to its previous version to undo mistaken match to mpasa framework in last commit.
Removed to match the new v2.1 mpasa framework.
Removed to match the new v2.1 mpasa framework.
Removed to match the new v2.1 mpasa framework.
Modified to match the new v2.1 mpasa framework.
Modified to match the new v2.1 mpasa framework.
Modified to match the new v2.1 mpasa framework.
Modified to match the new v2.1 mpasa framework.
Modified to match the new v2.1 mpasa framework.
Modified to match the new v2.1 mpasa framework.
Modified to match the new v2.1 mpasa framework.
Modified to match the new v2.1 mpasa framework.
Modified to match the new v2.1 mpasa framework.
Modified to match the new v2.1 mpasa framework.
Modify mpas framework to match mpasa in EW v2.1
external references at the link step of compilation. They go
hand in hand with branches of the same name in mpas-ocean
and mpas-seaice. In brief, the modules that generate the duplicate
external references have a unique dummy string, MPASAOS, in place
of the mpas in the module names, and the module use statements.
This modified source is place in new directories so that sed
can be applied to all files in the new directory. Sed replaces
the new dummy string with mpaso (ocean) or mpass (seaice) and
renames the file so that dependency analysis continues to work.
Modify all module names in use statments in source files to begin with
the token/string "MPASAOS_" which is replaced within the buildlib
scripts of mpas-seaice and mpas-ocean using sed. This allows for OpenACC
builds to succeed and not trigger the "Multiple definition" error. See
EarthWorksOrg/EarthWorks Issue #36.
Compilation of model compsets that include mpas-ocean or -seaice
components was failing at the link step. Commenting out a
couple routines that are not called anywhere resolves this.
This has been tested with gnu, intel, intel-oneapi, and nvhpc
compilers.
Comment out routines to fix linking step issue.
@gdicker1 gdicker1 merged commit e0be89d into ew-main Jun 3, 2024
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
None yet
Projects
None yet
Development

Successfully merging this pull request may close these issues.

2 participants