Merge pull request #1634 from ESMCI/jgfouca/acme_merge_06_01_2017

Jgfouca/acme merge 06 01 2017

Last 3 months of ACME work.

Test suite: scripts_regression_tests
Test baseline:
Test namelist changes:
Test status: [bit for bit, roundoff, climate changing]

Fixes [CIME Github issue #]

User interface changes?:

Code review:

config/acme/allactive/config_compsets.xml

@@ -76,6 +76,39 @@
   <lname>2000_CAM5%AV1C-L_CLM45%SPBC_MPASCICE_MPASO_RTM_MPASLIALB_SWAV</lname>
 </compset>
 
+<!-- ACME v1 science compsets (hires) -->
+
+<compset>
+  <alias>A_WCYCL2000_H01A</alias >
+  <lname>2000_CAM5%AV1C-H01A_CLM45%SPBC_MPASCICE_MPASO_MOSART_SGLC_SWAV</lname>
+</compset>
+
+<compset>
+  <alias>A_WCYCL2000_H01AS</alias >
+  <lname>2000_CAM5%AV1C-H01A_CLM45%SPBC_MPASCICE%SPUNUP_MPASO%SPUNUP_MOSART_SGLC_SWAV</lname>
+</compset>
+
+<compset>
+  <alias>A_WCYCL1850_H01A</alias >
+  <lname>1850_CAM5%AV1C-H01A_CLM45%SPBC_MPASCICE_MPASO_MOSART_SGLC_SWAV</lname>
+</compset>
+
+<compset>
+  <alias>A_WCYCL1850_H01AS</alias >
+  <lname>1850_CAM5%AV1C-H01A_CLM45%SPBC_MPASCICE%SPUNUP_MPASO%SPUNUP_MOSART_SGLC_SWAV</lname>
+</compset>
+
+
+<compset>
+  <alias>A_WCYCL20TR_H01A</alias >
+  <lname>20TR_CAM5%AV1C-H01A_CLM45%SPBC_MPASCICE_MPASO_MOSART_SGLC_SWAV</lname>
+</compset>
+
+<compset>
+  <alias>A_WCYCL20TR_H01AS</alias >
+  <lname>20TR_CAM5%AV1C-H01A_CLM45%SPBC_MPASCICE%SPUNUP_MPASO%SPUNUP_MOSART_SGLC_SWAV</lname>
+</compset>
+
 <!-- ACME backup compsets -->
 <compset>
  <alias>A_WCYCL1850_v0atm</alias> 
@@ -87,6 +120,17 @@
  <lname>2000_CAM5_CLM45%SP_MPASCICE_MPASO_MOSART_SGLC_SWAVi</lname>
 </compset>
 
+<compset>
+ <alias>A_WCYCL1850S_v0atm</alias> 
+ <lname>1850_CAM5_CLM45%SP_MPASCICE%SPUNUP_MPASO%SPUNUP_MOSART_SGLC_SWAV</lname>
+</compset>
+
+<compset>
+ <alias>A_WCYCL2000S_v0atm</alias>
+ <lname>2000_CAM5_CLM45%SP_MPASCICE%SPUNUP_MPASO%SPUNUP_MOSART_SGLC_SWAVi</lname>
+</compset>
+
+
 <!-- ACME BG compsets -->
 
 <compset>
@@ -145,4 +189,21 @@
   <lname>1850_CAM5_CLM45%BGC_CICE_DOCN%SOM_RTM_SGLC_SWAV</lname>
 </compset>
 
+<compset>
+  <alias>E1850C5CNECACTCBC</alias>
+  <lname>1850_CAM5_CLM45%CNECACTCBC_CICE_DOCN%SOM_RTM_SGLC_SWAV</lname>
+</compset>
+
+<compset>
+  <alias>E20TRC5CNECACTCBC</alias>
+  <lname>20TR_CAM5_CLM45%CNECACTCBC_CICE_DOCN%SOM_RTM_SGLC_SWAV</lname>
+</compset>
+
+<entries>
+  <entry id="RUN_STARTDATE">
+    <values>
+      <value  compset="20TR_CAM">1850-01-01</value>
+    </values>
+  </entry>
+</entries>
 </compsets>