Merge maint-3.0 to master #6777
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
Add e3sm_moab_dev test suite which runs an ERS test for cases that have at least one data model as well as a fully coupled case.
for this restart case, prep_ocn_mrg_moab is called after prep_ocn_accum_avg_moab (for restart only)
Activate gh/ci workflows on maint-3.0. [BFB]
The output of reaction rate of r_lch4 and r_lco_h are not output due to a bug in maint-3.0, fixed it in the code.
modified: components/eam/src/chemistry/mozart/rate_diags.F90
[BFB]
Modify pe layouts for v3 prod cases for anvil
Modify pe layouts for v3 prod cases for anvil [BFB]
Update anvil pe layout for v3 northamericax4v1pg2_WC14to60E2r3 WCYCL
Update anvil pe layout for v3 northamericax4v1pg2_WC14to60E2r3 WCYCL [BFB]
Add a moab coupler developer test suite. An ERS test each for fully coupled and data model cases. Also fix a few bugs found by the testing. [BFB]
use only the point cloud it is enough for import/export
it should be better to compute ourselves, if we have the mesh information this could be a performance sink
(PR #6724) Add e3sm_prod PEs for maint-3.0 on Improv. [BFB]
Simplify the land grid instantiation for moab driver Do not differentiate anymore between bi-grid or trigrid. Also fix errors related to aream initialization for rof model [BFB]
|
jinboxie
approved these changes
Nov 25, 2024
mahf708
approved these changes
Nov 25, 2024
rljacob
commented
Nov 25, 2024
| branches: [ master ] | ||
| branches: | ||
| - master | ||
| - maint-3.0 |
There was a problem hiding this comment.
@mahf708 I did a test merge and this diff is real. Do we want this change?
There was a problem hiding this comment.
Yeah, it's fine to include it. It just means when PRs are open against maint-3.0, the actions will run. So, this won't impact regular PRs to master. It's better to include so that we don't have to see this diff again (in other syncs)
rljacob
added a commit
that referenced
this pull request
Nov 25, 2024
Bring changes from maint-3.0 to master. These include Modifications to pe-layouts on anvil and improv for v3 cases. Several updates to the moab coupler including: Simplify the land grid instantiation for moab driver fix errors related to aream initialization for rof model Add a moab coupler developer test suite and fix bugs found by that suite [BFB]
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.
Bring changes from maint-3.0 to master. These include
Modifications to pe-layouts on anvil and improv for v3 cases.
Several updates to the moab coupler including:
[BFB]