From fd6608bc6dd66ecc62cf3c3570305d204b55b93f Mon Sep 17 00:00:00 2001
From: John Truesdale <jet@ucar.edu>
Date: Wed, 27 Sep 2023 07:58:19 -0600
Subject: [PATCH 1/6] add grid alias for ne3_ne3_mg37

---
 modelgrid_aliases_nuopc.xml | 7 +++++++
 1 file changed, 7 insertions(+)

diff --git a/modelgrid_aliases_nuopc.xml b/modelgrid_aliases_nuopc.xml
index f84d8706..1d82934f 100644
--- a/modelgrid_aliases_nuopc.xml
+++ b/modelgrid_aliases_nuopc.xml
@@ -839,6 +839,13 @@
     <mask>gx3v7</mask>
   </model_grid>
 
+  <model_grid alias="ne3_ne3_mg37" not_compset="_POP">
+    <grid name="atm">ne3np4</grid>
+    <grid name="lnd">ne3np4</grid>
+    <grid name="ocnice">ne3np4</grid>
+    <mask>gx3v7</mask>
+  </model_grid>
+
   <model_grid alias="ne5_ne5_mg37" not_compset="_POP">
     <grid name="atm">ne5np4</grid>
     <grid name="lnd">ne5np4</grid>

From 6ed448535cb8c7506073c9e0041fb4f5f029dff4 Mon Sep 17 00:00:00 2001
From: John Truesdale <jet@ucar.edu>
Date: Wed, 27 Sep 2023 11:14:54 -0600
Subject: [PATCH 2/6] add ne3np4 mesh and domain files for scam

---
 component_grids_nuopc.xml | 29 +++++++++++++++++++++++++++++
 1 file changed, 29 insertions(+)

diff --git a/component_grids_nuopc.xml b/component_grids_nuopc.xml
index cc0bb19d..108b9c43 100644
--- a/component_grids_nuopc.xml
+++ b/component_grids_nuopc.xml
@@ -91,6 +91,13 @@
   </domain>
 
   <!-- CAM/SE meshes -->
+  <domain name="ne3np4">
+    <nx>488</nx> <ny>1</ny>
+    <file>$DIN_LOC_ROOT/share/domains/domain.lnd.ne3np4_gx3v7.230718.nc</file>
+    <mesh>$DIN_LOC_ROOT/share/meshes/ne3np4_ESMFmesh_c230714_cdf5.nc</mesh>
+    <desc>ne3np4 is Spectral Elem 10-deg grid:</desc>
+    <support>EXPERIMENTAL FVM physics grid</support>
+  </domain>
   <domain name="ne3np4.pg3">
     <nx>486</nx> <ny>1</ny>
     <mesh>$DIN_LOC_ROOT/share/meshes/ne3pg3_ESMFmesh_c221214_cdf5.nc</mesh>
@@ -99,6 +106,8 @@
   </domain>
   <domain name="ne5np4">
     <nx>1352</nx> <ny>1</ny>
+    <!-- This is needed for PTS_MODE - it specifies the xml variable PTS_DOMAINFILE -->
+    <file>$DIN_LOC_ROOT/share/domains/domain.lnd.ne5np4_gx3v7.140810.nc</file>
     <mesh>$DIN_LOC_ROOT/share/meshes/ne5np4_esmf_mesh_c210121.nc</mesh>
     <desc>ne5np4 is Spectral Elem 6-deg grid:</desc>
     <support>For ultra-low resolution spectral element grid testing</support>
@@ -111,6 +120,8 @@
   </domain>
   <domain name="ne5np4.pg3">
     <nx>1350</nx> <ny>1</ny>
+    <!-- This is needed for PTS_MODE - it specifies the xml variable PTS_DOMAINFILE -->
+    <file>$DIN_LOC_ROOT/share/domains/domain.lnd.ne5np4.pg3_gx3v7.170605.nc</file>
     <mesh>$DIN_LOC_ROOT/share/meshes/ne5pg3_ESMFmesh_cdf5_c20210118.nc</mesh>
     <desc>ne5np4 is Spectral Elem 6-deg grid with a 3x3 FVM physics grid:</desc>
     <support>EXPERIMENTAL FVM physics grid</support>
@@ -123,35 +134,47 @@
   </domain>
   <domain name="ne16np4">
     <nx>13826</nx> <ny>1</ny>
+    <!-- This is needed for PTS_MODE - it specifies the xml variable PTS_DOMAINFILE -->
+    <file>$DIN_LOC_ROOT/share/domains/domain.lnd.ne16np4_gx1v7.171018.nc</file>
     <mesh>$DIN_LOC_ROOT/share/meshes/ne16np4_scrip_171002_ESMFmesh.nc</mesh>
     <desc>ne16np4 is Spectral Elem 2-deg grid:</desc>
     <support>For low resolution spectral element grid testing</support>
   </domain>
   <domain name="ne16np4.pg3">
     <nx>13824</nx> <ny>1</ny>
+    <!-- This is needed for PTS_MODE - it specifies the xml variable PTS_DOMAINFILE -->
+    <file>$DIN_LOC_ROOT/share/domains/domain.lnd.ne16pg3_gx1v7.171003.nc</file>
     <mesh>$DIN_LOC_ROOT/share/meshes/ne16pg3_ESMFmesh_cdf5_c20211018.nc</mesh>
     <desc>ne16np4.pg3 is a Spectral Elem 2-deg grid with a 3x3 FVM physics grid:</desc>
     <support>EXPERIMENTAL FVM physics grid</support>
   </domain>
   <domain name="ne30np4">
     <nx>48602</nx> <ny>1</ny>
+    <!-- This is needed for PTS_MODE - it specifies the xml variable PTS_DOMAINFILE -->
+    <file>$DIN_LOC_ROOT/share/domains/domain.lnd.ne30_gx1v7.171003.nc</file>
     <mesh>$DIN_LOC_ROOT/share/meshes/ne30np4_ESMFmesh_cdf5_c20211018.nc</mesh>
     <desc>ne30np4 is Spectral Elem 1-deg grid:</desc>
   </domain>
   <domain name="ne30np4.pg2">
     <nx>21600</nx> <ny>1</ny>
+    <!-- This is needed for PTS_MODE - it specifies the xml variable PTS_DOMAINFILE -->
+    <file>$DIN_LOC_ROOT/share/domains/domain.lnd.ne30np4.pg2_gx1v7.170628.nc</file>
     <mesh>$DIN_LOC_ROOT/share/meshes/ne30pg2_ESMFmesh_cdf5_c20211018.nc</mesh>
     <desc>ne30np4.pg2 is a Spectral Elem 1-deg grid with a 2x2 FVM physics grid:</desc>
     <support>EXPERIMENTAL FVM physics grid</support>
   </domain>
   <domain name="ne30np4.pg3">
     <nx>48600</nx> <ny>1</ny>
+    <!-- This is needed for PTS_MODE - it specifies the xml variable PTS_DOMAINFILE -->
+    <file>$DIN_LOC_ROOT/share/domains/domain.lnd.ne30np4.pg3_gx1v7.170605.nc</file>
     <mesh>$DIN_LOC_ROOT/share/meshes/ne30pg3_ESMFmesh_cdf5_c20211018.nc</mesh>
     <desc>ne30np4.pg3 is a Spectral Elem ne30 grid with a 3x3 FVM physics grid:</desc>
     <support>EXPERIMENTAL FVM physics grid</support>
   </domain>
   <domain name="ne30np4.pg4">
     <nx>86400</nx> <ny>1</ny>
+    <!-- This is needed for PTS_MODE - it specifies the xml variable PTS_DOMAINFILE -->
+    <file>$DIN_LOC_ROOT/share/domains/domain.lnd.ne30np4.pg4_gx1v7.170628.nc</file>
     <mesh>$DIN_LOC_ROOT/share/meshes/ne30pg4_ESMFmesh_cdf5_c20211018.nc</mesh>
     <desc>ne30np4.pg4 is a Spectral Elem 1-deg grid with a 4x4 FVM physics grid:</desc>
     <support>EXPERIMENTAL FVM physics grid</support>
@@ -163,18 +186,24 @@
   </domain>
   <domain name="ne60np4.pg2">
     <nx>86400</nx> <ny>1</ny>
+    <!-- This is needed for PTS_MODE - it specifies the xml variable PTS_DOMAINFILE -->
+    <file>$DIN_LOC_ROOT/share/domains/domain.lnd.ne60np4.pg2_gx1v7.170628.nc</file>
     <mesh>$DIN_LOC_ROOT/share/meshes/ne60pg2_ESMFmesh_cdf5_c20211018.nc</mesh>
     <desc>ne60np4.pg2 is a Spectral Elem 0.5-deg grid with a 2x2 FVM physics grid:</desc>
     <support>EXPERIMENTAL FVM physics grid</support>
   </domain>
   <domain name="ne60np4.pg3">
     <nx>194400</nx> <ny>1</ny>
+    <!-- This is needed for PTS_MODE - it specifies the xml variable PTS_DOMAINFILE -->
+    <file>$DIN_LOC_ROOT/share/domains/domain.lnd.ne60np4.pg3_gx1v7.170628.nc</file>
     <mesh>$DIN_LOC_ROOT/share/meshes/ne60pg3_ESMFmesh_cdf5_c20211018.nc</mesh>
     <desc>ne60np4.pg3 is a Spectral Elem 0.5-deg grid with a 3x3 FVM physics grid:</desc>
     <support>EXPERIMENTAL FVM physics grid</support>
   </domain>
   <domain name="ne60np4.pg4">
     <nx>345600</nx> <ny>1</ny>
+    <!-- This is needed for PTS_MODE - it specifies the xml variable PTS_DOMAINFILE -->
+    <file>$DIN_LOC_ROOT/share/domains/domain.lnd.ne60np4.pg4_gx1v7.170628.nc</file>
     <mesh>$DIN_LOC_ROOT/share/meshes/ne60pg4_ESMFmesh_cdf5_c20211018.nc</mesh>
     <desc>ne60np4.pg4 is a Spectral Elem 0.5-deg grid with a 4x4 FVM physics grid:</desc>
     <support>EXPERIMENTAL FVM physics grid</support>

From 97233831d24697ce35bf3399a2dfdb4beb04f8bd Mon Sep 17 00:00:00 2001
From: John Truesdale <jet@ucar.edu>
Date: Sun, 26 Nov 2023 10:31:23 -0700
Subject: [PATCH 3/6] scam se updates add ne4 grid

---
 component_grids_nuopc.xml   | 6 ++++++
 modelgrid_aliases_nuopc.xml | 7 +++++++
 2 files changed, 13 insertions(+)

diff --git a/component_grids_nuopc.xml b/component_grids_nuopc.xml
index 108b9c43..b64ea428 100644
--- a/component_grids_nuopc.xml
+++ b/component_grids_nuopc.xml
@@ -104,6 +104,12 @@
     <desc>ne3np4 is Spectral Elem 10-deg grid with a 3x3 FVM physics grid:</desc>
     <support>EXPERIMENTAL FVM physics grid</support>
   </domain>
+  <domain name="ne4np4">
+    <nx>866</nx> <ny>1</ny>
+    <file>$DIN_LOC_ROOT/share/domains/domain.lnd.ne4np4_oQU240.160614.nc</file>
+    <desc>ne4np4 is Spectral Elem 10-deg grid:</desc>
+    <support>EXPERIMENTAL FVM physics grid</support>
+  </domain>
   <domain name="ne5np4">
     <nx>1352</nx> <ny>1</ny>
     <!-- This is needed for PTS_MODE - it specifies the xml variable PTS_DOMAINFILE -->
diff --git a/modelgrid_aliases_nuopc.xml b/modelgrid_aliases_nuopc.xml
index 1d82934f..22bb6d83 100644
--- a/modelgrid_aliases_nuopc.xml
+++ b/modelgrid_aliases_nuopc.xml
@@ -846,6 +846,13 @@
     <mask>gx3v7</mask>
   </model_grid>
 
+  <model_grid alias="ne4_ne4_mg37" not_compset="_POP">
+    <grid name="atm">ne4np4</grid>
+    <grid name="lnd">ne4np4</grid>
+    <grid name="ocnice">ne4np4</grid>
+    <mask>gx3v7</mask>
+  </model_grid>
+
   <model_grid alias="ne5_ne5_mg37" not_compset="_POP">
     <grid name="atm">ne5np4</grid>
     <grid name="lnd">ne5np4</grid>

From 11e3bab69e2d67f3b3dc633cf11448a16cd0c222 Mon Sep 17 00:00:00 2001
From: John Truesdale <john@thetruesdales.com>
Date: Tue, 12 Mar 2024 21:57:18 -0600
Subject: [PATCH 4/6] trim changes to ccs_config

---
 component_grids_nuopc.xml   | 26 --------------------------
 modelgrid_aliases_nuopc.xml |  7 -------
 2 files changed, 33 deletions(-)

diff --git a/component_grids_nuopc.xml b/component_grids_nuopc.xml
index b64ea428..a49144b6 100644
--- a/component_grids_nuopc.xml
+++ b/component_grids_nuopc.xml
@@ -104,12 +104,6 @@
     <desc>ne3np4 is Spectral Elem 10-deg grid with a 3x3 FVM physics grid:</desc>
     <support>EXPERIMENTAL FVM physics grid</support>
   </domain>
-  <domain name="ne4np4">
-    <nx>866</nx> <ny>1</ny>
-    <file>$DIN_LOC_ROOT/share/domains/domain.lnd.ne4np4_oQU240.160614.nc</file>
-    <desc>ne4np4 is Spectral Elem 10-deg grid:</desc>
-    <support>EXPERIMENTAL FVM physics grid</support>
-  </domain>
   <domain name="ne5np4">
     <nx>1352</nx> <ny>1</ny>
     <!-- This is needed for PTS_MODE - it specifies the xml variable PTS_DOMAINFILE -->
@@ -126,8 +120,6 @@
   </domain>
   <domain name="ne5np4.pg3">
     <nx>1350</nx> <ny>1</ny>
-    <!-- This is needed for PTS_MODE - it specifies the xml variable PTS_DOMAINFILE -->
-    <file>$DIN_LOC_ROOT/share/domains/domain.lnd.ne5np4.pg3_gx3v7.170605.nc</file>
     <mesh>$DIN_LOC_ROOT/share/meshes/ne5pg3_ESMFmesh_cdf5_c20210118.nc</mesh>
     <desc>ne5np4 is Spectral Elem 6-deg grid with a 3x3 FVM physics grid:</desc>
     <support>EXPERIMENTAL FVM physics grid</support>
@@ -140,47 +132,35 @@
   </domain>
   <domain name="ne16np4">
     <nx>13826</nx> <ny>1</ny>
-    <!-- This is needed for PTS_MODE - it specifies the xml variable PTS_DOMAINFILE -->
-    <file>$DIN_LOC_ROOT/share/domains/domain.lnd.ne16np4_gx1v7.171018.nc</file>
     <mesh>$DIN_LOC_ROOT/share/meshes/ne16np4_scrip_171002_ESMFmesh.nc</mesh>
     <desc>ne16np4 is Spectral Elem 2-deg grid:</desc>
     <support>For low resolution spectral element grid testing</support>
   </domain>
   <domain name="ne16np4.pg3">
     <nx>13824</nx> <ny>1</ny>
-    <!-- This is needed for PTS_MODE - it specifies the xml variable PTS_DOMAINFILE -->
-    <file>$DIN_LOC_ROOT/share/domains/domain.lnd.ne16pg3_gx1v7.171003.nc</file>
     <mesh>$DIN_LOC_ROOT/share/meshes/ne16pg3_ESMFmesh_cdf5_c20211018.nc</mesh>
     <desc>ne16np4.pg3 is a Spectral Elem 2-deg grid with a 3x3 FVM physics grid:</desc>
     <support>EXPERIMENTAL FVM physics grid</support>
   </domain>
   <domain name="ne30np4">
     <nx>48602</nx> <ny>1</ny>
-    <!-- This is needed for PTS_MODE - it specifies the xml variable PTS_DOMAINFILE -->
-    <file>$DIN_LOC_ROOT/share/domains/domain.lnd.ne30_gx1v7.171003.nc</file>
     <mesh>$DIN_LOC_ROOT/share/meshes/ne30np4_ESMFmesh_cdf5_c20211018.nc</mesh>
     <desc>ne30np4 is Spectral Elem 1-deg grid:</desc>
   </domain>
   <domain name="ne30np4.pg2">
     <nx>21600</nx> <ny>1</ny>
-    <!-- This is needed for PTS_MODE - it specifies the xml variable PTS_DOMAINFILE -->
-    <file>$DIN_LOC_ROOT/share/domains/domain.lnd.ne30np4.pg2_gx1v7.170628.nc</file>
     <mesh>$DIN_LOC_ROOT/share/meshes/ne30pg2_ESMFmesh_cdf5_c20211018.nc</mesh>
     <desc>ne30np4.pg2 is a Spectral Elem 1-deg grid with a 2x2 FVM physics grid:</desc>
     <support>EXPERIMENTAL FVM physics grid</support>
   </domain>
   <domain name="ne30np4.pg3">
     <nx>48600</nx> <ny>1</ny>
-    <!-- This is needed for PTS_MODE - it specifies the xml variable PTS_DOMAINFILE -->
-    <file>$DIN_LOC_ROOT/share/domains/domain.lnd.ne30np4.pg3_gx1v7.170605.nc</file>
     <mesh>$DIN_LOC_ROOT/share/meshes/ne30pg3_ESMFmesh_cdf5_c20211018.nc</mesh>
     <desc>ne30np4.pg3 is a Spectral Elem ne30 grid with a 3x3 FVM physics grid:</desc>
     <support>EXPERIMENTAL FVM physics grid</support>
   </domain>
   <domain name="ne30np4.pg4">
     <nx>86400</nx> <ny>1</ny>
-    <!-- This is needed for PTS_MODE - it specifies the xml variable PTS_DOMAINFILE -->
-    <file>$DIN_LOC_ROOT/share/domains/domain.lnd.ne30np4.pg4_gx1v7.170628.nc</file>
     <mesh>$DIN_LOC_ROOT/share/meshes/ne30pg4_ESMFmesh_cdf5_c20211018.nc</mesh>
     <desc>ne30np4.pg4 is a Spectral Elem 1-deg grid with a 4x4 FVM physics grid:</desc>
     <support>EXPERIMENTAL FVM physics grid</support>
@@ -192,24 +172,18 @@
   </domain>
   <domain name="ne60np4.pg2">
     <nx>86400</nx> <ny>1</ny>
-    <!-- This is needed for PTS_MODE - it specifies the xml variable PTS_DOMAINFILE -->
-    <file>$DIN_LOC_ROOT/share/domains/domain.lnd.ne60np4.pg2_gx1v7.170628.nc</file>
     <mesh>$DIN_LOC_ROOT/share/meshes/ne60pg2_ESMFmesh_cdf5_c20211018.nc</mesh>
     <desc>ne60np4.pg2 is a Spectral Elem 0.5-deg grid with a 2x2 FVM physics grid:</desc>
     <support>EXPERIMENTAL FVM physics grid</support>
   </domain>
   <domain name="ne60np4.pg3">
     <nx>194400</nx> <ny>1</ny>
-    <!-- This is needed for PTS_MODE - it specifies the xml variable PTS_DOMAINFILE -->
-    <file>$DIN_LOC_ROOT/share/domains/domain.lnd.ne60np4.pg3_gx1v7.170628.nc</file>
     <mesh>$DIN_LOC_ROOT/share/meshes/ne60pg3_ESMFmesh_cdf5_c20211018.nc</mesh>
     <desc>ne60np4.pg3 is a Spectral Elem 0.5-deg grid with a 3x3 FVM physics grid:</desc>
     <support>EXPERIMENTAL FVM physics grid</support>
   </domain>
   <domain name="ne60np4.pg4">
     <nx>345600</nx> <ny>1</ny>
-    <!-- This is needed for PTS_MODE - it specifies the xml variable PTS_DOMAINFILE -->
-    <file>$DIN_LOC_ROOT/share/domains/domain.lnd.ne60np4.pg4_gx1v7.170628.nc</file>
     <mesh>$DIN_LOC_ROOT/share/meshes/ne60pg4_ESMFmesh_cdf5_c20211018.nc</mesh>
     <desc>ne60np4.pg4 is a Spectral Elem 0.5-deg grid with a 4x4 FVM physics grid:</desc>
     <support>EXPERIMENTAL FVM physics grid</support>
diff --git a/modelgrid_aliases_nuopc.xml b/modelgrid_aliases_nuopc.xml
index 22bb6d83..1d82934f 100644
--- a/modelgrid_aliases_nuopc.xml
+++ b/modelgrid_aliases_nuopc.xml
@@ -846,13 +846,6 @@
     <mask>gx3v7</mask>
   </model_grid>
 
-  <model_grid alias="ne4_ne4_mg37" not_compset="_POP">
-    <grid name="atm">ne4np4</grid>
-    <grid name="lnd">ne4np4</grid>
-    <grid name="ocnice">ne4np4</grid>
-    <mask>gx3v7</mask>
-  </model_grid>
-
   <model_grid alias="ne5_ne5_mg37" not_compset="_POP">
     <grid name="atm">ne5np4</grid>
     <grid name="lnd">ne5np4</grid>

From 764a1aa8666d41f9fde15f95542c9cd0144131a2 Mon Sep 17 00:00:00 2001
From: John Truesdale <john@thetruesdales.com>
Date: Tue, 12 Mar 2024 22:02:11 -0600
Subject: [PATCH 5/6] remove unneeded domain file

---
 component_grids_nuopc.xml | 2 --
 1 file changed, 2 deletions(-)

diff --git a/component_grids_nuopc.xml b/component_grids_nuopc.xml
index a49144b6..c87674c0 100644
--- a/component_grids_nuopc.xml
+++ b/component_grids_nuopc.xml
@@ -106,8 +106,6 @@
   </domain>
   <domain name="ne5np4">
     <nx>1352</nx> <ny>1</ny>
-    <!-- This is needed for PTS_MODE - it specifies the xml variable PTS_DOMAINFILE -->
-    <file>$DIN_LOC_ROOT/share/domains/domain.lnd.ne5np4_gx3v7.140810.nc</file>
     <mesh>$DIN_LOC_ROOT/share/meshes/ne5np4_esmf_mesh_c210121.nc</mesh>
     <desc>ne5np4 is Spectral Elem 6-deg grid:</desc>
     <support>For ultra-low resolution spectral element grid testing</support>

From 0b004bbc2b341b62bc232207e7629af1394545f0 Mon Sep 17 00:00:00 2001
From: John Truesdale <john@thetruesdales.com>
Date: Tue, 12 Mar 2024 22:05:23 -0600
Subject: [PATCH 6/6] clean up support comment for new ne3np4 grid

---
 component_grids_nuopc.xml | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/component_grids_nuopc.xml b/component_grids_nuopc.xml
index c87674c0..275139e4 100644
--- a/component_grids_nuopc.xml
+++ b/component_grids_nuopc.xml
@@ -93,10 +93,10 @@
   <!-- CAM/SE meshes -->
   <domain name="ne3np4">
     <nx>488</nx> <ny>1</ny>
+    <!-- This is needed for PTS_MODE - it specifies the xml variable PTS_DOMAINFILE -->
     <file>$DIN_LOC_ROOT/share/domains/domain.lnd.ne3np4_gx3v7.230718.nc</file>
     <mesh>$DIN_LOC_ROOT/share/meshes/ne3np4_ESMFmesh_c230714_cdf5.nc</mesh>
     <desc>ne3np4 is Spectral Elem 10-deg grid:</desc>
-    <support>EXPERIMENTAL FVM physics grid</support>
   </domain>
   <domain name="ne3np4.pg3">
     <nx>486</nx> <ny>1</ny>