From 144e604bf2ea15ab083fbe6959a2bfe52ce13106 Mon Sep 17 00:00:00 2001 From: Carolyn Begeman Date: Fri, 30 Aug 2024 09:16:01 -0500 Subject: [PATCH 1/4] Add Southern Hemisphere region as part of Antarctic regions --- .../region/Southern_Hemisphere/region.geojson | 44 +++++++++++++++++++ .../aggregation/ocean/antarctic_regions.py | 2 +- geometric_features/features_and_tags.json | 8 ++-- 3 files changed, 49 insertions(+), 5 deletions(-) create mode 100644 geometric_data/ocean/region/Southern_Hemisphere/region.geojson diff --git a/geometric_data/ocean/region/Southern_Hemisphere/region.geojson b/geometric_data/ocean/region/Southern_Hemisphere/region.geojson new file mode 100644 index 00000000..12d0662f --- /dev/null +++ b/geometric_data/ocean/region/Southern_Hemisphere/region.geojson @@ -0,0 +1,44 @@ +{ + "type": "FeatureCollection", + "features": [ + { + "type": "Feature", + "properties": { + "name": "Southern Ocean 60S", + "tags": "Antarctic;Timmermann", + "object": "region", + "component": "ocean", + "author": "Xylar Asay-Davis", + "zmax": -400.0, + "zmin": -1000.0 + }, + "geometry": { + "type": "Polygon", + "coordinates": [ + [ + [ + -180.0, + -80.0 + ], + [ + 180.0, + -80.0 + ], + [ + 180.0, + 0.0 + ], + [ + -180.0, + 0.0 + ], + [ + -180.0, + -80.0 + ] + ] + ] + } + } + ] +} diff --git a/geometric_features/aggregation/ocean/antarctic_regions.py b/geometric_features/aggregation/ocean/antarctic_regions.py index 36b3af2d..b94c94c0 100644 --- a/geometric_features/aggregation/ocean/antarctic_regions.py +++ b/geometric_features/aggregation/ocean/antarctic_regions.py @@ -16,7 +16,7 @@ def antarctic(gf): # ------- # Xylar Asay-Davis - regions = ['Southern Ocean', 'Southern Ocean 60S', + regions = ['Southern Hemisphere', 'Southern Ocean', 'Southern Ocean 60S', 'Eastern Weddell Sea Shelf', 'Eastern Weddell Sea Deep', 'Western Weddell Sea Shelf', 'Western Weddell Sea Deep', 'Weddell Sea Shelf', 'Weddell Sea Deep', diff --git a/geometric_features/features_and_tags.json b/geometric_features/features_and_tags.json index af4c4fe4..55093245 100644 --- a/geometric_features/features_and_tags.json +++ b/geometric_features/features_and_tags.json @@ -1537,14 +1537,14 @@ "South_Pacific_Ocean", "Pacific_Basin" ], - "Southern Ocean": [ - "Southern_Ocean", - "Southern_Ocean_Basin" - ], "Southern Ocean 60S": [ "Antarctic", "Timmermann" ], + "Southern Ocean": [ + "Southern_Ocean", + "Southern_Ocean_Basin" + ], "Strait of Gibraltar": [ "Strait_of_Gibraltar", "Mediterranean_Basin" From 79cf6c62367759947e4fbd25232d943b821ed868 Mon Sep 17 00:00:00 2001 From: Carolyn Begeman Date: Fri, 30 Aug 2024 15:28:15 -0500 Subject: [PATCH 2/4] Move SH from Antarctic regions to Ocean Basins --- .../ocean/region/Southern_Hemisphere/region.geojson | 10 +++++----- .../aggregation/ocean/antarctic_regions.py | 2 +- geometric_features/aggregation/ocean/ocean_basins.py | 3 ++- geometric_features/features_and_tags.json | 9 ++++++--- 4 files changed, 14 insertions(+), 10 deletions(-) diff --git a/geometric_data/ocean/region/Southern_Hemisphere/region.geojson b/geometric_data/ocean/region/Southern_Hemisphere/region.geojson index 12d0662f..0796deda 100644 --- a/geometric_data/ocean/region/Southern_Hemisphere/region.geojson +++ b/geometric_data/ocean/region/Southern_Hemisphere/region.geojson @@ -4,13 +4,13 @@ { "type": "Feature", "properties": { - "name": "Southern Ocean 60S", - "tags": "Antarctic;Timmermann", + "name": "Southern Hemisphere", + "tags": "", "object": "region", "component": "ocean", - "author": "Xylar Asay-Davis", - "zmax": -400.0, - "zmin": -1000.0 + "author": "Carolyn Begeman", + "zmax": 10.0, + "zmin": -10000.0 }, "geometry": { "type": "Polygon", diff --git a/geometric_features/aggregation/ocean/antarctic_regions.py b/geometric_features/aggregation/ocean/antarctic_regions.py index b94c94c0..36b3af2d 100644 --- a/geometric_features/aggregation/ocean/antarctic_regions.py +++ b/geometric_features/aggregation/ocean/antarctic_regions.py @@ -16,7 +16,7 @@ def antarctic(gf): # ------- # Xylar Asay-Davis - regions = ['Southern Hemisphere', 'Southern Ocean', 'Southern Ocean 60S', + regions = ['Southern Ocean', 'Southern Ocean 60S', 'Eastern Weddell Sea Shelf', 'Eastern Weddell Sea Deep', 'Western Weddell Sea Shelf', 'Western Weddell Sea Deep', 'Weddell Sea Shelf', 'Weddell Sea Deep', diff --git a/geometric_features/aggregation/ocean/ocean_basins.py b/geometric_features/aggregation/ocean/ocean_basins.py index 89e9128d..46b22a3e 100644 --- a/geometric_features/aggregation/ocean/ocean_basins.py +++ b/geometric_features/aggregation/ocean/ocean_basins.py @@ -44,6 +44,7 @@ def basins(gf): fc.merge(gf.read(componentName='ocean', objectType='region', featureNames=['Global Ocean', 'Global Ocean 65N to 65S', - 'Global Ocean 15S to 15N'])) + 'Global Ocean 15S to 15N', + 'Southern Hemisphere'])) return fc diff --git a/geometric_features/features_and_tags.json b/geometric_features/features_and_tags.json index 55093245..2ec81b37 100644 --- a/geometric_features/features_and_tags.json +++ b/geometric_features/features_and_tags.json @@ -1537,14 +1537,17 @@ "South_Pacific_Ocean", "Pacific_Basin" ], - "Southern Ocean 60S": [ - "Antarctic", - "Timmermann" + "Southern Hemisphere": [ + "" ], "Southern Ocean": [ "Southern_Ocean", "Southern_Ocean_Basin" ], + "Southern Ocean 60S": [ + "Antarctic", + "Timmermann" + ], "Strait of Gibraltar": [ "Strait_of_Gibraltar", "Mediterranean_Basin" From e1650d6f71db2f469907647db1b37291dcdd7256 Mon Sep 17 00:00:00 2001 From: Carolyn Begeman Date: Tue, 3 Sep 2024 13:47:00 -0500 Subject: [PATCH 3/4] Change SH bounds to 90S --- .../ocean/region/Southern_Hemisphere/region.geojson | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/geometric_data/ocean/region/Southern_Hemisphere/region.geojson b/geometric_data/ocean/region/Southern_Hemisphere/region.geojson index 0796deda..fedd1566 100644 --- a/geometric_data/ocean/region/Southern_Hemisphere/region.geojson +++ b/geometric_data/ocean/region/Southern_Hemisphere/region.geojson @@ -18,11 +18,11 @@ [ [ -180.0, - -80.0 + -90.0 ], [ 180.0, - -80.0 + -90.0 ], [ 180.0, @@ -34,7 +34,7 @@ ], [ -180.0, - -80.0 + -90.0 ] ] ] From f978899d3cc5967392bd1c8ea9fd1a7a5617800e Mon Sep 17 00:00:00 2001 From: Xylar Asay-Davis Date: Mon, 4 Nov 2024 08:00:32 -0600 Subject: [PATCH 4/4] Update the datestamp for the aggregator --- geometric_features/aggregation/__init__.py | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/geometric_features/aggregation/__init__.py b/geometric_features/aggregation/__init__.py index e58f5005..dde84300 100644 --- a/geometric_features/aggregation/__init__.py +++ b/geometric_features/aggregation/__init__.py @@ -43,7 +43,7 @@ def get_aggregator_by_name(region_group): 'date': '20201130', 'function': arctic_seaice}, 'Ocean Basins': {'prefix': 'oceanBasins', - 'date': '20200621', + 'date': '20240830', 'function': basins}, 'Ice Shelves': {'prefix': 'iceShelves', 'date': '20200621',