Skip to content

Commit 7a83a2d

Browse files
committed
fix(flopy.utils.GridIntersect() calls): remove method= args
1 parent 0406812 commit 7a83a2d

7 files changed

Lines changed: 25 additions & 25 deletions

notebooks/part1_flopy/04_Modelgrid_and_intersection.ipynb

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1202,7 +1202,7 @@
12021202
"outputs": [],
12031203
"source": [
12041204
"main_stem = []\n",
1205-
"gx = GridIntersect(modelgrid, method=\"vertex\")\n",
1205+
"gx = GridIntersect(modelgrid)\n",
12061206
"for iloc, row in flw_main.iterrows():\n",
12071207
" results = gx.intersect(row.geometry)\n",
12081208
" main_stem.extend(results.cellids)\n",

notebooks/part1_flopy/05_Unstructured_Grid_generation.ipynb

Lines changed: 9 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -399,7 +399,7 @@
399399
"metadata": {},
400400
"outputs": [],
401401
"source": [
402-
"ix = GridIntersect(sgrid, method=\"vertex\")\n",
402+
"ix = GridIntersect(sgrid)\n",
403403
"result = ix.intersect(basindf.geometry.values[0], contains_centroid=True)\n",
404404
"rowcol = result[\"cellids\"]"
405405
]
@@ -550,7 +550,7 @@
550550
"outputs": [],
551551
"source": [
552552
"rowcols = []\n",
553-
"ix = GridIntersect(sgrid, method=\"vertex\")\n",
553+
"ix = GridIntersect(sgrid)\n",
554554
"for geom in nhddf.geometry.values:\n",
555555
" rcs = ix.intersects(geom)[\"cellids\"]\n",
556556
" rowcols.extend(list(rcs))"
@@ -673,7 +673,7 @@
673673
"metadata": {},
674674
"outputs": [],
675675
"source": [
676-
"ix = GridIntersect(rfgrid, method=\"vertex\")\n",
676+
"ix = GridIntersect(rfgrid)\n",
677677
"result = ix.intersect(basindf.geometry.values[0], contains_centroid=True)\n",
678678
"rowcol = result[\"cellids\"]\n",
679679
"\n",
@@ -849,7 +849,7 @@
849849
"# live code this/give it as an activity\n",
850850
"idomainp = np.ones(sgrid.idomain.shape, dtype=int)\n",
851851
"\n",
852-
"gix = GridIntersect(sgrid, method=\"vertex\")\n",
852+
"gix = GridIntersect(sgrid)\n",
853853
"result = gix.intersect(lgr_gdf.geometry.values[0])\n",
854854
"cid = result[\"cellids\"]\n",
855855
"\n",
@@ -959,7 +959,7 @@
959959
"metadata": {},
960960
"outputs": [],
961961
"source": [
962-
"ix = GridIntersect(childgrid, method=\"vertex\")\n",
962+
"ix = GridIntersect(childgrid)\n",
963963
"cstrmcells = []\n",
964964
"for geom in nhddf.geometry.values:\n",
965965
" rcs = ix.intersects(geom)[\"cellids\"]\n",
@@ -1120,7 +1120,7 @@
11201120
"source": [
11211121
"# create the idomain array\n",
11221122
"idomain = np.zeros(quadgrid.shape, dtype=int)\n",
1123-
"ix = GridIntersect(quadgrid, method=\"vertex\")\n",
1123+
"ix = GridIntersect(quadgrid)\n",
11241124
"nodes = ix.intersect(basindf.geometry.values[0], contains_centroid=True)[\"cellids\"]\n",
11251125
"\n",
11261126
"idomain[:, list(nodes)] = 1\n",
@@ -1136,7 +1136,7 @@
11361136
"source": [
11371137
"# create an array of stream cells\n",
11381138
"qstr = []\n",
1139-
"ix = GridIntersect(quadgrid, method=\"vertex\")\n",
1139+
"ix = GridIntersect(quadgrid)\n",
11401140
"for geom in nhddf.geometry.values:\n",
11411141
" nodes = ix.intersects(geom)[\"cellids\"]\n",
11421142
" qstr.extend(list(nodes))"
@@ -1383,7 +1383,7 @@
13831383
"outputs": [],
13841384
"source": [
13851385
"tristr = []\n",
1386-
"ix = GridIntersect(trigrid, method=\"vertex\")\n",
1386+
"ix = GridIntersect(trigrid)\n",
13871387
"for geom in nhddf.geometry.values:\n",
13881388
" nodes = ix.intersects(geom)[\"cellids\"]\n",
13891389
" tristr.extend(list(nodes))\n",
@@ -1519,7 +1519,7 @@
15191519
"outputs": [],
15201520
"source": [
15211521
"vorst = []\n",
1522-
"ix = GridIntersect(vorgrid, method=\"vertex\")\n",
1522+
"ix = GridIntersect(vorgrid)\n",
15231523
"for geom in nhddf.geometry.values:\n",
15241524
" nodes = ix.intersects(geom)[\"cellids\"]\n",
15251525
" vorst.extend(list(nodes))\n",

notebooks/part1_flopy/06-Project-structured.ipynb

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -143,7 +143,7 @@
143143
"metadata": {},
144144
"outputs": [],
145145
"source": [
146-
"ix = GridIntersect(base_grid, method=\"vertex\", rtree=True)"
146+
"ix = GridIntersect(base_grid, rtree=True)"
147147
]
148148
},
149149
{

notebooks/part1_flopy/solutions/05_Unstructured_Grid_generation.ipynb

Lines changed: 9 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -906,7 +906,7 @@
906906
}
907907
],
908908
"source": [
909-
"ix = GridIntersect(sgrid, method=\"vertex\")\n",
909+
"ix = GridIntersect(sgrid)\n",
910910
"result = ix.intersect(basindf.geometry.values[0], contains_centroid=True)\n",
911911
"rowcol = result[\"cellids\"]\n",
912912
"rowcol"
@@ -1149,7 +1149,7 @@
11491149
"outputs": [],
11501150
"source": [
11511151
"rowcols = []\n",
1152-
"ix = GridIntersect(sgrid, method=\"vertex\")\n",
1152+
"ix = GridIntersect(sgrid)\n",
11531153
"for geom in nhddf.geometry.values:\n",
11541154
" rcs = ix.intersects(geom)[\"cellids\"]\n",
11551155
" rowcols.extend(list(rcs))"
@@ -1309,7 +1309,7 @@
13091309
"metadata": {},
13101310
"outputs": [],
13111311
"source": [
1312-
"ix = GridIntersect(rfgrid, method=\"vertex\")\n",
1312+
"ix = GridIntersect(rfgrid)\n",
13131313
"result = ix.intersect(basindf.geometry.values[0], contains_centroid=True)\n",
13141314
"rowcol = result[\"cellids\"]\n",
13151315
"\n",
@@ -1552,7 +1552,7 @@
15521552
"# live code this/give it as an activity\n",
15531553
"idomainp = np.ones(sgrid.idomain.shape, dtype=int)\n",
15541554
"\n",
1555-
"gix = GridIntersect(sgrid, method=\"vertex\")\n",
1555+
"gix = GridIntersect(sgrid)\n",
15561556
"result = gix.intersect(lgr_gdf.geometry.values[0])\n",
15571557
"cid = result[\"cellids\"]\n",
15581558
"\n",
@@ -1682,7 +1682,7 @@
16821682
"metadata": {},
16831683
"outputs": [],
16841684
"source": [
1685-
"ix = GridIntersect(childgrid, method=\"vertex\")\n",
1685+
"ix = GridIntersect(childgrid)\n",
16861686
"cstrmcells = []\n",
16871687
"for geom in nhddf.geometry.values:\n",
16881688
" rcs = ix.intersects(geom)[\"cellids\"]\n",
@@ -1865,7 +1865,7 @@
18651865
"source": [
18661866
"# create the idomain array\n",
18671867
"idomain = np.zeros(quadgrid.shape, dtype=int)\n",
1868-
"ix = GridIntersect(quadgrid, method=\"vertex\")\n",
1868+
"ix = GridIntersect(quadgrid)\n",
18691869
"nodes = ix.intersect(basindf.geometry.values[0], contains_centroid=True)[\"cellids\"]\n",
18701870
"\n",
18711871
"idomain[:, list(nodes)] = 1\n",
@@ -1881,7 +1881,7 @@
18811881
"source": [
18821882
"# create an array of stream cells\n",
18831883
"qstr = []\n",
1884-
"ix = GridIntersect(quadgrid, method=\"vertex\")\n",
1884+
"ix = GridIntersect(quadgrid)\n",
18851885
"for geom in nhddf.geometry.values:\n",
18861886
" nodes = ix.intersects(geom)[\"cellids\"]\n",
18871887
" qstr.extend(list(nodes))"
@@ -2215,7 +2215,7 @@
22152215
"outputs": [],
22162216
"source": [
22172217
"tristr = []\n",
2218-
"ix = GridIntersect(trigrid, method=\"vertex\")\n",
2218+
"ix = GridIntersect(trigrid)\n",
22192219
"for geom in nhddf.geometry.values:\n",
22202220
" nodes = ix.intersects(geom)[\"cellids\"]\n",
22212221
" tristr.extend(list(nodes))\n",
@@ -2362,7 +2362,7 @@
23622362
"outputs": [],
23632363
"source": [
23642364
"vorst = []\n",
2365-
"ix = GridIntersect(vorgrid, method=\"vertex\")\n",
2365+
"ix = GridIntersect(vorgrid)\n",
23662366
"for geom in nhddf.geometry.values:\n",
23672367
" nodes = ix.intersects(geom)[\"cellids\"]\n",
23682368
" vorst.extend(list(nodes))\n",

notebooks/part1_flopy/solutions/06-Project-quadtree.ipynb

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -411,7 +411,7 @@
411411
"metadata": {},
412412
"outputs": [],
413413
"source": [
414-
"ix = GridIntersect(base_grid, method=\"vertex\", rtree=True)"
414+
"ix = GridIntersect(base_grid, rtree=True)"
415415
]
416416
},
417417
{

notebooks/part1_flopy/solutions/06-Project-structured_completed.ipynb

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -160,12 +160,12 @@
160160
},
161161
{
162162
"cell_type": "code",
163-
"execution_count": 8,
163+
"execution_count": null,
164164
"id": "9eb9a7bd-02f1-4966-b522-4bdbabeb0d40",
165165
"metadata": {},
166166
"outputs": [],
167167
"source": [
168-
"ix = GridIntersect(base_grid, method=\"vertex\", rtree=True)"
168+
"ix = GridIntersect(base_grid, rtree=True)"
169169
]
170170
},
171171
{

notebooks/part1_flopy/solutions/06-Project-voronoi.ipynb

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -305,12 +305,12 @@
305305
},
306306
{
307307
"cell_type": "code",
308-
"execution_count": 14,
308+
"execution_count": null,
309309
"id": "9eb9a7bd-02f1-4966-b522-4bdbabeb0d40",
310310
"metadata": {},
311311
"outputs": [],
312312
"source": [
313-
"ix = GridIntersect(base_grid, method=\"vertex\", rtree=True)"
313+
"ix = GridIntersect(base_grid, rtree=True)"
314314
]
315315
},
316316
{

0 commit comments

Comments
 (0)