Skip to content

Commit

Permalink
Merge branch 'update_externals_2021_09'
Browse files Browse the repository at this point in the history
Update externals (nuopc now the default!) and test list

Purpose of changes:

   - Update externals to versions tentatively planned for
     cesm2_3_beta06. A key change here is to make nuopc the default
     driver.

   - Rework test names now that nuopc is the default driver (so _Vmct is
     needed explicitly, _Vnuopc is not)

   - Add a few more nuopc tests, now that nuopc is working on izumi_nag
     (partially addresses
     #60)

   - Fix for build issue on izumi_nag
  • Loading branch information
billsacks committed Sep 29, 2021
2 parents c7ac876 + eb4e09d commit 05d249d
Show file tree
Hide file tree
Showing 8 changed files with 223 additions and 78 deletions.
52 changes: 52 additions & 0 deletions ChangeLog
Original file line number Diff line number Diff line change
Expand Up @@ -2,6 +2,58 @@
This file describes what tags were created on master and why
================================================================================

================================================================================
Originator: sacks
Date: September 29, 2021
Version: cismwrap_2_1_92
One-line summary: Update externals (nuopc now the default!) and test list

Purpose of changes:

- Update externals to versions tentatively planned for
cesm2_3_beta06. A key change here is to make nuopc the default
driver.

- Rework test names now that nuopc is the default driver (so _Vmct is
needed explicitly, _Vnuopc is not)

- Add a few more nuopc tests, now that nuopc is working on izumi_nag
(partially addresses
https://github.com/ESCOMP/CISM-wrapper/issues/60)

- Fix for build issue on izumi_nag

Standalone checkout supported in this tag (Yes/No): Yes
(If yes, this implies that we expect to be able to build and run a
case from a standalone checkout using manage_externals, and for this
to continue to work long-term. The answer may be "No" if the set of
externals pointed to by manage_externals is broken, or if at least
one external points to a temporary branch that is may be deleted in
the near future.)

If No: Notes on externals used for testing:

Changes answers relative to previous tag: No, but test names have changed

To do baseline comparisons, I needed to create a temporary baseline
directory where I renamed the tests as in this tag. With those
renames, all tests passed baseline comparisons, though I compset
tests had fieldlist differences.

Bugs fixed (include github issue number):
- Partially addresses ESCOMP/CISM-wrapper#60 (Once nuopc/cmeps cases
work on izumi, add some testing)

Summary of testing:

Full aux_glc test suite on cheyenne and izumi.

All tests passed and are bit-for-bit.

Note that there are a few other nuopc tests I feel we should add, but
I have left them out for now because they would fail: see
https://github.com/ESCOMP/CISM-wrapper/issues/60 for details.

================================================================================
Originator: sacks
Date: September 14, 2021
Expand Down
14 changes: 6 additions & 8 deletions Externals.cfg
Original file line number Diff line number Diff line change
Expand Up @@ -8,36 +8,35 @@ required = True
local_path = cime
protocol = git
repo_url = https://github.com/ESMCI/cime.git
# This hash is a little past cime6.0.5
hash = a67819810ce7c861cc9d9a0713facc914cbb9bb6
tag = cime6.0.9
required = True

[cmeps]
local_path = components/cmeps
protocol = git
repo_url = https://github.com/ESCOMP/CMEPS.git
tag = cmeps0.13.18
tag = cmeps0.13.30
required = True

[cdeps]
local_path = components/cdeps
protocol = git
repo_url = https://github.com/ESCOMP/CDEPS.git
tag = cdeps0.12.14
tag = cdeps0.12.26
required = True

[cpl7]
local_path = components/cpl7
protocol = git
repo_url = https://github.com/ESCOMP/CESM_CPL7andDataComps
tag = cpl7.0.3
tag = cpl7.0.5
required = True

[share]
local_path = share
protocol = git
repo_url = https://github.com/ESCOMP/CESM_share
tag = share1.0.2
tag = share1.0.7
required = True

[mct]
Expand All @@ -60,8 +59,7 @@ required = True
local_path = components/clm
protocol = git
repo_url = https://github.com/ESCOMP/CTSM.git
# This hash is on branch antarctica_compset, a little past ctsm5.1.dev049
hash = 602c81ffe5b411a93b7d23e106bf9baf3610f2e5
tag = ctsm5.1.dev053
externals = Externals_CLM.cfg
required = True

Expand Down
2 changes: 1 addition & 1 deletion Externals_CISM.cfg
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,7 @@
local_path = source_cism
protocol = git
repo_url = https://github.com/ESCOMP/cism
tag = cism_main_2.01.008
tag = cism_main_2.01.009
required = True

[externals_description]
Expand Down
Loading

0 comments on commit 05d249d

Please sign in to comment.