Merge pull request #1 from schism-dev/main

Update deprecated sjoin argument (schism-dev#131)
mansurjisan · Aug 20, 2024 · 1478884 · 1478884
2 parents f90496b + 3051b1e
commit 1478884
Show file tree

Hide file tree

Showing 3 changed files with 5 additions and 5 deletions.
diff --git a/pyschism/mesh/fgrid.py b/pyschism/mesh/fgrid.py
@@ -81,7 +81,7 @@ def add_region(
         gdf2 = gpd.GeoDataFrame(
                  {'geometry': points, 'index': list(range(len(points)))},
                 crs=self.crs)
-        gdf_in = gpd.sjoin(gdf2, gdf1, op="within")
+        gdf_in = gpd.sjoin(gdf2, gdf1, predicate="within")
         picks = ([i.index for i in gdf_in.itertuples()])
         self.values[picks] = value
 
@@ -106,7 +106,7 @@ def modify_by_region(self, hgrid, fname, value, depth1, flag):
         gdf2 = gpd.GeoDataFrame(
                  {'geometry': points, 'index': list(range(len(points)))},
                 crs=self.crs)
-        gdf_in = gpd.sjoin(gdf2, gdf1, op="within")
+        gdf_in = gpd.sjoin(gdf2, gdf1, predicate="within")
         picks = [i.index for i in gdf_in.itertuples()]
         if flag == 0:
             self.values[picks] = value

diff --git a/pyschism/mesh/gridgr3.py b/pyschism/mesh/gridgr3.py
@@ -39,7 +39,7 @@ def add_region(self, region: Union[Polygon, MultiPolygon], value):
         gdf2 = gpd.GeoDataFrame(
             {"geometry": points, "index": list(range(len(points)))}, crs=self.crs
         )
-        gdf_in = gpd.sjoin(gdf2, gdf1, op="within")
+        gdf_in = gpd.sjoin(gdf2, gdf1, predicate="within")
         picks = [i.index for i in gdf_in.itertuples()]
         self.values[picks] = value
 
@@ -61,7 +61,7 @@ def modify_by_region(self, hgrid, fname, value, depth1, flag):
         points = [Point(*coord) for coord in self.coords]
         gdf2 = gpd.GeoDataFrame(
                  {'geometry': points, 'index': list(range(len(points)))})
-        gdf_in = gpd.sjoin(gdf2, gdf1, op="within")
+        gdf_in = gpd.sjoin(gdf2, gdf1, predicate="within")
         picks = [i.index for i in gdf_in.itertuples()]
         if flag == 0:
             self.values[picks] = value

diff --git a/setup.py b/setup.py
@@ -108,7 +108,7 @@ def run(self):
         'cfgrib',
         'f90nml',
         'fsspec',
-        'geopandas',
+        'geopandas>=0.10',
         'metpy',
         'netCDF4',
         'netcdf-flattener>=1.2.0',