From 90b923895a85ba466a94f84dda67d84b93258cf5 Mon Sep 17 00:00:00 2001
From: Peter Bogenschutz <bogenschutz1@llnl.gov>
Date: Mon, 30 Jan 2017 14:09:28 -0800
Subject: [PATCH] changes to run SCM and ARM97

---
 cime/cime_config/acme/config_grids.xml         |  8 +++++++-
 components/cam/cime_config/config_compsets.xml | 15 ++++++++++++++-
 2 files changed, 21 insertions(+), 2 deletions(-)

diff --git a/cime/cime_config/acme/config_grids.xml b/cime/cime_config/acme/config_grids.xml
index 4c14cd5a24b..bccd8669507 100644
--- a/cime/cime_config/acme/config_grids.xml
+++ b/cime/cime_config/acme/config_grids.xml
@@ -1026,8 +1026,14 @@
 
     <domain name="T42">
       <nx>128</nx> <ny>64</ny>
+      <file atm_mask="usgs">domain.lnd.T42_USGS.111004.nc</file>
+      <file lnd_mask="usgs">domain.lnd.T42_USGS.111004.nc</file>
+      <file ocn_mask="usgs">domain.camocn.64x128_USGS_070807.nc</file>
+      <path atm_mask="usgs">$DIN_LOC_ROOT/share/domains/domain.clm</path>
+      <path lnd_mask="usgs">$DIN_LOC_ROOT/share/domains/domain.clm</path>
+      <path ocn_mask="usgs">$DIN_LOC_ROOT/atm/cam/ocnfrac</path>
       <desc>T42 is Gaussian grid:</desc>
-    </domain>
+    </domain> 
 
     <domain name="T31">
       <nx>96</nx> <ny>48</ny>
diff --git a/components/cam/cime_config/config_compsets.xml b/components/cam/cime_config/config_compsets.xml
index fc0275deed2..6294bd395c1 100644
--- a/components/cam/cime_config/config_compsets.xml
+++ b/components/cam/cime_config/config_compsets.xml
@@ -526,6 +526,11 @@
     <alias>FG20TRCN</alias>
     <lname>20TR_CAM4_CLM40%CN_CICE%PRES_DOCN%DOM_RTM_CISM1_SWAV</lname>
   </compset>
+  
+  <compset>
+    <alias>F_ARM97_SCAM5</alias>
+    <lname>AR97_CAM5%SCAM_CLM40%SP_CICE%PRES_DOCN%DOM_RTM_SGLC_SWAV</lname>
+  </compset>  
 
   <entries>
 
@@ -551,7 +556,7 @@
 	<value  compset="C2R[68]_CAM">1950-01-01</value> 
 	<value  compset="C2R4_CAM">2004-01-01</value>
 	<value  compset="AR95_CAM">1995-07-18</value>
-	<value  compset="AR97_CAM">1997-06-18</value>
+	<value  compset="AR97_CAM">1997-06-19</value>
       </values>
     </entry>
 
@@ -595,14 +600,22 @@
     <entry id="STOP_OPTION"> 
       <values>
 	<value compset="AR95_CAM">ndays</value>
+	<value compset="AR97_CAM">ndays</value>
       </values>
     </entry>
 
     <entry id="STOP_N"> 
       <values>
 	<value compset="AR95_CAM">2</value>
+	<value compset="AR97_CAM">29</value>
       </values>
     </entry>
+  
+    <entry id="MASK_GRID"> 
+      <values>
+	<value compset="AR97_CAM">USGS</value>
+      </values>
+    </entry>    
 
     <entry id="GET_REFCASE"> 
       <values>