Merge pull request #563 from ekluzek/relupext

Update externals (cime, mosart, rtm) for release branch, add new science support compsets/tests

Externals.cfg

@@ -16,21 +16,21 @@ required = True
 local_path = components/rtm
 protocol = git
 repo_url = https://github.com/ESCOMP/rtm
-tag = release-cesm2.0.00
+tag = release-cesm2.0.02
 required = True
 
 [mosart]
 local_path = components/mosart
 protocol = git
 repo_url = https://github.com/ESCOMP/mosart
-tag = release-cesm2.0.00
+tag = release-cesm2.0.03
 required = True
 
 [cime]
 local_path = cime
 protocol = git
 repo_url = https://github.com/ESMCI/cime
-tag = cime_cesm2_0_rel_05
+tag = cime_cesm2_1_rel_04
 required = True
 
 [externals_description]

cime_config/config_compsets.xml

@@ -177,6 +177,13 @@
     <science_support grid="f19_g17"/>
   </compset>
 
+  <compset>
+    <alias>IHistClm50SpCru</alias>
+    <lname>HIST_DATM%CRUv7_CLM50%SP_SICE_SOCN_MOSART_CISM2%NOEVOLVE_SWAV</lname>
+    <science_support grid="f09_g17"/>
+    <science_support grid="f19_g17"/>
+  </compset>
+
   <compset>
     <alias>IHistClm50Bgc</alias>
     <lname>HIST_DATM%GSWP3v1_CLM50%BGC_SICE_SOCN_MOSART_CISM2%NOEVOLVE_SWAV</lname>
@@ -309,6 +316,13 @@
     <science_support grid="f19_g17"/>
   </compset>
 
+  <compset>
+    <alias>IHistClm45SpGs</alias>
+    <lname>HIST_DATM%GSWP3v1_CLM45%SP_SICE_SOCN_RTM_SGLC_SWAV</lname>
+    <science_support grid="f09_g17"/>
+    <science_support grid="f19_g17"/>
+  </compset>
+
   <!-- Primarily for testing -->
   <compset>
     <alias>I2000Clm50Vic</alias>
@@ -368,6 +382,13 @@
     <science_support grid="f19_g17"/>
   </compset>
 
+  <compset>
+    <alias>IHistClm40SpGswGs</alias>
+    <lname>HIST_DATM%GSWP3v1_CLM40%SP_SICE_SOCN_RTM_SGLC_SWAV</lname>
+    <science_support grid="f09_g17"/>
+    <science_support grid="f19_g17"/>
+  </compset>
+
   <compset>
     <alias>IHistClm40SpCruGs</alias>
     <lname>HIST_DATM%CRUv7_CLM40%SP_SICE_SOCN_RTM_SGLC_SWAV</lname>

cime_config/testdefs/testlist_clm.xml

@@ -322,7 +322,7 @@
       <option name="wallclock">00:20:00</option>
     </options>
   </test>
-  <test name="ERP_D_Ld5" grid="f19_g17" compset="IHistClm50Bgc" testmods="clm/drydepnomegan">
+  <test name="ERP_D_Ld5" grid="f19_g17" compset="IHistClm50SpCru" testmods="clm/drydepnomegan">
     <machines>
       <machine name="cheyenne" compiler="intel" category="aux_clm"/>
     </machines>
@@ -591,7 +591,7 @@
       <option name="comment"  >Multi-year global test of transient crops together with transient glaciers. Use no-evolve glaciers with ERP test</option>
     </options>
   </test>
-  <test name="ERP_P36x2_D_Ld5" grid="f10_f10_musgs" compset="I1850Clm45Bgc" testmods="clm/default">
+  <test name="ERP_P36x2_D_Ld5" grid="f10_f10_musgs" compset="I1850Clm45BgcGs" testmods="clm/default">
     <machines>
       <machine name="cheyenne" compiler="intel" category="aux_clm"/>
       <machine name="cheyenne" compiler="gnu" category="aux_clm"/>
@@ -648,12 +648,21 @@
   <test name="ERP_P36x2_D_Ld5" grid="f10_f10_musgs" compset="IHistClm45BgcCruGs" testmods="clm/decStart">
     <machines>
       <machine name="cheyenne" compiler="intel" category="aux_clm"/>
+      <machine name="cheyenne" compiler="intel" category="aux_cime_baselines"/>
     </machines>
     <options>
       <option name="wallclock">00:20:00</option>
       <option name="comment"  >include a debug test of IHistClm45BgcCruGs</option>
     </options>
   </test>
+  <test name="ERP_D_Ld5" grid="f10_f10_musgs" compset="IHistClm45SpGs" testmods="clm/decStart">
+    <machines>
+      <machine name="cheyenne" compiler="intel" category="aux_clm"/>
+    </machines>
+    <options>
+      <option name="wallclock">00:20:00</option>
+    </options>
+  </test>
   <test name="ERP_P36x2_Lm13" grid="f10_f10_musgs" compset="IHistClm50Bgc" testmods="clm/monthly">
     <machines>
       <machine name="cheyenne" compiler="intel" category="aux_clm"/>
@@ -911,7 +920,7 @@
       <option name="wallclock">00:20:00</option>
     </options>
   </test>
-  <test name="ERS_Ld3" grid="f19_f19_mg16" compset="IHistClm40SpCruGs" testmods="clm/40default">
+  <test name="ERS_Ld3" grid="f19_f19_mg16" compset="IHistClm40SpGswGs" testmods="clm/40default">
     <machines>
       <machine name="cheyenne" compiler="intel" category="aux_clm"/>
     </machines>

doc/ChangeSum

@@ -1,5 +1,6 @@
 Tag                   Who      Date  Summary
 ============================================================================================================================
+release-clm5.0.13     erik 11/14/2018 Update externals with new CO2/presearo/rtm/mosart, add science_support, change testing
 release-clm5.0.12     erik 11/03/2018 New IC files for clm45/clm50 coupled cases, add 2010 compset
 release-clm5.0.11     erik 10/30/2018 Bring fix for transient Bgc/Sp to release branch (from ctsm1.0.dev013)
 release-clm5.0.10    sacks 10/29/2018 Bring in CMIP6 compset modifiers, output usermods and bit-for-bit fixes from dev014 and dev015

doc/release-clm5.0.ChangeLog

@@ -1,4 +1,106 @@
 ===============================================================
+Tag name:  release-clm5.0.13
+Originator(s):  erik (Erik Kluzek)
+Date: Wed Nov 14 11:28:00 MST 2018
+One-line Summary: Update externals with new CO2/presearo/rtm/mosart, add science_support, change testing
+
+Purpose of this version:
+------------------------
+
+Update externals with new CO2 and prescribed aerosols. As well as rtm and mosart that now
+properly does history output in double precision. Add science support to three new transient
+compsets for clm4_0/clm4_5/clm5_0. Do some changes to testing.
+
+
+CTSM Master Tag This Corresponds To: ctsm1.0.dev015 (with changes)
+
+Summary of changes:
+-------------------
+
+Issues fixed (include CTSM Issue #): Fixes #560 #558
+  #560 New science supported compsets
+  #558 Add IHist test for aux_cime_baselines
+CIME Issues fixed (include issue #): #2688 #2687
+  #2688 Prescribed aerosols for CMIP6 forcing
+  #2687 New CO2 streams for CMIP6
+
+Science changes since: release-clm5.0.012
+   New CMIP6 prescribed aerosol forcing 
+   New CMIP6 CO2 streams
+   New rtm/mosart history properly output in double-precision 
+   (old "single"-precision mode was incorrect). It was actually
+   still double in terms of size, but in rare cases could be off
+   by single precision rounding level.
+
+Software changes since: release-clm5.0.012
+   Added science_support for several compsets (at f09_g17 and f19_g17):
+       HIST_DATM%CRUv7_CLM50%SP_SICE_SOCN_MOSART_CISM2%NOEVOLVE_SWAV
+       HIST_DATM%GSWP3v1_CLM45%SP_SICE_SOCN_RTM_SGLC_SWAV
+       HIST_DATM%GSWP3v1_CLM40%SP_SICE_SOCN_RTM_SGLC_SWAV
+   Add testing for above
+
+Changes to User Interface since: release-clm5.0.012
+   rtm/mosart history output is double precision
+   - Added clim_2010 option for DATM_PRESAERO
+      Added 20tr.latbnd option for DATM_CO2_TSERIES
+      GSWP3v1 and CRUNCEPv7 forcing sets appropriate years for compsets starting with 2010
+
+Testing:
+--------
+
+ [PASS means all tests PASS and OK means tests PASS other than expected fails.]
+
+  build-namelist tests:
+
+    cheyenne - PASS
+
+  unit-tests (components/clm/src):
+
+    cheyenne - PASS
+    hobart ---PASS
+
+  regular tests (aux_clm):
+
+    cheyenne_intel ---- OK
+    cheyenne_gnu ------ OK
+    hobart_nag -------- OK
+    hobart_pgi -------- OK
+    hobart_intel ------ OK
+
+Summary of Answer changes:
+-------------------------
+
+Baseline version for comparison: release-clm5.0.12
+
+Changes answers relative to baseline: Yes!
+
+  Summarize any changes to answers, i.e.,
+    - what code configurations: Nearly everything (only 5 test cases were identical)
+    - what platforms/compilers: All
+    - nature of change: CO2 for transient cases is different, and presearo is different for everything
+       Modest change to climate
+
+Detailed list of changes:
+------------------------
+
+Externals being used:
+
+   cism:   release-cesm2.0.04
+   rtm:    release-cesm2.0.02
+   mosart: release-cesm2.0.03
+   cime:   cime_cesm2_1_rel_04
+   FATES:  fates_s1.8.1_a3.0.0
+   PTCLM:  PTCLM2_180611
+
+CTSM Tag versions pulled over from master development branch: None
+
+Pull Requests that document the changes (include PR ids): #563
+(https://github.com/ESCOMP/ctsm/pull)
+
+  #563 -- Update externals (cime, mosart, rtm) for release branch, add new science support compsets/tests
+
+===============================================================
+===============================================================
 Tag name:  release-clm5.0.12
 Originator(s):  erik (Erik Kluzek)
 Date: Sat Nov  3 21:19:25 MDT 2018