Skip to content

Commit

Permalink
Merge branch 'mvertens/nuopc_cap'
Browse files Browse the repository at this point in the history 
Updates to NUOPC cap and minor fixes to ncdio_pio

This tag has updates to the NUOPC cap that are needed for the latest
version of CMEPS.

Now each component NUOPC cap needs to compute possibly time varying
orbital parameters. Before, in cpl7, this was done in the driver and
passed to the components via seq_infodata. However, now the driver is
really just a simple ascii file - so those calculations needed to
migrate to the component caps.

In addition, this tag contains changes to ncdio_pio.F90 that improve
performance in some situations.

This also updates MOSART and RTM tags to include fixes for the NUOPC cap
for MOSART and implementation of an initial NUOPC cap for RTM.

Also, I1Pt compsets now use SROF rather than using an active runoff
model in 'null' mode. This leads to differences in namelists, but not in
results.

Mariana Vertenstein implemented most of the changes in this tag; Jim
Edwards implemented the ncdio_pio changes; Bill Sacks did final testing
and integration.

Resolves #943 (NUOPC tests will fail in ctsm1.0.dev085)
  • Loading branch information
@billsacks
billsacks committed Mar 19, 2020
2 parents 62e41a2 + 4d7c7b7 commit 384c726
Show file tree
Hide file tree
Showing 13 changed files with 2,594 additions and 237 deletions.
4 changes: 2 additions & 2 deletions Externals.cfg
View file
Original file line number Diff line number Diff line change
Expand Up @@ -16,14 +16,14 @@ required = True
local_path = components/rtm
protocol = git
repo_url = https://github.com/ESCOMP/rtm
tag = rtm1_0_70
tag = rtm1_0_71
required = True

[mosart]
local_path = components/mosart
protocol = git
repo_url = https://github.com/ESCOMP/mosart
tag = mosart1_0_35
tag = mosart1_0_36
required = True

[cime]
Expand Down
2 changes: 1 addition & 1 deletion Externals_cime.cfg
View file
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
[cmeps]
hash = 181ff1ed9dfb279e619e8a2173f43baf7bf1dce3
hash = 253f612acae07b2b1dc73c84f1bb30b8e1b86ddd
protocol = git
repo_url = https://github.com/ESCOMP/CMEPS.git
local_path = src/drivers/nuopc/
Expand Down
26 changes: 21 additions & 5 deletions cime_config/config_compsets.xml
View file
Original file line number Diff line number Diff line change
Expand Up @@ -37,13 +37,13 @@
<!-- I single point forcing -->

<compset>
<alias>I1PtClm50SpGs</alias>
<lname>2000_DATM%1PT_CLM50%SP_SICE_SOCN_MOSART_SGLC_SWAV</lname>
<alias>I1PtClm50SpRsGs</alias>
<lname>2000_DATM%1PT_CLM50%SP_SICE_SOCN_SROF_SGLC_SWAV</lname>
</compset>

<compset>
<alias>I1PtClm45SpGs</alias>
<lname>2000_DATM%1PT_CLM45%SP_SICE_SOCN_RTM_SGLC_SWAV</lname>
<alias>I1PtClm45SpRsGs</alias>
<lname>2000_DATM%1PT_CLM45%SP_SICE_SOCN_SROF_SGLC_SWAV</lname>
</compset>

<!-- I CLM50 Compsets -->
Expand Down Expand Up @@ -76,6 +76,12 @@
<lname>2000_DATM%GSWP3v1_CLM50%BGC-CROP_SICE_SOCN_RTM_CISM2%NOEVOLVE_SWAV</lname>
</compset>

<!-- Primarily for testing; used in the RTM test suite -->
<compset>
<alias>I2000Clm50BgcCropRtmGs</alias>
<lname>2000_DATM%GSWP3v1_CLM50%BGC-CROP_SICE_SOCN_RTM_SGLC_SWAV</lname>
</compset>

<compset>
<alias>I2000Clm50BgcCrop</alias>
<lname>2000_DATM%GSWP3v1_CLM50%BGC-CROP_SICE_SOCN_MOSART_CISM2%NOEVOLVE_SWAV</lname>
Expand Down Expand Up @@ -187,6 +193,11 @@
<lname>2000_DATM%GSWP3v1_CLM50%FATES_SICE_SOCN_MOSART_SGLC_SWAV</lname>
</compset>

<compset>
<alias>I2000Clm50FatesRsGs</alias>
<lname>2000_DATM%GSWP3v1_CLM50%FATES_SICE_SOCN_SROF_SGLC_SWAV</lname>
</compset>

<compset>
<alias>I1850Clm50Bgc</alias>
<lname>1850_DATM%GSWP3v1_CLM50%BGC_SICE_SOCN_MOSART_CISM2%NOEVOLVE_SWAV</lname>
Expand Down Expand Up @@ -326,7 +337,12 @@
<lname>2000_DATM%GSWP3v1_CLM45%FATES_SICE_SOCN_RTM_CISM2%NOEVOLVE_SWAV</lname>
</compset>

<!-- Stub glacier needed for regional / single-point -->
<!-- Stub glacier / stub rof needed for regional / single-point -->
<compset>
<alias>I2000Clm45FatesRsGs</alias>
<lname>2000_DATM%GSWP3v1_CLM45%FATES_SICE_SOCN_SROF_SGLC_SWAV</lname>
</compset>

<compset>
<alias>I2000Clm45FatesGs</alias>
<lname>2000_DATM%GSWP3v1_CLM45%FATES_SICE_SOCN_RTM_SGLC_SWAV</lname>
Expand Down
7 changes: 0 additions & 7 deletions cime_config/testdefs/ExpectedTestFails.xml
View file
Original file line number Diff line number Diff line change
Expand Up @@ -44,13 +44,6 @@
</phase>
</test>

<test name="SMS_D_Vnuopc.f10_f10_musgs.I2000Clm50SpRsGs.cheyenne_intel.clm-default">
<phase name="SHAREDLIB_BUILD">
<status>PEND</status>
<issue>#943</issue>
</phase>
</test>

<!-- fates test suite failures -->

<test name="ERS_Ld60.f45_f45_mg37.I2000Clm45Fates.hobart_nag.clm-Fates">
Expand Down
24 changes: 12 additions & 12 deletions cime_config/testdefs/testlist_clm.xml
View file
Original file line number Diff line number Diff line change
Expand Up @@ -842,7 +842,7 @@
<option name="wallclock">00:20:00</option>
</options>
</test>
<test name="ERS_D_Ld5_Mmpi-serial" grid="1x1_mexicocityMEX" compset="I1PtClm50SpGs" testmods="clm/default">
<test name="ERS_D_Ld5_Mmpi-serial" grid="1x1_mexicocityMEX" compset="I1PtClm50SpRsGs" testmods="clm/default">
<machines>
<machine name="izumi" compiler="nag" category="aux_clm"/>
</machines>
Expand Down Expand Up @@ -876,23 +876,23 @@
<option name="wallclock">00:20:00</option>
</options>
</test>
<test name="ERS_Ld5_Mmpi-serial" grid="1x1_vancouverCAN" compset="I1PtClm45SpGs" testmods="clm/default">
<test name="ERS_Ld5_Mmpi-serial" grid="1x1_vancouverCAN" compset="I1PtClm45SpRsGs" testmods="clm/default">
<machines>
<machine name="cheyenne" compiler="intel" category="aux_clm"/>
</machines>
<options>
<option name="wallclock">00:20:00</option>
</options>
</test>
<test name="ERS_Ld5_Mmpi-serial" grid="1x1_mexicocityMEX" compset="I1PtClm50SpGs" testmods="clm/default">
<test name="ERS_Ld5_Mmpi-serial" grid="1x1_mexicocityMEX" compset="I1PtClm50SpRsGs" testmods="clm/default">
<machines>
<machine name="izumi" compiler="nag" category="prealpha"/>
</machines>
<options>
<option name="wallclock">00:20:00</option>
</options>
</test>
<test name="ERS_Ld5_Mmpi-serial" grid="1x1_vancouverCAN" compset="I1PtClm50SpGs" testmods="clm/default">
<test name="ERS_Ld5_Mmpi-serial" grid="1x1_vancouverCAN" compset="I1PtClm50SpRsGs" testmods="clm/default">
<machines>
<machine name="cheyenne" compiler="intel" category="aux_clm"/>
</machines>
Expand Down Expand Up @@ -1125,23 +1125,23 @@
<option name="wallclock">00:20:00</option>
</options>
</test>
<test name="SMS_D_Ld1_Mmpi-serial" grid="1x1_vancouverCAN" compset="I1PtClm45SpGs" testmods="clm/default">
<test name="SMS_D_Ld1_Mmpi-serial" grid="1x1_vancouverCAN" compset="I1PtClm45SpRsGs" testmods="clm/default">
<machines>
<machine name="izumi" compiler="nag" category="aux_clm"/>
</machines>
<options>
<option name="wallclock">00:20:00</option>
</options>
</test>
<test name="SMS_D_Ld1_Mmpi-serial" grid="1x1_mexicocityMEX" compset="I1PtClm50SpGs" testmods="clm/default">
<test name="SMS_D_Ld1_Mmpi-serial" grid="1x1_mexicocityMEX" compset="I1PtClm50SpRsGs" testmods="clm/default">
<machines>
<machine name="cheyenne" compiler="intel" category="aux_clm"/>
</machines>
<options>
<option name="wallclock">00:20:00</option>
</options>
</test>
<test name="SMS_D_Ld1_Mmpi-serial" grid="1x1_vancouverCAN" compset="I1PtClm50SpGs" testmods="clm/default">
<test name="SMS_D_Ld1_Mmpi-serial" grid="1x1_vancouverCAN" compset="I1PtClm50SpRsGs" testmods="clm/default">
<machines>
<machine name="izumi" compiler="nag" category="aux_clm"/>
<machine name="cheyenne" compiler="gnu" category="aux_clm"/>
Expand Down Expand Up @@ -1234,7 +1234,7 @@
<option name="comment" >include a nag debug test of Clm45BgcCrop</option>
</options>
</test>
<test name="SMS_D_Ld5_Mmpi-serial" grid="1x1_mexicocityMEX" compset="I1PtClm50SpGs" testmods="clm/default">
<test name="SMS_D_Ld5_Mmpi-serial" grid="1x1_mexicocityMEX" compset="I1PtClm50SpRsGs" testmods="clm/default">
<machines>
<machine name="cheyenne" compiler="intel" category="aux_clm"/>
</machines>
Expand All @@ -1243,7 +1243,7 @@
<option name="tput_tolerance">0.5</option>
</options>
</test>
<test name="SMS_D_Lm1_Mmpi-serial" grid="CLM_USRDAT" compset="I1PtClm50SpGs" testmods="clm/USUMB">
<test name="SMS_D_Lm1_Mmpi-serial" grid="CLM_USRDAT" compset="I1PtClm50SpRsGs" testmods="clm/USUMB">
<machines>
<machine name="cheyenne" compiler="intel" category="aux_clm"/>
<machine name="cheyenne" compiler="intel" category="prebeta"/>
Expand Down Expand Up @@ -1305,7 +1305,7 @@
<option name="wallclock">00:20:00</option>
</options>
</test>
<test name="SMS_Ld1_Mmpi-serial" grid="1x1_mexicocityMEX" compset="I1PtClm50SpGs" testmods="clm/default">
<test name="SMS_Ld1_Mmpi-serial" grid="1x1_mexicocityMEX" compset="I1PtClm50SpRsGs" testmods="clm/default">
<machines>
<machine name="cheyenne" compiler="intel" category="aux_clm"/>
</machines>
Expand Down Expand Up @@ -1886,7 +1886,7 @@
</machine>
</machines>
</test>
<test name="SMS_Ly1_Mmpi-serial" grid="1x1_vancouverCAN" compset="I1PtClm50SpGs" testmods="clm/output_sp_highfreq">
<test name="SMS_Ly1_Mmpi-serial" grid="1x1_vancouverCAN" compset="I1PtClm50SpRsGs" testmods="clm/output_sp_highfreq">
<machines>
<machine name="cheyenne" compiler="gnu" category="aux_clm">
<options>
Expand All @@ -1896,7 +1896,7 @@
</machine>
</machines>
</test>
<test name="SMS_D_Vnuopc" grid="f10_f10_musgs" compset="I2000Clm50SpRsGs" testmods="clm/default">
<test name="SMS_D_Ld5_Vnuopc" grid="f10_f10_musgs" compset="I2000Clm50BgcCropGs" testmods="clm/default">
<machines>
<machine name="cheyenne" compiler="intel" category="aux_clm">
<options>
Expand Down
Loading

0 comments on commit 384c726

Please sign in to comment.