From 9f6a8bbff58a27c200034b7d11f1c9b46b5a2ac3 Mon Sep 17 00:00:00 2001
From: Benjamin Hillman <benjaminr.hillman@gmail.com>
Date: Tue, 11 Jul 2017 11:27:42 -0600
Subject: [PATCH 1/2] Add cime configuration for ENA grid

Add support for enax4v1_enax4v1 and enax4v1_ne30_enax4v1 resolutions in
cime.
---
 config/acme/config_grids.xml | 51 ++++++++++++++++++++++++++++++++++++
 1 file changed, 51 insertions(+)

diff --git a/config/acme/config_grids.xml b/config/acme/config_grids.xml
index 3ce67f709f7a..5b462810bc61 100644
--- a/config/acme/config_grids.xml
+++ b/config/acme/config_grids.xml
@@ -466,6 +466,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="(DOCN|XOCN|SOCN|AQUAP)">
       <sname>ne16np4_ne16np4</sname>
       <alias>ne16_ne16</alias>
@@ -1457,6 +1471,20 @@
       <file ocn_mask="tx0.1v2">domain.ocn.conusx4v1_tx0.1v2.141022.nc</file>
     </domain>
 
+    <domain name="ne0np4_enax4v1">
+      <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>
+      <file ocn_mask="oRRS18to6">domain.ocn.enax4v1_oRRS18to6.170621.nc</file>
+    </domain>
+
     <domain name="ne0np4_svalbard_x8v1_lowcon">
       <nx>71912</nx>
       <ny>1</ny>
@@ -1749,6 +1777,29 @@
       <LND2ATM_SMAPNAME>cpl/gridmaps/fv0.23x0.31/map_fv0.23x0.31_to_ne240np4_aave_110428.nc</LND2ATM_SMAPNAME>
     </gridmap>
 
+    <gridmap atm_grid="ne0np4_enax4v1" lnd_grid="ne30np4">
+      <ATM2LND_FMAPNAME>cpl/cpl6/map_enax4v1_TO_ne30np4_aave.170517.nc</ATM2LND_FMAPNAME>
+      <ATM2LND_SMAPNAME>cpl/cpl6/map_enax4v1_TO_ne30np4_aave.170517.nc</ATM2LND_SMAPNAME>
+      <LND2ATM_FMAPNAME>cpl/cpl6/map_ne30np4_TO_enax4v1_aave.170517.nc</LND2ATM_FMAPNAME>
+      <LND2ATM_SMAPNAME>cpl/cpl6/map_ne30np4_TO_enax4v1_aave.170517.nc</LND2ATM_SMAPNAME>
+    </gridmap>
+
+    <gridmap atm_grid="ne0np4_enax4v1" ocn_grid="gx1v6">
+      <ATM2OCN_FMAPNAME>cpl/cpl6/map_enax4v1_TO_gx1v6_aave.170523.nc</ATM2OCN_FMAPNAME>
+      <ATM2OCN_SMAPNAME>cpl/cpl6/map_enax4v1_TO_gx1v6_blin.170523.nc</ATM2OCN_SMAPNAME>
+      <ATM2OCN_VMAPNAME>cpl/cpl6/map_enax4v1_TO_gx1v6_patc.170523.nc</ATM2OCN_VMAPNAME>
+      <OCN2ATM_FMAPNAME>cpl/cpl6/map_gx1v6_TO_enax4v1_aave.170523.nc</OCN2ATM_FMAPNAME>
+      <OCN2ATM_SMAPNAME>cpl/cpl6/map_gx1v6_TO_enax4v1_aave.170523.nc</OCN2ATM_SMAPNAME>
+    </gridmap>
+
+    <gridmap atm_grid="ne0np4_enax4v1" ocn_grid="oRRS18to6">
+      <ATM2OCN_FMAPNAME>cpl/cpl6/map_enax4v1_TO_oRRS18to6_aave.170620.nc</ATM2OCN_FMAPNAME>
+      <ATM2OCN_SMAPNAME>cpl/cpl6/map_enax4v1_TO_oRRS18to6_blin.170620.nc</ATM2OCN_SMAPNAME>
+      <ATM2OCN_VMAPNAME>cpl/cpl6/map_enax4v1_TO_oRRS18to6_patc.170620.nc</ATM2OCN_VMAPNAME>
+      <OCN2ATM_FMAPNAME>cpl/cpl6/map_oRRS18to6_TO_enax4v1_aave.170620.nc</OCN2ATM_FMAPNAME>
+      <OCN2ATM_SMAPNAME>cpl/cpl6/map_oRRS18to6_TO_enax4v1_aave.170620.nc</OCN2ATM_SMAPNAME>
+    </gridmap>
+
     <gridmap atm_grid="T62" ocn_grid="gx3v7">
       <ATM2OCN_FMAPNAME>cpl/gridmaps/T62/map_T62_TO_gx3v7_aave.130322.nc</ATM2OCN_FMAPNAME>
       <ATM2OCN_SMAPNAME>cpl/gridmaps/T62/map_T62_TO_gx3v7_blin.130322.nc</ATM2OCN_SMAPNAME>

From 401a745d23e5085c89ea796f0a337deb19ed17b0 Mon Sep 17 00:00:00 2001
From: Benjamin Hillman <benjaminr.hillman@gmail.com>
Date: Tue, 11 Jul 2017 11:49:20 -0600
Subject: [PATCH 2/2] Set ATM_NCPL for ENA grid

Set ATM_NCPL in driver configuration when atmosphere grid is
ne0np4_enax4v1.
---
 src/drivers/mct/cime_config/config_component_acme.xml | 1 +
 1 file changed, 1 insertion(+)

diff --git a/src/drivers/mct/cime_config/config_component_acme.xml b/src/drivers/mct/cime_config/config_component_acme.xml
index 0198b7eecb1c..3963f49e0cc1 100644
--- a/src/drivers/mct/cime_config/config_component_acme.xml
+++ b/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>