From f7f33a262c9c9fc643f8a76c598c428f8dc11055 Mon Sep 17 00:00:00 2001
From: Alper Altuntas <altuntas@cheyenne5.ib0.cheyenne.ucar.edu>
Date: Mon, 22 May 2017 09:00:07 -0600
Subject: [PATCH 1/3] Moved mask specifiers to 3rd column in grid aliases.
 Removed aliases that do not specify the mask.

---
 config/cesm/config_grids.xml | 136 ++++++-----------------------------
 1 file changed, 21 insertions(+), 115 deletions(-)

diff --git a/config/cesm/config_grids.xml b/config/cesm/config_grids.xml
index 978f1bf91218..0c79956754d8 100644
--- a/config/cesm/config_grids.xml
+++ b/config/cesm/config_grids.xml
@@ -8,11 +8,11 @@
     =========================================
     The notation for the grid longname is
         a%name_l%name_oi%name_r%name_m%mask_g%name_w%name
-    where
+    where     
         a% => atm, l% => lnd, oi% => ocn/ice, r% => river, m% => mask, g% => glc, w% => wav
 
     Supported out of the box grid configurations are given via alias specification in
-    the file "config_grids.xml". Each grid alias can also be associated  with the
+    the file "config_grids.xml". Each grid alias can also be associated  with the 
     following optional attributes
 
     compset       (Regular expression for compset matches that are required for this grid)
@@ -57,6 +57,8 @@
       <support>Non-standard grid for testing of the interpolation in DATM rather than coupler</support>
     </model_grid>
 
+    <!-- the following are single column regional land grids -->
+
     <model_grid alias="1D_1D" compset="DATM.+DROF">
       <grid name="atm">01col</grid>
       <grid name="lnd">01col</grid>
@@ -161,13 +163,6 @@
       <mask>gx3v7</mask>
     </model_grid>
 
-    <model_grid alias="T42_T42" not_compset="_POP">
-      <grid name="atm">T42</grid>
-      <grid name="lnd">T42</grid>
-      <grid name="ocnice">T42</grid>
-      <mask>usgs</mask>
-    </model_grid>
-
     <model_grid alias="T42_T42_musgs" not_compset="_POP">
       <grid name="atm">T42</grid>
       <grid name="lnd">T42</grid>
@@ -175,13 +170,6 @@
       <mask>usgs</mask>
     </model_grid>
 
-    <model_grid alias="T85_T85" not_compset="_POP">
-      <grid name="atm">T85</grid>
-      <grid name="lnd">T85</grid>
-      <grid name="ocnice">T85</grid>
-      <mask>usgs</mask>
-    </model_grid>
-
     <model_grid alias="T85_T85_musgs" not_compset="_POP">
       <grid name="atm">T85</grid>
       <grid name="lnd">T85</grid>
@@ -351,13 +339,6 @@
       <mask>gx1v7</mask>
     </model_grid>
 
-    <model_grid alias="f09_f09" not_compset="_POP">
-      <grid name="atm">0.9x1.25</grid>
-      <grid name="lnd">0.9x1.25</grid>
-      <grid name="ocnice">0.9x1.25</grid>
-      <mask>gx1v6</mask>
-    </model_grid>
-
     <model_grid alias="f09_f09_mnull" compset="_DOCN%SAQUAP|DOCN%DAQUAP" >
       <grid name="atm">0.9x1.25</grid>
       <grid name="lnd">0.9x1.25</grid>
@@ -379,15 +360,7 @@
       <mask>gx1v7</mask>
     </model_grid>
 
-    <model_grid alias="f09_f09_gl5" compset="_CISM" not_compset="_POP">
-      <grid name="atm">0.9x1.25</grid>
-      <grid name="lnd">0.9x1.25</grid>
-      <grid name="ocnice">0.9x1.25</grid>
-      <grid name="glc">gland5UM</grid>
-      <mask>gx1v6</mask>
-    </model_grid>
-
-    <model_grid alias="f09_f09_gl5_mg16" compset="_CISM" not_compset="_POP">
+    <model_grid alias="f09_f09_mg16_gl5" compset="_CISM" not_compset="_POP">
       <grid name="atm">0.9x1.25</grid>
       <grid name="lnd">0.9x1.25</grid>
       <grid name="ocnice">0.9x1.25</grid>
@@ -395,7 +368,7 @@
       <mask>gx1v6</mask>
     </model_grid>
 
-    <model_grid alias="f09_f09_gl5_mg17" compset="_CISM" not_compset="_POP">
+    <model_grid alias="f09_f09_mg17_gl5" compset="_CISM" not_compset="_POP">
       <grid name="atm">0.9x1.25</grid>
       <grid name="lnd">0.9x1.25</grid>
       <grid name="ocnice">0.9x1.25</grid>
@@ -465,7 +438,7 @@
       <mask>gx1v7</mask>
     </model_grid>
 
-    <model_grid alias="f19_f19_gl5" compset="_CISM" not_compset="_POP">
+    <model_grid alias="f19_f19_mg16_gl5" compset="_CISM" not_compset="_POP">
       <grid name="atm">1.9x2.5</grid>
       <grid name="lnd">1.9x2.5</grid>
       <grid name="ocnice">1.9x2.5</grid>
@@ -473,15 +446,7 @@
       <mask>gx1v6</mask>
     </model_grid>
 
-    <model_grid alias="f19_f19_gl5_mg16" compset="_CISM" not_compset="_POP">
-      <grid name="atm">1.9x2.5</grid>
-      <grid name="lnd">1.9x2.5</grid>
-      <grid name="ocnice">1.9x2.5</grid>
-      <grid name="glc">gland5UM</grid>
-      <mask>gx1v6</mask>
-    </model_grid>
-
-    <model_grid alias="f19_f19_gl5_mg17" compset="_CISM" not_compset="_POP">
+    <model_grid alias="f19_f19_mg17_gl5" compset="_CISM" not_compset="_POP">
       <grid name="atm">1.9x2.5</grid>
       <grid name="lnd">1.9x2.5</grid>
       <grid name="ocnice">1.9x2.5</grid>
@@ -489,13 +454,6 @@
       <mask>gx1v7</mask>
     </model_grid>
 
-    <model_grid alias="f19_f19" not_compset="_POP">
-      <grid name="atm">1.9x2.5</grid>
-      <grid name="lnd">1.9x2.5</grid>
-      <grid name="ocnice">1.9x2.5</grid>
-      <mask>gx1v6</mask>
-    </model_grid>
-
     <model_grid alias="f19_f19_mg16" not_compset="_POP">
       <grid name="atm">1.9x2.5</grid>
       <grid name="lnd">1.9x2.5</grid>
@@ -524,13 +482,6 @@
       <mask>gx3v7</mask>
     </model_grid>
 
-    <model_grid alias="f02_f02" not_compset="_POP">
-      <grid name="atm">0.23x0.31</grid>
-      <grid name="lnd">0.23x0.31</grid>
-      <grid name="ocnice">0.23x0.31</grid>
-      <mask>gx1v6</mask>
-    </model_grid>
-
     <model_grid alias="f02_f02_mg16" not_compset="_POP">
       <grid name="atm">0.23x0.31</grid>
       <grid name="lnd">0.23x0.31</grid>
@@ -545,13 +496,6 @@
       <mask>gx1v7</mask>
     </model_grid>
 
-    <model_grid alias="f25_f25" not_compset="_POP">
-      <grid name="atm">2.5x3.33</grid>
-      <grid name="lnd">2.5x3.33</grid>
-      <grid name="ocnice">2.5x3.33</grid>
-      <mask>gx1v6</mask>
-    </model_grid>
-
     <model_grid alias="f25_f25_mg16" not_compset="_POP">
       <grid name="atm">2.5x3.33</grid>
       <grid name="lnd">2.5x3.33</grid>
@@ -566,13 +510,6 @@
       <mask>gx1v7</mask>
     </model_grid>
 
-    <model_grid alias="f45_f45" not_compset="_POP">
-      <grid name="atm">4x5</grid>
-      <grid name="lnd">4x5</grid>
-      <grid name="ocnice">4x5</grid>
-      <mask>gx3v7</mask>
-    </model_grid>
-
     <model_grid alias="f45_f45_mg37" not_compset="_POP">
       <grid name="atm">4x5</grid>
       <grid name="lnd">4x5</grid>
@@ -580,13 +517,6 @@
       <mask>gx3v7</mask>
     </model_grid>
 
-    <model_grid alias="f10_f10" not_compset="_POP">
-      <grid name="atm">10x15</grid>
-      <grid name="lnd">10x15</grid>
-      <grid name="ocnice">10x15</grid>
-      <mask>usgs</mask>
-    </model_grid>
-
     <model_grid alias="f10_f10_musgs" not_compset="_POP">
       <grid name="atm">10x15</grid>
       <grid name="lnd">10x15</grid>
@@ -707,13 +637,6 @@
       <mask>tx0.1v2</mask>
     </model_grid>
 
-    <model_grid alias="ne16_ne16" not_compset="_POP">
-      <grid name="atm">ne16np4</grid>
-      <grid name="lnd">ne16np4</grid>
-      <grid name="ocnice">ne16np4</grid>
-      <mask>gx3v7</mask>
-    </model_grid>
-
     <model_grid alias="ne16_ne16_mg37" not_compset="_POP">
       <grid name="atm">ne16np4</grid>
       <grid name="lnd">ne16np4</grid>
@@ -721,13 +644,6 @@
       <mask>gx3v7</mask>
     </model_grid>
 
-    <model_grid alias="ne30_ne30" not_compset="_POP">
-      <grid name="atm">ne30np4</grid>
-      <grid name="lnd">ne30np4</grid>
-      <grid name="ocnice">ne30np4</grid>
-      <mask>gx1v6</mask>
-    </model_grid>
-
     <model_grid alias="ne30_ne30_mg16" not_compset="_POP">
       <grid name="atm">ne30np4</grid>
       <grid name="lnd">ne30np4</grid>
@@ -742,13 +658,6 @@
       <mask>gx1v7</mask>
     </model_grid>
 
-    <model_grid alias="ne60_ne60" not_compset="_POP">
-      <grid name="atm">ne60np4</grid>
-      <grid name="lnd">ne60np4</grid>
-      <grid name="ocnice">ne60np4</grid>
-      <mask>gx1v6</mask>
-    </model_grid>
-
     <model_grid alias="ne60_ne60_mg16" not_compset="_POP">
       <grid name="atm">ne60np4</grid>
       <grid name="lnd">ne60np4</grid>
@@ -763,13 +672,6 @@
       <mask>gx1v7</mask>
     </model_grid>
 
-    <model_grid alias="ne120_ne120" not_compset="_POP">
-      <grid name="atm">ne120np4</grid>
-      <grid name="lnd">ne120np4</grid>
-      <grid name="ocnice">ne120np4</grid>
-      <mask>gx1v6</mask>
-    </model_grid>
-
     <model_grid alias="ne120_ne120_mg16" not_compset="_POP">
       <grid name="atm">ne120np4</grid>
       <grid name="lnd">ne120np4</grid>
@@ -784,13 +686,6 @@
       <mask>gx1v7</mask>
     </model_grid>
 
-    <model_grid alias="ne240_ne240" not_compset="_POP">
-      <grid name="atm">ne240np4</grid>
-      <grid name="lnd">ne240np4</grid>
-      <grid name="ocnice">ne240np4</grid>
-      <mask>gx1v6</mask>
-    </model_grid>
-
     <model_grid alias="ne240_ne240_mg16" not_compset="_POP">
       <grid name="atm">ne240np4</grid>
       <grid name="lnd">ne240np4</grid>
@@ -1089,8 +984,8 @@
 
     <domain name="gx1v7">
       <nx>320</nx>  <ny>384</ny>
-      <file grid="atm|lnd">$DIN_LOC_ROOT/share/domains/domain.ocn.gx1v7.151008.nc</file>
-      <file grid="ocnice">$DIN_LOC_ROOT/share/domains/domain.ocn.gx1v7.151008.nc</file>
+      <file grid="atm|lnd">$DIN_LOC_ROOT/share/domains/domain.ocn.gx1v7.151020.nc</file>
+      <file grid="ocnice">$DIN_LOC_ROOT/share/domains/domain.ocn.gx1v7.151020.nc</file>
       <desc>gx1v7 is displaced Greenland pole 1-deg grid with Caspian as a land feature:</desc>
     </domain>
 
@@ -1655,6 +1550,17 @@
       <map name="ROF2OCN_ICE_RMAPNAME">cpl/cpl6/map_r01_to_gx1v6_120711.nc</map>
     </gridmap>
 
+    <!--- river flooding variables -->
+
+    <gridmap lnd_grid="1.9x2.5" rof_grid="r05" ocn_grid="gx1v6" >
+      <map name="XROF_FLOOD_MODE">ACTIVE</map>
+    </gridmap>
+
+    <gridmap lnd_grid="1.9x2.5" rof_grid="r05" ocn_grid="gx1v7" >
+      <map name="XROF_FLOOD_MODE">ACTIVE</map>
+    </gridmap>
+
+
     <!-- ======================================================== -->
     <!-- gridS: lnd to glc and glc to lnd mapping                 -->
     <!--                                                          -->

From f2c4c828226e235fb2e69769075709a3e7bf4cef Mon Sep 17 00:00:00 2001
From: Alper Altuntas <altuntas@cheyenne5.ib0.cheyenne.ucar.edu>
Date: Mon, 22 May 2017 10:07:12 -0600
Subject: [PATCH 2/3] Revert "Moved mask specifiers to 3rd column in grid
 aliases. Removed aliases that do not specify the mask."

This reverts commit f7f33a262c9c9fc643f8a76c598c428f8dc11055.
---
 config/cesm/config_grids.xml | 136 +++++++++++++++++++++++++++++------
 1 file changed, 115 insertions(+), 21 deletions(-)

diff --git a/config/cesm/config_grids.xml b/config/cesm/config_grids.xml
index 0c79956754d8..978f1bf91218 100644
--- a/config/cesm/config_grids.xml
+++ b/config/cesm/config_grids.xml
@@ -8,11 +8,11 @@
     =========================================
     The notation for the grid longname is
         a%name_l%name_oi%name_r%name_m%mask_g%name_w%name
-    where     
+    where
         a% => atm, l% => lnd, oi% => ocn/ice, r% => river, m% => mask, g% => glc, w% => wav
 
     Supported out of the box grid configurations are given via alias specification in
-    the file "config_grids.xml". Each grid alias can also be associated  with the 
+    the file "config_grids.xml". Each grid alias can also be associated  with the
     following optional attributes
 
     compset       (Regular expression for compset matches that are required for this grid)
@@ -57,8 +57,6 @@
       <support>Non-standard grid for testing of the interpolation in DATM rather than coupler</support>
     </model_grid>
 
-    <!-- the following are single column regional land grids -->
-
     <model_grid alias="1D_1D" compset="DATM.+DROF">
       <grid name="atm">01col</grid>
       <grid name="lnd">01col</grid>
@@ -163,6 +161,13 @@
       <mask>gx3v7</mask>
     </model_grid>
 
+    <model_grid alias="T42_T42" not_compset="_POP">
+      <grid name="atm">T42</grid>
+      <grid name="lnd">T42</grid>
+      <grid name="ocnice">T42</grid>
+      <mask>usgs</mask>
+    </model_grid>
+
     <model_grid alias="T42_T42_musgs" not_compset="_POP">
       <grid name="atm">T42</grid>
       <grid name="lnd">T42</grid>
@@ -170,6 +175,13 @@
       <mask>usgs</mask>
     </model_grid>
 
+    <model_grid alias="T85_T85" not_compset="_POP">
+      <grid name="atm">T85</grid>
+      <grid name="lnd">T85</grid>
+      <grid name="ocnice">T85</grid>
+      <mask>usgs</mask>
+    </model_grid>
+
     <model_grid alias="T85_T85_musgs" not_compset="_POP">
       <grid name="atm">T85</grid>
       <grid name="lnd">T85</grid>
@@ -339,6 +351,13 @@
       <mask>gx1v7</mask>
     </model_grid>
 
+    <model_grid alias="f09_f09" not_compset="_POP">
+      <grid name="atm">0.9x1.25</grid>
+      <grid name="lnd">0.9x1.25</grid>
+      <grid name="ocnice">0.9x1.25</grid>
+      <mask>gx1v6</mask>
+    </model_grid>
+
     <model_grid alias="f09_f09_mnull" compset="_DOCN%SAQUAP|DOCN%DAQUAP" >
       <grid name="atm">0.9x1.25</grid>
       <grid name="lnd">0.9x1.25</grid>
@@ -360,7 +379,15 @@
       <mask>gx1v7</mask>
     </model_grid>
 
-    <model_grid alias="f09_f09_mg16_gl5" compset="_CISM" not_compset="_POP">
+    <model_grid alias="f09_f09_gl5" compset="_CISM" not_compset="_POP">
+      <grid name="atm">0.9x1.25</grid>
+      <grid name="lnd">0.9x1.25</grid>
+      <grid name="ocnice">0.9x1.25</grid>
+      <grid name="glc">gland5UM</grid>
+      <mask>gx1v6</mask>
+    </model_grid>
+
+    <model_grid alias="f09_f09_gl5_mg16" compset="_CISM" not_compset="_POP">
       <grid name="atm">0.9x1.25</grid>
       <grid name="lnd">0.9x1.25</grid>
       <grid name="ocnice">0.9x1.25</grid>
@@ -368,7 +395,7 @@
       <mask>gx1v6</mask>
     </model_grid>
 
-    <model_grid alias="f09_f09_mg17_gl5" compset="_CISM" not_compset="_POP">
+    <model_grid alias="f09_f09_gl5_mg17" compset="_CISM" not_compset="_POP">
       <grid name="atm">0.9x1.25</grid>
       <grid name="lnd">0.9x1.25</grid>
       <grid name="ocnice">0.9x1.25</grid>
@@ -438,7 +465,7 @@
       <mask>gx1v7</mask>
     </model_grid>
 
-    <model_grid alias="f19_f19_mg16_gl5" compset="_CISM" not_compset="_POP">
+    <model_grid alias="f19_f19_gl5" compset="_CISM" not_compset="_POP">
       <grid name="atm">1.9x2.5</grid>
       <grid name="lnd">1.9x2.5</grid>
       <grid name="ocnice">1.9x2.5</grid>
@@ -446,7 +473,15 @@
       <mask>gx1v6</mask>
     </model_grid>
 
-    <model_grid alias="f19_f19_mg17_gl5" compset="_CISM" not_compset="_POP">
+    <model_grid alias="f19_f19_gl5_mg16" compset="_CISM" not_compset="_POP">
+      <grid name="atm">1.9x2.5</grid>
+      <grid name="lnd">1.9x2.5</grid>
+      <grid name="ocnice">1.9x2.5</grid>
+      <grid name="glc">gland5UM</grid>
+      <mask>gx1v6</mask>
+    </model_grid>
+
+    <model_grid alias="f19_f19_gl5_mg17" compset="_CISM" not_compset="_POP">
       <grid name="atm">1.9x2.5</grid>
       <grid name="lnd">1.9x2.5</grid>
       <grid name="ocnice">1.9x2.5</grid>
@@ -454,6 +489,13 @@
       <mask>gx1v7</mask>
     </model_grid>
 
+    <model_grid alias="f19_f19" not_compset="_POP">
+      <grid name="atm">1.9x2.5</grid>
+      <grid name="lnd">1.9x2.5</grid>
+      <grid name="ocnice">1.9x2.5</grid>
+      <mask>gx1v6</mask>
+    </model_grid>
+
     <model_grid alias="f19_f19_mg16" not_compset="_POP">
       <grid name="atm">1.9x2.5</grid>
       <grid name="lnd">1.9x2.5</grid>
@@ -482,6 +524,13 @@
       <mask>gx3v7</mask>
     </model_grid>
 
+    <model_grid alias="f02_f02" not_compset="_POP">
+      <grid name="atm">0.23x0.31</grid>
+      <grid name="lnd">0.23x0.31</grid>
+      <grid name="ocnice">0.23x0.31</grid>
+      <mask>gx1v6</mask>
+    </model_grid>
+
     <model_grid alias="f02_f02_mg16" not_compset="_POP">
       <grid name="atm">0.23x0.31</grid>
       <grid name="lnd">0.23x0.31</grid>
@@ -496,6 +545,13 @@
       <mask>gx1v7</mask>
     </model_grid>
 
+    <model_grid alias="f25_f25" not_compset="_POP">
+      <grid name="atm">2.5x3.33</grid>
+      <grid name="lnd">2.5x3.33</grid>
+      <grid name="ocnice">2.5x3.33</grid>
+      <mask>gx1v6</mask>
+    </model_grid>
+
     <model_grid alias="f25_f25_mg16" not_compset="_POP">
       <grid name="atm">2.5x3.33</grid>
       <grid name="lnd">2.5x3.33</grid>
@@ -510,6 +566,13 @@
       <mask>gx1v7</mask>
     </model_grid>
 
+    <model_grid alias="f45_f45" not_compset="_POP">
+      <grid name="atm">4x5</grid>
+      <grid name="lnd">4x5</grid>
+      <grid name="ocnice">4x5</grid>
+      <mask>gx3v7</mask>
+    </model_grid>
+
     <model_grid alias="f45_f45_mg37" not_compset="_POP">
       <grid name="atm">4x5</grid>
       <grid name="lnd">4x5</grid>
@@ -517,6 +580,13 @@
       <mask>gx3v7</mask>
     </model_grid>
 
+    <model_grid alias="f10_f10" not_compset="_POP">
+      <grid name="atm">10x15</grid>
+      <grid name="lnd">10x15</grid>
+      <grid name="ocnice">10x15</grid>
+      <mask>usgs</mask>
+    </model_grid>
+
     <model_grid alias="f10_f10_musgs" not_compset="_POP">
       <grid name="atm">10x15</grid>
       <grid name="lnd">10x15</grid>
@@ -637,6 +707,13 @@
       <mask>tx0.1v2</mask>
     </model_grid>
 
+    <model_grid alias="ne16_ne16" not_compset="_POP">
+      <grid name="atm">ne16np4</grid>
+      <grid name="lnd">ne16np4</grid>
+      <grid name="ocnice">ne16np4</grid>
+      <mask>gx3v7</mask>
+    </model_grid>
+
     <model_grid alias="ne16_ne16_mg37" not_compset="_POP">
       <grid name="atm">ne16np4</grid>
       <grid name="lnd">ne16np4</grid>
@@ -644,6 +721,13 @@
       <mask>gx3v7</mask>
     </model_grid>
 
+    <model_grid alias="ne30_ne30" not_compset="_POP">
+      <grid name="atm">ne30np4</grid>
+      <grid name="lnd">ne30np4</grid>
+      <grid name="ocnice">ne30np4</grid>
+      <mask>gx1v6</mask>
+    </model_grid>
+
     <model_grid alias="ne30_ne30_mg16" not_compset="_POP">
       <grid name="atm">ne30np4</grid>
       <grid name="lnd">ne30np4</grid>
@@ -658,6 +742,13 @@
       <mask>gx1v7</mask>
     </model_grid>
 
+    <model_grid alias="ne60_ne60" not_compset="_POP">
+      <grid name="atm">ne60np4</grid>
+      <grid name="lnd">ne60np4</grid>
+      <grid name="ocnice">ne60np4</grid>
+      <mask>gx1v6</mask>
+    </model_grid>
+
     <model_grid alias="ne60_ne60_mg16" not_compset="_POP">
       <grid name="atm">ne60np4</grid>
       <grid name="lnd">ne60np4</grid>
@@ -672,6 +763,13 @@
       <mask>gx1v7</mask>
     </model_grid>
 
+    <model_grid alias="ne120_ne120" not_compset="_POP">
+      <grid name="atm">ne120np4</grid>
+      <grid name="lnd">ne120np4</grid>
+      <grid name="ocnice">ne120np4</grid>
+      <mask>gx1v6</mask>
+    </model_grid>
+
     <model_grid alias="ne120_ne120_mg16" not_compset="_POP">
       <grid name="atm">ne120np4</grid>
       <grid name="lnd">ne120np4</grid>
@@ -686,6 +784,13 @@
       <mask>gx1v7</mask>
     </model_grid>
 
+    <model_grid alias="ne240_ne240" not_compset="_POP">
+      <grid name="atm">ne240np4</grid>
+      <grid name="lnd">ne240np4</grid>
+      <grid name="ocnice">ne240np4</grid>
+      <mask>gx1v6</mask>
+    </model_grid>
+
     <model_grid alias="ne240_ne240_mg16" not_compset="_POP">
       <grid name="atm">ne240np4</grid>
       <grid name="lnd">ne240np4</grid>
@@ -984,8 +1089,8 @@
 
     <domain name="gx1v7">
       <nx>320</nx>  <ny>384</ny>
-      <file grid="atm|lnd">$DIN_LOC_ROOT/share/domains/domain.ocn.gx1v7.151020.nc</file>
-      <file grid="ocnice">$DIN_LOC_ROOT/share/domains/domain.ocn.gx1v7.151020.nc</file>
+      <file grid="atm|lnd">$DIN_LOC_ROOT/share/domains/domain.ocn.gx1v7.151008.nc</file>
+      <file grid="ocnice">$DIN_LOC_ROOT/share/domains/domain.ocn.gx1v7.151008.nc</file>
       <desc>gx1v7 is displaced Greenland pole 1-deg grid with Caspian as a land feature:</desc>
     </domain>
 
@@ -1550,17 +1655,6 @@
       <map name="ROF2OCN_ICE_RMAPNAME">cpl/cpl6/map_r01_to_gx1v6_120711.nc</map>
     </gridmap>
 
-    <!--- river flooding variables -->
-
-    <gridmap lnd_grid="1.9x2.5" rof_grid="r05" ocn_grid="gx1v6" >
-      <map name="XROF_FLOOD_MODE">ACTIVE</map>
-    </gridmap>
-
-    <gridmap lnd_grid="1.9x2.5" rof_grid="r05" ocn_grid="gx1v7" >
-      <map name="XROF_FLOOD_MODE">ACTIVE</map>
-    </gridmap>
-
-
     <!-- ======================================================== -->
     <!-- gridS: lnd to glc and glc to lnd mapping                 -->
     <!--                                                          -->

From 31c99b8df906b6a8ea9a5a7886818684750317b2 Mon Sep 17 00:00:00 2001
From: Alper Altuntas <altuntas@cheyenne5.ib0.cheyenne.ucar.edu>
Date: Mon, 22 May 2017 10:35:30 -0600
Subject: [PATCH 3/3] Updated config_grids.xml to address comments from
 jedwards4b

---
 config/cesm/config_grids.xml | 115 ++---------------------------------
 1 file changed, 4 insertions(+), 111 deletions(-)

diff --git a/config/cesm/config_grids.xml b/config/cesm/config_grids.xml
index 978f1bf91218..ce64c351b0b0 100644
--- a/config/cesm/config_grids.xml
+++ b/config/cesm/config_grids.xml
@@ -161,13 +161,6 @@
       <mask>gx3v7</mask>
     </model_grid>
 
-    <model_grid alias="T42_T42" not_compset="_POP">
-      <grid name="atm">T42</grid>
-      <grid name="lnd">T42</grid>
-      <grid name="ocnice">T42</grid>
-      <mask>usgs</mask>
-    </model_grid>
-
     <model_grid alias="T42_T42_musgs" not_compset="_POP">
       <grid name="atm">T42</grid>
       <grid name="lnd">T42</grid>
@@ -175,13 +168,6 @@
       <mask>usgs</mask>
     </model_grid>
 
-    <model_grid alias="T85_T85" not_compset="_POP">
-      <grid name="atm">T85</grid>
-      <grid name="lnd">T85</grid>
-      <grid name="ocnice">T85</grid>
-      <mask>usgs</mask>
-    </model_grid>
-
     <model_grid alias="T85_T85_musgs" not_compset="_POP">
       <grid name="atm">T85</grid>
       <grid name="lnd">T85</grid>
@@ -351,13 +337,6 @@
       <mask>gx1v7</mask>
     </model_grid>
 
-    <model_grid alias="f09_f09" not_compset="_POP">
-      <grid name="atm">0.9x1.25</grid>
-      <grid name="lnd">0.9x1.25</grid>
-      <grid name="ocnice">0.9x1.25</grid>
-      <mask>gx1v6</mask>
-    </model_grid>
-
     <model_grid alias="f09_f09_mnull" compset="_DOCN%SAQUAP|DOCN%DAQUAP" >
       <grid name="atm">0.9x1.25</grid>
       <grid name="lnd">0.9x1.25</grid>
@@ -379,15 +358,7 @@
       <mask>gx1v7</mask>
     </model_grid>
 
-    <model_grid alias="f09_f09_gl5" compset="_CISM" not_compset="_POP">
-      <grid name="atm">0.9x1.25</grid>
-      <grid name="lnd">0.9x1.25</grid>
-      <grid name="ocnice">0.9x1.25</grid>
-      <grid name="glc">gland5UM</grid>
-      <mask>gx1v6</mask>
-    </model_grid>
-
-    <model_grid alias="f09_f09_gl5_mg16" compset="_CISM" not_compset="_POP">
+    <model_grid alias="f09_f09_mg16_gl5" compset="_CISM" not_compset="_POP">
       <grid name="atm">0.9x1.25</grid>
       <grid name="lnd">0.9x1.25</grid>
       <grid name="ocnice">0.9x1.25</grid>
@@ -395,7 +366,7 @@
       <mask>gx1v6</mask>
     </model_grid>
 
-    <model_grid alias="f09_f09_gl5_mg17" compset="_CISM" not_compset="_POP">
+    <model_grid alias="f09_f09_mg17_gl5" compset="_CISM" not_compset="_POP">
       <grid name="atm">0.9x1.25</grid>
       <grid name="lnd">0.9x1.25</grid>
       <grid name="ocnice">0.9x1.25</grid>
@@ -465,15 +436,7 @@
       <mask>gx1v7</mask>
     </model_grid>
 
-    <model_grid alias="f19_f19_gl5" compset="_CISM" not_compset="_POP">
-      <grid name="atm">1.9x2.5</grid>
-      <grid name="lnd">1.9x2.5</grid>
-      <grid name="ocnice">1.9x2.5</grid>
-      <grid name="glc">gland5UM</grid>
-      <mask>gx1v6</mask>
-    </model_grid>
-
-    <model_grid alias="f19_f19_gl5_mg16" compset="_CISM" not_compset="_POP">
+    <model_grid alias="f19_f19_mg16_gl5" compset="_CISM" not_compset="_POP">
       <grid name="atm">1.9x2.5</grid>
       <grid name="lnd">1.9x2.5</grid>
       <grid name="ocnice">1.9x2.5</grid>
@@ -481,7 +444,7 @@
       <mask>gx1v6</mask>
     </model_grid>
 
-    <model_grid alias="f19_f19_gl5_mg17" compset="_CISM" not_compset="_POP">
+    <model_grid alias="f19_f19_mg17_gl5" compset="_CISM" not_compset="_POP">
       <grid name="atm">1.9x2.5</grid>
       <grid name="lnd">1.9x2.5</grid>
       <grid name="ocnice">1.9x2.5</grid>
@@ -489,13 +452,6 @@
       <mask>gx1v7</mask>
     </model_grid>
 
-    <model_grid alias="f19_f19" not_compset="_POP">
-      <grid name="atm">1.9x2.5</grid>
-      <grid name="lnd">1.9x2.5</grid>
-      <grid name="ocnice">1.9x2.5</grid>
-      <mask>gx1v6</mask>
-    </model_grid>
-
     <model_grid alias="f19_f19_mg16" not_compset="_POP">
       <grid name="atm">1.9x2.5</grid>
       <grid name="lnd">1.9x2.5</grid>
@@ -524,13 +480,6 @@
       <mask>gx3v7</mask>
     </model_grid>
 
-    <model_grid alias="f02_f02" not_compset="_POP">
-      <grid name="atm">0.23x0.31</grid>
-      <grid name="lnd">0.23x0.31</grid>
-      <grid name="ocnice">0.23x0.31</grid>
-      <mask>gx1v6</mask>
-    </model_grid>
-
     <model_grid alias="f02_f02_mg16" not_compset="_POP">
       <grid name="atm">0.23x0.31</grid>
       <grid name="lnd">0.23x0.31</grid>
@@ -545,13 +494,6 @@
       <mask>gx1v7</mask>
     </model_grid>
 
-    <model_grid alias="f25_f25" not_compset="_POP">
-      <grid name="atm">2.5x3.33</grid>
-      <grid name="lnd">2.5x3.33</grid>
-      <grid name="ocnice">2.5x3.33</grid>
-      <mask>gx1v6</mask>
-    </model_grid>
-
     <model_grid alias="f25_f25_mg16" not_compset="_POP">
       <grid name="atm">2.5x3.33</grid>
       <grid name="lnd">2.5x3.33</grid>
@@ -566,13 +508,6 @@
       <mask>gx1v7</mask>
     </model_grid>
 
-    <model_grid alias="f45_f45" not_compset="_POP">
-      <grid name="atm">4x5</grid>
-      <grid name="lnd">4x5</grid>
-      <grid name="ocnice">4x5</grid>
-      <mask>gx3v7</mask>
-    </model_grid>
-
     <model_grid alias="f45_f45_mg37" not_compset="_POP">
       <grid name="atm">4x5</grid>
       <grid name="lnd">4x5</grid>
@@ -580,13 +515,6 @@
       <mask>gx3v7</mask>
     </model_grid>
 
-    <model_grid alias="f10_f10" not_compset="_POP">
-      <grid name="atm">10x15</grid>
-      <grid name="lnd">10x15</grid>
-      <grid name="ocnice">10x15</grid>
-      <mask>usgs</mask>
-    </model_grid>
-
     <model_grid alias="f10_f10_musgs" not_compset="_POP">
       <grid name="atm">10x15</grid>
       <grid name="lnd">10x15</grid>
@@ -707,13 +635,6 @@
       <mask>tx0.1v2</mask>
     </model_grid>
 
-    <model_grid alias="ne16_ne16" not_compset="_POP">
-      <grid name="atm">ne16np4</grid>
-      <grid name="lnd">ne16np4</grid>
-      <grid name="ocnice">ne16np4</grid>
-      <mask>gx3v7</mask>
-    </model_grid>
-
     <model_grid alias="ne16_ne16_mg37" not_compset="_POP">
       <grid name="atm">ne16np4</grid>
       <grid name="lnd">ne16np4</grid>
@@ -721,13 +642,6 @@
       <mask>gx3v7</mask>
     </model_grid>
 
-    <model_grid alias="ne30_ne30" not_compset="_POP">
-      <grid name="atm">ne30np4</grid>
-      <grid name="lnd">ne30np4</grid>
-      <grid name="ocnice">ne30np4</grid>
-      <mask>gx1v6</mask>
-    </model_grid>
-
     <model_grid alias="ne30_ne30_mg16" not_compset="_POP">
       <grid name="atm">ne30np4</grid>
       <grid name="lnd">ne30np4</grid>
@@ -742,13 +656,6 @@
       <mask>gx1v7</mask>
     </model_grid>
 
-    <model_grid alias="ne60_ne60" not_compset="_POP">
-      <grid name="atm">ne60np4</grid>
-      <grid name="lnd">ne60np4</grid>
-      <grid name="ocnice">ne60np4</grid>
-      <mask>gx1v6</mask>
-    </model_grid>
-
     <model_grid alias="ne60_ne60_mg16" not_compset="_POP">
       <grid name="atm">ne60np4</grid>
       <grid name="lnd">ne60np4</grid>
@@ -763,13 +670,6 @@
       <mask>gx1v7</mask>
     </model_grid>
 
-    <model_grid alias="ne120_ne120" not_compset="_POP">
-      <grid name="atm">ne120np4</grid>
-      <grid name="lnd">ne120np4</grid>
-      <grid name="ocnice">ne120np4</grid>
-      <mask>gx1v6</mask>
-    </model_grid>
-
     <model_grid alias="ne120_ne120_mg16" not_compset="_POP">
       <grid name="atm">ne120np4</grid>
       <grid name="lnd">ne120np4</grid>
@@ -784,13 +684,6 @@
       <mask>gx1v7</mask>
     </model_grid>
 
-    <model_grid alias="ne240_ne240" not_compset="_POP">
-      <grid name="atm">ne240np4</grid>
-      <grid name="lnd">ne240np4</grid>
-      <grid name="ocnice">ne240np4</grid>
-      <mask>gx1v6</mask>
-    </model_grid>
-
     <model_grid alias="ne240_ne240_mg16" not_compset="_POP">
       <grid name="atm">ne240np4</grid>
       <grid name="lnd">ne240np4</grid>