Skip to content

Commit a3db6cb

Browse files
committed
set dataframe kwarg in gridintersect to suppress warnings
1 parent d59310f commit a3db6cb

3 files changed

Lines changed: 18 additions & 10 deletions

File tree

.docs/Notebooks/groundwater2023_watershed_example.py

Lines changed: 8 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -95,7 +95,7 @@ def densify_geometry(line, step, keep_internal_nodes=True):
9595
# function to set the active and inactive model area
9696
def set_idomain(grid, boundary):
9797
ix = GridIntersect(grid, rtree=True)
98-
result = ix.intersect(Polygon(boundary))
98+
result = ix.intersect(Polygon(boundary), geo_dataframe=False)
9999
idx = list(result.cellids)
100100
idx = np.array(idx, dtype=int)
101101
nr = idx.shape[0]
@@ -244,7 +244,7 @@ def set_idomain(grid, boundary):
244244
ixs = flopy.utils.GridIntersect(struct_grid)
245245
cellids = []
246246
for sg in sgs:
247-
v = ixs.intersect(LineString(sg), sort_by_cellid=True)
247+
v = ixs.intersect(LineString(sg), sort_by_cellid=True, geo_dataframe=False)
248248
cellids += v["cellids"].tolist()
249249
intersection_sg = np.zeros(struct_grid.shape[1:])
250250
for loc in cellids:
@@ -318,7 +318,7 @@ def set_idomain(grid, boundary):
318318
ixs = flopy.utils.GridIntersect(struct_vrc_grid)
319319
cellids = []
320320
for sg in sgs:
321-
v = ixs.intersect(LineString(sg), sort_by_cellid=True)
321+
v = ixs.intersect(LineString(sg), sort_by_cellid=True, geo_dataframe=False)
322322
cellids += v["cellids"].tolist()
323323
intersection_sg_vrc = np.zeros(struct_vrc_grid.shape[1:])
324324
for loc in cellids:
@@ -422,7 +422,7 @@ def set_idomain(grid, boundary):
422422
ixs = flopy.utils.GridIntersect(struct_gridp)
423423
cellids = []
424424
for sg in sgs:
425-
v = ixs.intersect(LineString(sg), sort_by_cellid=True)
425+
v = ixs.intersect(LineString(sg), sort_by_cellid=True, geo_dataframe=False)
426426
cellids += v["cellids"].tolist()
427427
intersection_ngp = np.zeros(struct_gridp.shape[1:])
428428
for loc in cellids:
@@ -432,7 +432,7 @@ def set_idomain(grid, boundary):
432432
ixs = flopy.utils.GridIntersect(struct_gridc)
433433
cellids = []
434434
for sg in sgs:
435-
v = ixs.intersect(LineString(sg), sort_by_cellid=True)
435+
v = ixs.intersect(LineString(sg), sort_by_cellid=True, geo_dataframe=False)
436436
cellids += v["cellids"].tolist()
437437
intersection_ngc = np.zeros(struct_gridc.shape[1:])
438438
for loc in cellids:
@@ -518,7 +518,7 @@ def set_idomain(grid, boundary):
518518
ixs = flopy.utils.GridIntersect(quadtree_grid)
519519
cellids = []
520520
for sg in sgs:
521-
v = ixs.intersect(LineString(sg), sort_by_cellid=True)
521+
v = ixs.intersect(LineString(sg), sort_by_cellid=True, geo_dataframe=False)
522522
cellids += v["cellids"].tolist()
523523
intersection_qg = np.zeros(quadtree_grid.shape[1:])
524524
for loc in cellids:
@@ -590,6 +590,7 @@ def set_idomain(grid, boundary):
590590
LineString(sg),
591591
return_all_intersections=True,
592592
sort_by_cellid=True,
593+
geo_dataframe=False,
593594
)
594595
cellids += v["cellids"].tolist()
595596
intersection_tg = np.zeros(triangular_grid.shape[1:])
@@ -639,6 +640,7 @@ def set_idomain(grid, boundary):
639640
LineString(sg),
640641
return_all_intersections=True,
641642
sort_by_cellid=True,
643+
geo_dataframe=False,
642644
)
643645
cellids += v["cellids"].tolist()
644646
intersection_vg = np.zeros(voronoi_grid.shape[1:])

.docs/Notebooks/mf6_parallel_model_splitting_example.py

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -355,7 +355,7 @@ def string2geom(geostring, conversion=None):
355355
# +
356356
# calculate and set idomain
357357
ix = flopy.utils.GridIntersect(modelgrid, rtree=True)
358-
result = ix.intersect(Polygon(boundary_polygon))
358+
result = ix.intersect(Polygon(boundary_polygon), geo_dataframe=False)
359359
idxs = tuple(zip(*result.cellids))
360360
idomain = np.zeros((nrow, ncol), dtype=int)
361361
idomain[idxs] = 1
@@ -372,7 +372,7 @@ def string2geom(geostring, conversion=None):
372372
ixs = flopy.utils.GridIntersect(modelgrid)
373373
cellids = []
374374
for seg in segs:
375-
v = ixs.intersect(LineString(seg), sort_by_cellid=True)
375+
v = ixs.intersect(LineString(seg), sort_by_cellid=True, geo_dataframe=False)
376376
cellids += v["cellids"].tolist()
377377
intersection_rg = np.zeros(modelgrid.shape[1:])
378378
for loc in cellids:
@@ -405,7 +405,7 @@ def string2geom(geostring, conversion=None):
405405
drn_cellids = []
406406
drn_lengths = []
407407
for seg in segs:
408-
v = ixs.intersect(LineString(seg), sort_by_cellid=True)
408+
v = ixs.intersect(LineString(seg), sort_by_cellid=True, geo_dataframe=False)
409409
drn_cellids += v["cellids"].tolist()
410410
drn_lengths += v["lengths"].tolist()
411411
# -

autotest/test_model_splitter.py

Lines changed: 7 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1014,6 +1014,7 @@ def string2geom(geostring, conversion=None):
10141014
boundary,
10151015
],
10161016
shapetype="Polygon",
1017+
geo_dataframe=False,
10171018
)
10181019
r, c = list(zip(*list(result.cellids)))
10191020
idomain = np.zeros(modelgrid.shape, dtype=int)
@@ -1033,7 +1034,12 @@ def string2geom(geostring, conversion=None):
10331034
lengths = []
10341035
for sg in stream_segs:
10351036
sg = string2geom(sg)
1036-
v = ixs.intersect(sg, shapetype="LineString", sort_by_cellid=True)
1037+
v = ixs.intersect(
1038+
sg,
1039+
shapetype="LineString",
1040+
sort_by_cellid=True,
1041+
geo_dataframe=False,
1042+
)
10371043
cellids += v["cellids"].tolist()
10381044
lengths += v["lengths"].tolist()
10391045

0 commit comments

Comments
 (0)