From f15032a6faae365708733764fa618272da91c5e8 Mon Sep 17 00:00:00 2001
From: Bill Sacks <sacks@ucar.edu>
Date: Wed, 3 Apr 2019 16:41:44 -0600
Subject: [PATCH 1/7] Add support for 224x464 NLDAS regional grid

---
 config/cesm/config_grids.xml | 16 ++++++++++++++++
 1 file changed, 16 insertions(+)

diff --git a/config/cesm/config_grids.xml b/config/cesm/config_grids.xml
index 11d501bb4ba..c6dbd9bd5b7 100644
--- a/config/cesm/config_grids.xml
+++ b/config/cesm/config_grids.xml
@@ -120,6 +120,15 @@
       <grid name="rof">null</grid>
     </model_grid>
 
+    <!-- Regional, 12km NLDAS grid over the U.S., with the standard NLDAS mask -->
+    <model_grid alias="224x464_nldas_mnldas" compset="DATM.+CLM">
+      <grid name="atm">224x464_nldas</grid>
+      <grid name="lnd">224x464_nldas</grid>
+      <grid name="ocnice">224x464_nldas</grid>
+      <grid name="rof">null</grid>
+      <mask>nldas</mask>
+    </model_grid>
+
     <model_grid alias="hcru_hcru" compset="DATM.+CLM">
       <grid name="atm">360x720cru</grid>
       <grid name="lnd">360x720cru</grid>
@@ -1093,6 +1102,13 @@
       <desc>5x5 Amazon regional case -- only valid for DATM/CLM compset</desc>
     </domain>
 
+    <domain name="224x464_nldas">
+      <nx>464</nx> <ny>224</ny>
+      <file grid="atm|lnd" mask="nldas">$DIN_LOC_ROOT/share/domains/domain.clm/domain.lnd.224x464_nldas_224x464_nldas.190403.nc</file>
+      <file grid="ocnice"  mask="nldas">$DIN_LOC_ROOT/share/domains/domain.clm/domain.ocn.224x464_nldas.190403.nc</file>
+      <desc>Regional, 12km NLDAS grid over the U.S.</desc>
+    </domain>
+
     <!-- ATM/LND domains global -->
 
     <domain name="360x720cru">

From e81e634f830ead8cb7b5df041bc8312eff034072 Mon Sep 17 00:00:00 2001
From: Bill Sacks <sacks@ucar.edu>
Date: Thu, 4 Apr 2019 06:11:13 -0600
Subject: [PATCH 2/7] Remove number of grid points from nldas grid alias

It would be hard for someone to remember the right number of grid points
to use; this new alias is easier to remember.
---
 config/cesm/config_grids.xml | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/config/cesm/config_grids.xml b/config/cesm/config_grids.xml
index c6dbd9bd5b7..5ef2b0bd267 100644
--- a/config/cesm/config_grids.xml
+++ b/config/cesm/config_grids.xml
@@ -121,7 +121,7 @@
     </model_grid>
 
     <!-- Regional, 12km NLDAS grid over the U.S., with the standard NLDAS mask -->
-    <model_grid alias="224x464_nldas_mnldas" compset="DATM.+CLM">
+    <model_grid alias="nldas_mnldas" compset="DATM.+CLM">
       <grid name="atm">224x464_nldas</grid>
       <grid name="lnd">224x464_nldas</grid>
       <grid name="ocnice">224x464_nldas</grid>

From 38a447cf5fe1c298a03dc899989ced5a0d818a34 Mon Sep 17 00:00:00 2001
From: Bill Sacks <sacks@ucar.edu>
Date: Thu, 4 Apr 2019 06:30:09 -0600
Subject: [PATCH 3/7] Edit comments

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

diff --git a/config/cesm/config_grids.xml b/config/cesm/config_grids.xml
index 5ef2b0bd267..742563a69a2 100644
--- a/config/cesm/config_grids.xml
+++ b/config/cesm/config_grids.xml
@@ -120,7 +120,7 @@
       <grid name="rof">null</grid>
     </model_grid>
 
-    <!-- Regional, 12km NLDAS grid over the U.S., with the standard NLDAS mask -->
+    <!-- Regional NLDAS grid over the U.S. (roughly 12km resolution), with the standard NLDAS mask -->
     <model_grid alias="nldas_mnldas" compset="DATM.+CLM">
       <grid name="atm">224x464_nldas</grid>
       <grid name="lnd">224x464_nldas</grid>
@@ -1106,7 +1106,7 @@
       <nx>464</nx> <ny>224</ny>
       <file grid="atm|lnd" mask="nldas">$DIN_LOC_ROOT/share/domains/domain.clm/domain.lnd.224x464_nldas_224x464_nldas.190403.nc</file>
       <file grid="ocnice"  mask="nldas">$DIN_LOC_ROOT/share/domains/domain.clm/domain.ocn.224x464_nldas.190403.nc</file>
-      <desc>Regional, 12km NLDAS grid over the U.S.</desc>
+      <desc>Regional NLDAS grid over the U.S. (roughly 12km resolution)</desc>
     </domain>
 
     <!-- ATM/LND domains global -->

From 81ee26c7593035d99297d272258c2233ef8297a3 Mon Sep 17 00:00:00 2001
From: Bill Sacks <sacks@ucar.edu>
Date: Mon, 8 Apr 2019 10:39:44 -0600
Subject: [PATCH 4/7] Update nldas grid and mask names

Based on discussion in Thursday's CTSM software meeting
---
 config/cesm/config_grids.xml | 20 +++++++++++---------
 1 file changed, 11 insertions(+), 9 deletions(-)

diff --git a/config/cesm/config_grids.xml b/config/cesm/config_grids.xml
index 742563a69a2..a26ea4eef8b 100644
--- a/config/cesm/config_grids.xml
+++ b/config/cesm/config_grids.xml
@@ -120,11 +120,12 @@
       <grid name="rof">null</grid>
     </model_grid>
 
-    <!-- Regional NLDAS grid over the U.S. (roughly 12km resolution), with the standard NLDAS mask -->
-    <model_grid alias="nldas_mnldas" compset="DATM.+CLM">
-      <grid name="atm">224x464_nldas</grid>
-      <grid name="lnd">224x464_nldas</grid>
-      <grid name="ocnice">224x464_nldas</grid>
+    <!-- Regional NLDAS-2 grid over the U.S. (0.125 degree resolution;
+         25-53N, 235-293E), with the standard NLDAS-2 mask -->
+    <model_grid alias="nldas2_mnldas2" compset="DATM.+CLM">
+      <grid name="atm">0.125nldas2</grid>
+      <grid name="lnd">0.125nldas2</grid>
+      <grid name="ocnice">0.125nldas2</grid>
       <grid name="rof">null</grid>
       <mask>nldas</mask>
     </model_grid>
@@ -1102,11 +1103,12 @@
       <desc>5x5 Amazon regional case -- only valid for DATM/CLM compset</desc>
     </domain>
 
-    <domain name="224x464_nldas">
+    <domain name="0.125nldas2">
       <nx>464</nx> <ny>224</ny>
-      <file grid="atm|lnd" mask="nldas">$DIN_LOC_ROOT/share/domains/domain.clm/domain.lnd.224x464_nldas_224x464_nldas.190403.nc</file>
-      <file grid="ocnice"  mask="nldas">$DIN_LOC_ROOT/share/domains/domain.clm/domain.ocn.224x464_nldas.190403.nc</file>
-      <desc>Regional NLDAS grid over the U.S. (roughly 12km resolution)</desc>
+      <!-- FIXME: Need to update these domain files (both their names and their masks) -->
+      <file grid="atm|lnd" mask="nldas2">$DIN_LOC_ROOT/share/domains/domain.clm/domain.lnd.224x464_nldas_224x464_nldas.190403.nc</file>
+      <file grid="ocnice"  mask="nldas2">$DIN_LOC_ROOT/share/domains/domain.clm/domain.ocn.224x464_nldas.190403.nc</file>
+      <desc>Regional NLDAS-2 grid over the U.S. (0.125 degree resolution; 25-53N, 235-293E)</desc>
     </domain>
 
     <!-- ATM/LND domains global -->

From 753236e3553218a2f7acb440c2dc0e6a506a6156 Mon Sep 17 00:00:00 2001
From: Bill Sacks <sacks@ucar.edu>
Date: Mon, 8 Apr 2019 15:01:27 -0600
Subject: [PATCH 5/7] Update nldas mask info

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

diff --git a/config/cesm/config_grids.xml b/config/cesm/config_grids.xml
index a26ea4eef8b..1ccce9f7be3 100644
--- a/config/cesm/config_grids.xml
+++ b/config/cesm/config_grids.xml
@@ -121,13 +121,13 @@
     </model_grid>
 
     <!-- Regional NLDAS-2 grid over the U.S. (0.125 degree resolution;
-         25-53N, 235-293E), with the standard NLDAS-2 mask -->
+         25-53N, 235-293E), with mask from NLDAS-2 atmospheric drivers -->
     <model_grid alias="nldas2_mnldas2" compset="DATM.+CLM">
       <grid name="atm">0.125nldas2</grid>
       <grid name="lnd">0.125nldas2</grid>
       <grid name="ocnice">0.125nldas2</grid>
       <grid name="rof">null</grid>
-      <mask>nldas</mask>
+      <mask>nldas2</mask>
     </model_grid>
 
     <model_grid alias="hcru_hcru" compset="DATM.+CLM">

From 632ff0045cea4fdb5707a7f183feabe93739fbaf Mon Sep 17 00:00:00 2001
From: Bill Sacks <sacks@ucar.edu>
Date: Wed, 10 Apr 2019 11:25:34 -0600
Subject: [PATCH 6/7] Point to updated domain files for nldas2 grid

These:
- Use a land mask based on the nldas2 atmospheric forcing data, covering
  more points than we had been using before (this mask includes lakes
  and some additional coastal points)
- Use the new grid name
---
 config/cesm/config_grids.xml | 5 ++---
 1 file changed, 2 insertions(+), 3 deletions(-)

diff --git a/config/cesm/config_grids.xml b/config/cesm/config_grids.xml
index 1ccce9f7be3..15a6fc95453 100644
--- a/config/cesm/config_grids.xml
+++ b/config/cesm/config_grids.xml
@@ -1105,9 +1105,8 @@
 
     <domain name="0.125nldas2">
       <nx>464</nx> <ny>224</ny>
-      <!-- FIXME: Need to update these domain files (both their names and their masks) -->
-      <file grid="atm|lnd" mask="nldas2">$DIN_LOC_ROOT/share/domains/domain.clm/domain.lnd.224x464_nldas_224x464_nldas.190403.nc</file>
-      <file grid="ocnice"  mask="nldas2">$DIN_LOC_ROOT/share/domains/domain.clm/domain.ocn.224x464_nldas.190403.nc</file>
+      <file grid="atm|lnd" mask="nldas2">$DIN_LOC_ROOT/share/domains/domain.clm/domain.lnd.0.125nldas2_0.125nldas2.190410.nc</file>
+      <file grid="ocnice"  mask="nldas2">$DIN_LOC_ROOT/share/domains/domain.clm/domain.ocn.0.125nldas2.190410.nc</file>
       <desc>Regional NLDAS-2 grid over the U.S. (0.125 degree resolution; 25-53N, 235-293E)</desc>
     </domain>
 

From 4664dd408f6af8e5498c82f36c9b3ad559077ba4 Mon Sep 17 00:00:00 2001
From: Bill Sacks <sacks@ucar.edu>
Date: Mon, 15 Apr 2019 11:45:59 -0600
Subject: [PATCH 7/7] Also use 0.125nldas2 grid for rof

Since the rof grid is identical to lnd, we should be able to use idmap
for the rof <-> lnd mappings.
---
 config/cesm/config_grids.xml | 5 +++--
 1 file changed, 3 insertions(+), 2 deletions(-)

diff --git a/config/cesm/config_grids.xml b/config/cesm/config_grids.xml
index 15a6fc95453..aed45d0eb66 100644
--- a/config/cesm/config_grids.xml
+++ b/config/cesm/config_grids.xml
@@ -122,11 +122,11 @@
 
     <!-- Regional NLDAS-2 grid over the U.S. (0.125 degree resolution;
          25-53N, 235-293E), with mask from NLDAS-2 atmospheric drivers -->
-    <model_grid alias="nldas2_mnldas2" compset="DATM.+CLM">
+    <model_grid alias="nldas2_rnldas2_mnldas2" compset="DATM.+CLM">
       <grid name="atm">0.125nldas2</grid>
       <grid name="lnd">0.125nldas2</grid>
       <grid name="ocnice">0.125nldas2</grid>
-      <grid name="rof">null</grid>
+      <grid name="rof">0.125nldas2</grid>
       <mask>nldas2</mask>
     </model_grid>
 
@@ -1103,6 +1103,7 @@
       <desc>5x5 Amazon regional case -- only valid for DATM/CLM compset</desc>
     </domain>
 
+    <!-- This grid is also used by ROF -->
     <domain name="0.125nldas2">
       <nx>464</nx> <ny>224</ny>
       <file grid="atm|lnd" mask="nldas2">$DIN_LOC_ROOT/share/domains/domain.clm/domain.lnd.0.125nldas2_0.125nldas2.190410.nc</file>