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

Multiple mods for maint-1.0 to run compset F1850C5-CMIP6 and nbfb tests #2877

Merged
merged 4 commits into from
Apr 23, 2019

Conversation

singhbalwinder
Copy link
Contributor

@singhbalwinder singhbalwinder commented Apr 22, 2019

This PR adds following 4 fixes:

  1. Fixes the land initial conditions for CMIP6 compset:

Adds the land/ocean mask for the existing land initial conditions to
only define a land initial condition file for appropriate resolutions.

  1. Apply maximum MPI tag value patch:

Context:
@rljacob requested the CMDV-SM team apply their climate reproducibility tests to maint-1.0 to determine if the simulations run on Edison are reproducible on Cori. This patch is required in order to run Salil's multivariate climate reproducible tests.

Changes:

In ESMCI/cime#2804 and ESMCI/cime#2892, the MPI tag generation for MCT was adjusted to allow more than ~30 multi-instance runs fixing #2487 and ESMCI/cime#2890. This PR applies these changes to Maint-1.0.

  1. Adds TSC and NPG tests nbfb tests:

This fix adds python scripts for nbfb tests which were missing in maint-1.0. Adding these tests will allow us to run these tests using maint1.0

  1. Fixes a bug in PIO1 which was fixed in master via CIME update:

This bug was fixed in master branch via a CIME update (see 8352dd4).

[BFB]

from branch bishtgautam/lnd/fix-cmip6-initial-conds
from branch jhkennedy/maint-1.0/mpi-tags
from branch huiwanpnnl/cime/maint-1.0_tsc_pgn
This bug was fixed in master via CIME update via branch
jgfouca/branch-for-to-acme-2019-01-14
@singhbalwinder singhbalwinder added Atmosphere Land BFB PR leaves answers BFB PIO maint-1.0 PRs for or issues about maint-1.0 Testing Anything related to unit/system tests labels Apr 22, 2019
Copy link
Member

@rljacob rljacob left a comment

Choose a reason for hiding this comment

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

The commit messages only reference other branches for details of what is in the commits. I don't think that is good enough. If those branches weren't merged to master, they could go away. You can copy and paste from another commit message to add more detail or reference a hash on master. You should probably redo this branch.

@singhbalwinder
Copy link
Contributor Author

singhbalwinder commented Apr 23, 2019

That is a good point. I will edit the PR description to add info about each mod and then copy-paste this description in the commit message when I merge this to maint1.0.

I am testing this branch for BFB on edison. I can test all other mods except for the mod by Gautam (mask for land init conds) as I need that to run the model (otherwise, the model crashes with a check_dim error in the land model)

@singhbalwinder
Copy link
Contributor Author

I have edited the PR description and also ran a BFB test on Edison (SMS.ne30_ne30.F1850C5-CMIP6.edison_intel) using maint-1.0. The test PASSed, so I will merge this PR as soon as I get approval from @rljacob .

@singhbalwinder singhbalwinder merged commit bd1511a into maint-1.0 Apr 23, 2019
singhbalwinder added a commit that referenced this pull request Apr 23, 2019
#2877)

Multiple mods for maint-1.0 to run compset F1850C5-CMIP6 and nbfb tests

This PR adds following 4 fixes:

1. Fixes the land initial conditions for CMIP6 compset:
Adds the land/ocean mask for the existing land initial conditions to
only define a land initial condition file for appropriate resolutions.

2. Apply maximum MPI tag value patch:
Context:
@rljacob requested the CMDV-SM team apply their climate reproducibility
 tests to maint-1.0 to determine if the simulations run on Edison are
reproducible on Cori. This patch is required in order to run Salil's
multivariate climate reproducible tests.

Changes:

In ESMCI/cime#2804 and ESMCI/cime#2892, the MPI tag generation for MCT
was adjusted to allow more than ~30 multi-instance runs fixing #2487
and ESMCI/cime#2890. This PR applies these changes to Maint-1.0.

3. Adds TSC and NPG tests nbfb tests:
This fix adds python scripts for nbfb tests which were missing in
maint-1.0. Adding these tests will allow us to run these tests using
maint1.0

4. Fixes a bug in PIO1 which was fixed in master via CIME update:
This bug was fixed in master branch via a CIME update (see 8352dd4).

[BFB]

* singhbalwinder/atm/mods-for-nbfb-test:
  Fixes a bug in pio1
  Adds tsc and npg tests
  MPI tag fix
  Land init fix for missing mask
jgfouca pushed a commit that referenced this pull request Jun 26, 2024
…-io-timers-per-yaml-file

Automatically Merged using E3SM Pull Request AutoTester
PR Title: Add timers on a per-yaml-file-basis
PR Author: bartgol
PR LABELS: I/O, AT: AUTOMERGE
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
Atmosphere BFB PR leaves answers BFB Land maint-1.0 PRs for or issues about maint-1.0 PIO Testing Anything related to unit/system tests
Projects
None yet
Development

Successfully merging this pull request may close these issues.

None yet

2 participants