Merge pull request #1039 from xylar/rename-greenland-regions

Rename Greenland Regions --> ISMIP6 Greenland Regions
MPAS-Dev · Nov 25, 2024 · 8a54d6d · 8a54d6d
2 parents 2900a2a + aa6731a
commit 8a54d6d
Show file tree

Hide file tree

Showing 6 changed files with 11 additions and 11 deletions.
diff --git a/ci/recipe/meta.yaml b/ci/recipe/meta.yaml
@@ -29,7 +29,7 @@ requirements:
     - esmf >=8.4.2,<8.7.0
     - esmf=*=mpi_mpich_*
     - f90nml
-    - geometric_features >=1.4.0
+    - geometric_features >=1.6.0
     - gsw
     - lxml
     - mache >=1.11.0

diff --git a/dev-spec.txt b/dev-spec.txt
@@ -10,7 +10,7 @@ dask
 esmf >=8.4.2,<8.7.0
 esmf=*=mpi_mpich_*
 f90nml
-geometric_features>=1.4.0
+geometric_features>=1.6.0
 gsw
 lxml
 mache >=1.11.0

diff --git a/docs/conf.py b/docs/conf.py
@@ -189,7 +189,7 @@
     'geometric_features':
         ('http://mpas-dev.github.io/geometric_features/main/', None),
     'mpas_tools':
-        ('http://mpas-dev.github.io/MPAS-Tools/stable/', None)}
+        ('http://mpas-dev.github.io/MPAS-Tools/master/', None)}
 
 
 cwd = os.getcwd()

diff --git a/docs/users_guide/config/regions.rst b/docs/users_guide/config/regions.rst
@@ -46,7 +46,7 @@ Several tasks (:ref:`task_hovmollerOceanRegions`, :ref:`task_oceanHistogram`,
 :ref:`task_oceanRegionalProfiles`, :ref:`task_regionalTSDiagrams`, and
 :ref:`task_timeSeriesOceanRegions`) can use any of the defined region groups.
 Currently, available region groups are: ``Artic Ocean Regions``, ``Antarctic Regions``,
-``Greenland Regions``, ``Ocean Basins``, ``Ice Shelves``, and ``Ocean Subbasins``.
+``ISMIP6 Greenland Regions``, ``Ocean Basins``, ``Ice Shelves``, and ``Ocean Subbasins``.
 
 The option ``regionMaskSubdirectory`` in the ``[diagnostics]`` section specifies
 the path to cached mask files for these region groups, typically

diff --git a/mpas_analysis/default.cfg b/mpas_analysis/default.cfg
@@ -1877,7 +1877,7 @@ normType = log
 # Obserational data sets to compare against
 obs = ['SOSE', 'WOA23']
 
-[TSDiagramsForGreenlandRegions]
+[TSDiagramsForISMIP6GreenlandRegions]
 ## options related to plotting T/S diagrams of Greenland regions
 
 # list of regions to plot or ['all'] for all regions in the masks file.

diff --git a/mpas_analysis/polar_regions.cfg b/mpas_analysis/polar_regions.cfg
@@ -41,9 +41,9 @@ normArgsResult = {'vmin': 33.8, 'vmax': 35.0}
 
 # the names of region groups to plot, each with its own section below
 regionGroups = ['Ocean Basins', 'Arctic Ocean Regions',
-                'Greenland Regions', 'Antarctic Regions']
+                'ISMIP6 Greenland Regions', 'Antarctic Regions']
 
-[TSDiagramsForGreenlandRegions]
+[TSDiagramsForISMIP6GreenlandRegions]
 ## options related to plotting T/S diagrams of Greenland regions
 
 # list of regions to plot or ['all'] for all regions in the masks file.
@@ -324,10 +324,10 @@ seasons =  ['JFM']
 ## options related to plotting vertical profiles of regional means (and
 ## variability) of 3D MPAS fields
 
-regionGroups = ['Arctic Ocean Regions', 'Greenland Regions', 'Antarctic Regions']
+regionGroups = ['Arctic Ocean Regions', 'ISMIP6 Greenland Regions', 'Antarctic Regions']
 
 
-[profilesGreenlandRegions]
+[profilesISMIP6GreenlandRegions]
 ## options related to plotting vertical profiles Greenland regions
 
 
@@ -452,10 +452,10 @@ profileGalleryGroup = Antarctic Regional Profiles
 ## regional means of 3D MPAS fields
 
 # the names of region groups to plot, each with its own section below
-regionGroups = ['Arctic Ocean Regions', 'Greenland Regions', 'Antarctic Regions']
+regionGroups = ['Arctic Ocean Regions', 'ISMIP6 Greenland Regions', 'Antarctic Regions']
 
 
-[hovmollerGreenlandRegions]
+[hovmollerISMIP6GreenlandRegions]
 ## options related to plotting Hovmoller diagrams of Arctic Ocean Regions
 
 # a list of dictionaries for each field to plot.  The dictionary includes