upstream merge 20240919: Get mappy working again #3010
Merged
Conversation
This file contains hidden or 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
…titude limit fix a small bug
…ect/E3SM into whannah/tools/add-mkatmsrffile
Updates Compy's intel compiler from 19.0.5 to 20.0.4 Updates intel compiler to 20.0.0 and intel mpi to 2020 on compy. * mahf708/ig/compy-intel: Updates cprnc version to match the new compiler version update compy intel compiler
updates ghci-aci container and its corresponding machine entry. [BFB]
…action-17' (PR #6617) Bump DavidAnson/markdownlint-cli2-action from 16 to 17 [BFB]
Logging the SCORPIO internal buffer size in the coupler log when the user lets the library choose the buffer size (the default case) Fixes #6610 [BFB]
Revert PR #6313 aborting run on negative channel storage The enforced abort whenever MOSART has negative channel storage may prevent v3.LR simulations from finishing, if the code base that includes to ensure new v3.LR simulations that need to use the latest commits to master are free from this issue. Fixes #6622. [BFB]
When the land use data is on, at the begining of every year, the model may crash with N balance error due to including spval value in N leaching flux update. This update fixes this error by keeping those spval values away from the N balance. Fixes #6604 [BFB]
Get mappy working again with RHEL9 [BFB] * jgfouca/mappy_rhel9: Get mappy working again with RHEL9
Brings in new remote for yaml-cpp
…uild * upstream/master: (194 commits) Everything working now Fixes for mpi-serial on mappy Revert "Merge remote-tracking branch 'liho/liho745/river/bug-fix-7792c63' (PR #6313)" Get mappy working again with RHEL9 Bump DavidAnson/markdownlint-cli2-action from 16 to 17 Log PIO buffer size limit for default case Update sim_year_range in 20thC_transient.xml Updates cprnc version to match the new compiler version Add LND_FRC_DUST_MBL to elm.h0 for wcprod mods Reset sim_year_range to 1850-2015 in namelist_defaults for flanduse_timeseries Updates the long_name adjust artifacts to reflect recent edits update ghci container to restore gh/ci Enables output of land fraction used in dust mobilization update compy intel compiler Adjust PEs for MPAS dev-tests on Anvil Reduce test lengths Update CIME submodule with a new fix commit bug fix for N balance error due to spval value for land use simulation Explicitly set dust_emis_scheme=2 for MMF ...
* origin/master: Update ekat submodule in haero submodule of scream Update EKAT submodule
bartgol
approved these changes
Sep 19, 2024
|
Status Flag 'Pull Request AutoTester' - Testing Jenkins Projects: Pull Request Auto Testing STARTING (click to expand)Build InformationTest Name: SCREAM_PullRequest_Autotester_Weaver
Jenkins Parameters
Using Repos:
Pull Request Author: jgfouca |
|
I feel like the PR title should emphasize the upstream merge. |
|
Status Flag 'Pull Request AutoTester' - Jenkins Testing: all Jobs PASSED Pull Request Auto Testing has PASSED (click to expand)Build InformationTest Name: SCREAM_PullRequest_Autotester_Weaver
Jenkins Parameters
|
|
Status Flag 'Pull Request AutoTester' - Pull Request MUST BE MERGED MANUALLY BY Project Team - This Repo does not support Automerge |
mahf708
changed the title
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.
Includes an upstream merge that brings in machine config changes.
DIFFs in all comparison tests are expected.