Rename WC14 --> NARRM14

compass/ocean/suites/narrm14.txt

@@ -0,0 +1,5 @@
+ocean/global_ocean/NARRM14/mesh
+ocean/global_ocean/NARRM14/WOA23/init
+ocean/global_ocean/NARRM14/WOA23/performance_test
+ocean/global_ocean/NARRM14/WOA23/dynamic_adjustment
+ocean/global_ocean/NARRM14/WOA23/files_for_e3sm

compass/ocean/suites/narrmwisc14.txt

@@ -0,0 +1,5 @@
+ocean/global_ocean/NARRMwISC14/mesh
+ocean/global_ocean/NARRMwISC14/WOA23/init
+ocean/global_ocean/NARRMwISC14/WOA23/performance_test
+ocean/global_ocean/NARRMwISC14/WOA23/dynamic_adjustment
+ocean/global_ocean/NARRMwISC14/WOA23/files_for_e3sm

compass/ocean/tests/global_ocean/__init__.py

@@ -45,7 +45,7 @@ def __init__(self, mpas_core):
 
         self._add_tests(mesh_names=['SO12to60', 'SOwISC12to60'])
 
-        self._add_tests(mesh_names=['WC14', 'WCwISC14'])
+        self._add_tests(mesh_names=['NARRM14', 'NARRMwISC14'])
 
         # RRS6to18: with and without cavities
         self._add_tests(mesh_names=['RRS6to18', 'RRSwISC6to18'])

compass/ocean/tests/global_ocean/global_ocean.cfg

@@ -79,7 +79,7 @@ forward_update_pio = True
 ## metadata related to the mesh
 # whether to add metadata to output files
 add_metadata = True
-# the prefix (e.g. QU, EC, WC, SO)
+# the prefix (e.g. QU, EC, NARRM, SO)
 prefix = PREFIX
 # a description of the mesh
 mesh_description = <<<Missing>>>

compass/ocean/tests/global_ocean/mesh/__init__.py

@@ -11,13 +11,13 @@
 from compass.ocean.tests.global_ocean.mesh.fris04to60 import FRIS04to60BaseMesh
 from compass.ocean.tests.global_ocean.mesh.fris08to60 import FRIS08to60BaseMesh
 from compass.ocean.tests.global_ocean.mesh.kuroshio import KuroshioBaseMesh
+from compass.ocean.tests.global_ocean.mesh.narrm14 import NARRM14BaseMesh
 from compass.ocean.tests.global_ocean.mesh.qu import (
     IcosMeshFromConfigStep,
     QUMeshFromConfigStep,
 )
 from compass.ocean.tests.global_ocean.mesh.rrs6to18 import RRS6to18BaseMesh
 from compass.ocean.tests.global_ocean.mesh.so12to60 import SO12to60BaseMesh
-from compass.ocean.tests.global_ocean.mesh.wc14 import WC14BaseMesh
 from compass.ocean.tests.global_ocean.metadata import (
     get_author_and_email_from_git,
 )
@@ -110,8 +110,8 @@ def __init__(self, test_group, mesh_name, high_res_topography):
             base_mesh_step = FRIS08to60BaseMesh(self, name=name, subdir=subdir)
         elif mesh_name.startswith('Kuroshio'):
             base_mesh_step = KuroshioBaseMesh(self, name=name, subdir=subdir)
-        elif mesh_name in ['WC14', 'WCwISC14']:
-            base_mesh_step = WC14BaseMesh(self, name=name, subdir=subdir)
+        elif mesh_name in ['NARRM14', 'NARRMwISC14']:
+            base_mesh_step = NARRM14BaseMesh(self, name=name, subdir=subdir)
         else:
             raise ValueError(f'Unknown mesh name {mesh_name}')
 

compass/ocean/tests/global_ocean/mesh/wc14/__init__.py → compass/ocean/tests/global_ocean/mesh/narrm14/__init__.py

@@ -14,9 +14,9 @@
 from compass.mesh import QuasiUniformSphericalMeshStep
 
 
-class WC14BaseMesh(QuasiUniformSphericalMeshStep):
+class NARRM14BaseMesh(QuasiUniformSphericalMeshStep):
     """
-    A step for creating WC14 mesh
+    A step for creating NARRM14 mesh
     """
     def setup(self):
         """

compass/ocean/tests/global_ocean/mesh/wc14/wc14.cfg → compass/ocean/tests/global_ocean/mesh/narrm14/narrm14.cfg

@@ -28,12 +28,13 @@ transition_levels = 28
 approx_cell_count = 410000
 
 ## metadata related to the mesh
-# the prefix (e.g. QU, EC, WC, SO)
-prefix = WC
+# the prefix (e.g. QU, EC, NARRM, SO)
+prefix = NARRM
 # a description of the mesh and initial condition
-mesh_description = MPAS North America and Arctic Focused Water Cycle mesh for E3SM version
-                   ${e3sm_version}, with a focused ${min_res}-km resolution
-                   around North America and <<<levels>>> vertical levels
+mesh_description = MPAS North America and Arctic Regionally Refined Mesh for
+                   E3SM version ${e3sm_version}, with ${min_res}-km resolution
+                   in these regions, ${max_res} elsewhere and <<<levels>>>
+                   vertical levels
 
 # E3SM version that the mesh is intended for
 e3sm_version = 3
@@ -45,7 +46,7 @@ min_res = 14
 # the maximum (coarsest) resolution in the mesh, can be the same as min_res
 max_res = 30
 # The URL of the pull request documenting the creation of the mesh
-pull_request = https://github.com/MPAS-Dev/MPAS-Model/pull/780
+pull_request = https://github.com/MPAS-Dev/MPAS-Model/pull/782
 
 
 # config options related to initial condition and diagnostics support files

compass/ocean/tests/global_ocean/mesh/wc14/region_Arctic_Ocean.geojson → compass/ocean/tests/global_ocean/mesh/narrm14/region_Arctic_Ocean.geojson

@@ -66,4 +66,4 @@
       }
     }
   ]
-}
+}

compass/ocean/tests/global_ocean/mesh/wc14/region_Gulf_Stream_extension.geojson → compass/ocean/tests/global_ocean/mesh/narrm14/region_Gulf_Stream_extension.geojson

@@ -54,4 +54,4 @@
       }
     }
   ]
-}
+}