From 45cc9849d9a5ca07bc5816ee24be5234f6d9df27 Mon Sep 17 00:00:00 2001
From: Xylar Asay-Davis <xylarstorm@gmail.com>
Date: Wed, 23 Jun 2021 08:03:23 +0200
Subject: [PATCH 1/2] Add Atlantic MOC without Mediterranean

This is the new default "Atlantic" MOC region, and the version
that includes the Mediterranean is now "AtlanticMed".

This merge updates the date stamp for the `mocBasins` aggregator
to today's date.
---
 geometric_features/aggregation/__init__.py         | 2 +-
 geometric_features/aggregation/ocean/moc_basins.py | 4 +++-
 2 files changed, 4 insertions(+), 2 deletions(-)

diff --git a/geometric_features/aggregation/__init__.py b/geometric_features/aggregation/__init__.py
index af55132f..008eb33d 100644
--- a/geometric_features/aggregation/__init__.py
+++ b/geometric_features/aggregation/__init__.py
@@ -54,7 +54,7 @@ def get_aggregator_by_name(region_group):
                                   'date': '20210201',
                                   'function': ismip6},
                'MOC Basins': {'prefix': 'mocBasins',
-                              'date': '20210331',
+                              'date': '20210623',
                               'function': moc},
                'Transport Transects': {'prefix': 'transportTransects',
                                        'date': '20210323',
diff --git a/geometric_features/aggregation/ocean/moc_basins.py b/geometric_features/aggregation/ocean/moc_basins.py
index ac5c2bd3..d90bb0b7 100644
--- a/geometric_features/aggregation/ocean/moc_basins.py
+++ b/geometric_features/aggregation/ocean/moc_basins.py
@@ -24,12 +24,14 @@ def moc(gf):
     # -------
     # Xylar Asay-Davis
 
-    MOCSubBasins = {'Atlantic': ['Atlantic', 'Mediterranean'],
+    MOCSubBasins = {'Atlantic': ['Atlantic'],
+                    'AtlanticMed': ['Atlantic', 'Mediterranean'],
                     'IndoPacific': ['Pacific', 'Indian'],
                     'Pacific': ['Pacific'],
                     'Indian': ['Indian']}
 
     MOCSouthernBoundary = {'Atlantic': '34S',
+                           'AtlanticMed': '34S',
                            'IndoPacific': '34S',
                            'Pacific': '6S',
                            'Indian': '6S'}

From 979cb8f48bcedce9dab7b982cc8bb1eddc7d8762 Mon Sep 17 00:00:00 2001
From: Xylar Asay-Davis <xylarstorm@gmail.com>
Date: Wed, 23 Jun 2021 08:35:50 +0200
Subject: [PATCH 2/2] Update to v0.5.0

---
 docs/versions.rst              | 3 +++
 geometric_features/__init__.py | 2 +-
 recipe/meta.yaml               | 2 +-
 3 files changed, 5 insertions(+), 2 deletions(-)

diff --git a/docs/versions.rst b/docs/versions.rst
index a1f427de..6dd40ab1 100644
--- a/docs/versions.rst
+++ b/docs/versions.rst
@@ -15,6 +15,7 @@ Documentation    On GitHub
 `v0.2.0`_        `0.2.0`_
 `v0.3.0`_        `0.3.0`_
 `v0.4.0`_        `0.4.0`_
+`v0.5.0`_        `0.5.0`_
 ================ ===============
 
 .. _`stable`: ../stable/index.html
@@ -39,3 +40,5 @@ Documentation    On GitHub
 .. _`0.3.0`: https://github.com/MPAS-Dev/geometric_features/tree/0.3.0
 .. _`v0.4.0`: ../0.4.0/index.html
 .. _`0.4.0`: https://github.com/MPAS-Dev/geometric_features/tree/0.4.0
+.. _`v0.5.0`: ../0.5.0/index.html
+.. _`0.5.0`: https://github.com/MPAS-Dev/geometric_features/tree/0.5.0
diff --git a/geometric_features/__init__.py b/geometric_features/__init__.py
index acee97de..832bf590 100644
--- a/geometric_features/__init__.py
+++ b/geometric_features/__init__.py
@@ -13,5 +13,5 @@
 from geometric_features.utils import write_feature_names_and_tags
 
 
-__version_info__ = (0, 4, 0)
+__version_info__ = (0, 5, 0)
 __version__ = '.'.join(str(vi) for vi in __version_info__)
diff --git a/recipe/meta.yaml b/recipe/meta.yaml
index cd13e61a..130e31a5 100644
--- a/recipe/meta.yaml
+++ b/recipe/meta.yaml
@@ -1,5 +1,5 @@
 {% set name = "geometric_features" %}
-{% set version = "0.4.0" %}
+{% set version = "0.5.0" %}
 {% set build = 0 %}
 
 package: