From 3909054c767330412cccbb499cf084db70e7e5f8 Mon Sep 17 00:00:00 2001
From: Jim Edwards <jedwards@ucar.edu>
Date: Tue, 9 Apr 2024 10:14:14 -0600
Subject: [PATCH] Revert "add polarcap grid, fix mpasa15-3 naming issues"

---
 component_grids_nuopc.xml   |  6 ------
 modelgrid_aliases_mct.xml   |  8 ++++----
 modelgrid_aliases_nuopc.xml | 24 ++++++++++++------------
 3 files changed, 16 insertions(+), 22 deletions(-)

diff --git a/component_grids_nuopc.xml b/component_grids_nuopc.xml
index 0023fc26..275139e4 100644
--- a/component_grids_nuopc.xml
+++ b/component_grids_nuopc.xml
@@ -249,12 +249,6 @@
     <desc>ne0np4.ARCTICGRIS.ne30x8 is a Spectral Elem 1-deg grid with a 1/8 deg refined region over Greenland:</desc>
     <support>Test support only</support>
   </domain>
-  <domain name="ne0np4.POLARCAP.ne30x4">
-    <nx>186194</nx> <ny>1</ny>
-    <mesh>/glade/work/aherring/grids/var-res/ne0np4.POLARRES.ne30x4/grids/polarcap/POLARCAP_ne30x4_np4_MESH_cdf5.nc</mesh>
-    <desc>ne0np4.POLARCAP.ne30x4 is a Spectral Elem 1-deg grid with a 1/4 deg refined region over the Arctic and Antarctica:</desc>
-    <support>Test support only</support>
-  </domain>
 
   <!-- CAM/MPAS meshes -->
   <domain name="mpasa480">
diff --git a/modelgrid_aliases_mct.xml b/modelgrid_aliases_mct.xml
index 890b2b86..74ea6c06 100644
--- a/modelgrid_aliases_mct.xml
+++ b/modelgrid_aliases_mct.xml
@@ -1137,10 +1137,10 @@
     <mask>gx1v7</mask>
   </model_grid>
 
-  <model_grid alias="mpasa15-3conus_mpasa15-3conus" not_compset="_POP">
-    <grid name="atm">mpasa15-3conus</grid>
-    <grid name="lnd">mpasa15-3conus</grid>
-    <grid name="ocnice">mpasa15-3conus</grid>
+  <model_grid alias="mpasa15-3_mpasa15-3" not_compset="_POP">
+    <grid name="atm">mpasa15-3</grid>
+    <grid name="lnd">mpasa15-3</grid>
+    <grid name="ocnice">mpasa15-3</grid>
     <mask>gx1v7</mask>
   </model_grid>
 
diff --git a/modelgrid_aliases_nuopc.xml b/modelgrid_aliases_nuopc.xml
index 0d53481b..7bc4fae4 100644
--- a/modelgrid_aliases_nuopc.xml
+++ b/modelgrid_aliases_nuopc.xml
@@ -1299,13 +1299,6 @@
     <mask>tx0.1v2</mask>
   </model_grid>
 
-  <model_grid alias="ne0POLARCAPne30x4_ne0POLARCAPne30x4_mt12" not_compset="_POP">
-    <grid name="atm">ne0np4.POLARCAP.ne30x4</grid>
-    <grid name="lnd">ne0np4.POLARCAP.ne30x4</grid>
-    <grid name="ocnice">ne0np4.POLARCAP.ne30x4</grid>
-    <mask>tx0.1v2</mask>
-  </model_grid>
-
   <!-- MPAS-A grids -->
 
   <model_grid alias="mpasa480_mpasa480" not_compset="_POP">
@@ -1357,11 +1350,18 @@
     <mask>gx1v7</mask>
   </model_grid>
 
-  <model_grid alias="mpasa15-3-conus_mpasa15-3-conus_mt13" not_compset="_POP">
-    <grid name="atm">mpasa15-3conus</grid>
-    <grid name="lnd">mpasa15-3conus</grid>
-    <grid name="ocnice">mpasa15-3conus</grid>
-    <mask>tx0.1v3</mask>
+  <model_grid alias="mpasa15-3_mpasa15-3" not_compset="_POP">
+    <grid name="atm">mpasa15-3</grid>
+    <grid name="lnd">mpasa15-3</grid>
+    <grid name="ocnice">mpasa15-3</grid>
+    <mask>gx1v7</mask>
+  </model_grid>
+
+  <model_grid alias="mpasa15-3-conus_mpasa15-3-conus" not_compset="_POP">
+    <grid name="atm">mpasa15-3</grid>
+    <grid name="lnd">mpasa15-3</grid>
+    <grid name="ocnice">mpasa15-3</grid>
+    <mask>gx1v7</mask>
   </model_grid>
 
   <model_grid alias="mpasa7p5_mpasa7p5_mg17" not_compset="_POP">