Merge branch 'bogensch/atm/EUL_SCM_cime' into next (PR #1253)

Add T42 atm, lnd and ocn mask to config_grids.xml for SCM funcationality

This includes the cime changes for PR #1252.

[BFB]

* bogensch/atm/EUL_SCM_cime:
  Add grid configure for T42 for SCM

cime/cime_config/acme/config_grids.xml

@@ -1064,6 +1064,12 @@
 
     <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>