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

Update mpas framework in mpas-source #3014

Merged

Conversation

mark-petersen
Copy link
Contributor

Minor updates to MPAS framework. Includes:

  • Log file corrections
  • python 3 correction in COMPASS
  • changes to atmospheric core

BFB

jgfouca pushed a commit that referenced this pull request Jun 25, 2019
Config grids v2.1
Split the cesm/config_grids.xml file into 4 parts: config_grids.xml config_grids_mct.xml config_grids_nuopc.xml config_grids_common.xml add a new schema definition which uses
the xml xinclude feature and add code to support reading xml over multiple files.

Test suite: scripts_regression_tests.py
Test baseline:
Test namelist changes:
Test status: bit for bit
Fixes
User interface changes?:

Update gh-pages html (Y/N)?:

Code review:mvertens, jgfoucar
@jonbob jonbob added this to the v2.0alpha milestone Jul 25, 2019
@rljacob
Copy link
Member

rljacob commented Oct 3, 2019

What is the status of this PR?

@jonbob
Copy link
Contributor

jonbob commented Oct 3, 2019

@rljacob - I'm trying to clean off the develop branches of all three mpas components so we can get this PR in. I think seaice is the only one left, at this point. But it's been difficult to have all three component developers in town at the same time. I'm also trying to push on 2952...

@mark-petersen mark-petersen requested a review from jonbob October 8, 2019 17:40
@mark-petersen
Copy link
Contributor Author

@jonbob @akturner @matthewhoffman: I merged develop into ocean/develop locally, it passed all tests with gnu and intel/debug using the ocean nightly regression suite, and is bfb with head of ocean/develop. The ocean is good to go for a framework merge.

@matthewhoffman
Copy link
Contributor

Landice is also ok for framework merge.

@akturner
Copy link
Contributor

akturner commented Oct 8, 2019

develop has been merged into seaice/develop.

@mark-petersen
Copy link
Contributor Author

I also merged develop into ocean/develop. @jonbob let me know when we are clear, and I will merge develop into e3sm/develop, then update this PR so it is ready to go.

@mark-petersen
Copy link
Contributor Author

@jonbob Should we do this one today? If so, I'll merge develop into e3sm/develop and update this branch.

@jonbob
Copy link
Contributor

jonbob commented Oct 10, 2019

@mark-petersen - we talked about this a couple of days ago. We need to get seaice/develop current first, and there's at least one more PR to work on for that

@jonbob
Copy link
Contributor

jonbob commented Oct 14, 2019

@mark-petersen - seaice is now clear to go as well, so we can do this today if it's ready

Minor updates to MPAS framework. Includes:
- Log file corrections
- python 3 correction in COMPASS
- changes to atmospheric core
@mark-petersen mark-petersen force-pushed the mark-petersen/mpas/update_framework branch from 74a8610 to 1eab246 Compare October 15, 2019 14:11
Copy link
Contributor

@jonbob jonbob left a comment

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Looks good by visual inspection, but I'll also test after merging

jonbob added a commit that referenced this pull request Oct 15, 2019
Update mpas framework in mpas-source

This PR brings in minor updates to MPAS framework through a new
mpas-source submodule. The changes include:
* Log file corrections;
* python 3 correction in COMPASS; and
* changes to atmospheric core (not used by E3SM).

[BFB]
@jonbob
Copy link
Contributor

jonbob commented Oct 15, 2019

merged to next

jonbob added a commit that referenced this pull request Oct 16, 2019
Update mpas framework in mpas-source

This PR brings in minor updates to MPAS framework through a new
mpas-source submodule. The changes include:
* Log file corrections;
* python 3 correction in COMPASS; and
* changes to atmospheric core (not used by E3SM).

[BFB]
@jonbob jonbob merged commit 1eab246 into E3SM-Project:master Oct 16, 2019
@jonbob
Copy link
Contributor

jonbob commented Oct 16, 2019

merged to master
@mark-petersen - you can delete the branch from your fork now, if you want

@mark-petersen mark-petersen deleted the mark-petersen/mpas/update_framework branch October 16, 2019 14:43
jgfouca pushed a commit that referenced this pull request Oct 9, 2024
…nip-any

Automatically Merged using E3SM Pull Request AutoTester
PR Title: Change handling of multiple matches in atmchange/atmquery
PR Author: bartgol
PR LABELS: enhancement, AT: AUTOMERGE, scripts
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Projects
None yet
Development

Successfully merging this pull request may close these issues.

5 participants