Fix ATM_NCPL and CAM_DYCORE

ATM_NCPL needed to be set for our new grid in the mct config file. Also,
CAM_DYCORE was not being explicitly set for RRM resolutions (atmosphere
resolutions that begin with ne0). This is because the CAM
config_component.xml file was setting CAM_DYCORE to se only if the
resolution began with ne[1-9]. Changing this to ne[0-9] fixes this
problem, and prevents us from having to reset CAM_DYCORE when
configuring a new case. Fixes #1357 as well. Also removed lines from
config_grids.xml that configure an unsupported version of this grid
(with the low resolution ocean mask gx1v6).

cime/config/acme/config_grids.xml

@@ -790,6 +790,20 @@
       <alias>sooberingoax4x8v1_sooberingoax4x8v1</alias>
     </grid>
 
+    <!-- ENA RRM grid (all components) -->
+    <grid compset="(DOCN|XOCN|SOCN|AQUAP)">
+      <sname>ne0np4_enax4v1_ne0np4_enax4v1</sname>
+      <lname>a%ne0np4_enax4v1_l%ne0np4_enax4v1_oi%ne0np4_enax4v1_r%r01_m%oRRS18to6_g%null_w%null</lname>
+      <alias>enax4v1_enax4v1</alias>
+    </grid>
+
+    <!-- ENA RRM grid (land on ne30) -->
+    <grid compset="(DOCN|XOCN|SOCN|AQUAP)">
+      <sname>ne0np4_enax4v1_ne30np4_ne0np4_enax4v1</sname>
+      <lname>a%ne0np4_enax4v1_l%ne30np4_oi%ne0np4_enax4v1_r%r01_m%oRRS18to6_g%null_w%null</lname>
+      <alias>enax4v1_ne30_enax4v1</alias>
+    </grid>
+
     <grid compset="_CISM">
       <sname>T31_gx3v7_gland10</sname>
       <lname>a%T31_l%T31_oi%gx3v7_r%r05_m%gx3v7_g%gland10_w%null</lname>
@@ -1475,10 +1489,6 @@
       <nx>78788</nx>
       <ny>1</ny>
       <desc>1-deg with 1/4-deg over Eastern North Atlantic (version 1):</desc>
-      <file atm_mask="gx1v6">domain.lnd.enax4v1_gx1v6.170523.nc</file>
-      <file ice_mask="gx1v6">domain.ocn.enax4v1_gx1v6.170523.nc</file>
-      <file lnd_mask="gx1v6">domain.lnd.enax4v1_gx1v6.170523.nc</file>
-      <file ocn_mask="gx1v6">domain.ocn.enax4v1_gx1v6.170523.nc</file>
       <file atm_mask="oRRS18to6">domain.lnd.enax4v1_oRRS18to6.170621.nc</file>
       <file ice_mask="oRRS18to6">domain.ocn.enax4v1_oRRS18to6.170621.nc</file>
       <file lnd_mask="oRRS18to6">domain.lnd.enax4v1_oRRS18to6.170621.nc</file>

cime/src/drivers/mct/cime_config/config_component_acme.xml

@@ -279,6 +279,7 @@
       <value compset=".+" grid="a%ne0np4_conus_x4v1" >96</value>
       <value compset=".+" grid="a%ne0np4_svalbard_x8v1" >144</value>
       <value compset=".+" grid="a%ne0np4_sooberingoa_x4x8v1" >144</value>
+      <value compset=".+" grid="a%ne0np4_enax4v1" >96</value>
       <value compset=".+" grid="a%T42">72</value>
       <value compset=".+" grid="a%T85">144</value>
       <value compset=".+" grid="a%T341">288</value>

components/cam/cime_config/config_component.xml

@@ -19,7 +19,7 @@
     <default_value>fv</default_value>
     <values>
       <value grid="a%T[1-9]" >eul</value>
-      <value grid="a%ne[1-9]">se</value>
+      <value grid="a%ne[0-9]">se</value>
     </values>
     <group>build_component_cam</group>
     <file>env_build.xml</file>