Update MPAS-Source: COMPASS and Documentation files #3776
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
|
@matthewhoffman and @akturner this includes a merge from develop in order to get a Travis CI correction in from @xylar's work. It came with an atmosphere change. You can merge the |
mark-petersen
force-pushed
the
mark-petersen/update_mpas_200817
branch
from
3cae1a6
to
6e141de
Compare
jonbob
approved these changes
Aug 18, 2020
jonbob
added a commit
that referenced
this pull request
Aug 18, 2020
Update MPAS-Source: COMPASS and Documentation files This PRi brings in a new mpas-source submdoule with changes only to the ocean core. It updates files unrelated to the E3SM forward model, including: * Move load_compass_env.sh to the ocean dir (MPAS-Dev/MPAS-Model#618); * Update ISOMIP+ docs, including tutorial for Ocean0 on LANL IC (MPAS-Dev/MPAS-Model#653); * Fix path to docs in Travis CI (MPAS-Dev/MPAS-Model#644); * atmosphere core init changes (MPAS-Dev/MPAS-Model#637); * New Mesh: WC14to60kmL60E3SMv2r03 (MPAS-Dev/MPAS-Model#628); * Fix ISOMIP+ viz scripts (MPAS-Dev/MPAS-Model#642); * Add support for custom critical passages and land blockages (MPAS-Dev/MPAS-Model#586); and * New Mesh: WC12to60kmL60E3SMv2r01 (MPAS-Dev/MPAS-Model#555) [BFB]
|
merged to next |
|
Passes SMS_D.ne4_oQU240.A_WCYCL1850.anvil_intel sanity test |
|
@mark-petersen , thanks for the head's up. I'm ok with the src changes because they are only in the atm init code, which E3SM never uses. I'll plan to merge develop into landice/develop when this is complete. |
|
merged to master |
This pull request was closed.
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.
This PR updates files unrelated to the E3SM forward model. This includes:
[BFB]