from cellids to cellid

Author: OnnoEbbens

nlmod/dims/grid.py

@@ -159,7 +159,7 @@ def get_icell2d_from_xy(x, y, ds, gi=None, rotated=True):
         gi = flopy.utils.GridIntersect(
             modelgrid_from_ds(ds, rotated=rotated)
         )
-    cellids = gi.intersects(Point(x, y))["cellids"]
+    cellids = gi.intersects(Point(x, y), dataframe=True)["cellid"]
     if len(cellids) < 1:
         raise (ValueError(f"Point ({x}, {y}) is outside of the model grid"))
     icell2d = cellids[0]
@@ -227,7 +227,7 @@ def get_row_col_from_xy(x, y, ds, rotated=True, gi=None):
     msg = "get_row_col_from_xy can only be applied to a structured grid"
     assert ds.gridtype == "structured", msg
     if gi is not None:
-        cellids = gi.intersects(Point(x, y))["cellids"]
+        cellids = gi.intersects(Point(x, y), dataframe=True)[["row", "col"]].values
         if len(cellids) < 1:
             raise (ValueError(f"Point ({x}, {y}) is outside of the model grid"))
         row, col = cellids[0]
@@ -1907,18 +1907,17 @@ def gdf_to_count_da(gdf, ds, ix=None, buffer=0.0, **kwargs):
 
     for geom in geoms:
         if buffer > 0.0:
-            cids = ix.intersects(geom.buffer(buffer), **kwargs)["cellids"]
+            df = ix.intersects(geom.buffer(buffer), dataframe=True, **kwargs)
         else:
-            cids = ix.intersects(geom, **kwargs)["cellids"]
+            df = ix.intersects(geom, dataframe=True, **kwargs)
 
-        if len(cids) == 0:
+        if len(df) == 0:
             continue
 
         if ds.gridtype == "structured":
-            ixs, iys = zip(*cids)
-            da.values[ixs, iys] += 1
+            da.values[df['row'], df['col']] += 1
         elif ds.gridtype == "vertex":
-            da[cids.astype(int)] += 1
+            da[df['cellid']] += 1
 
     return da
 
@@ -2133,7 +2132,7 @@ def gdf_area_to_da(
         df = ix.intersect(gdf.at[index, geometry], geo_dataframe=True, **kwargs)
         if structured:
             for i in range(df.shape[0]):
-                data[df["cellids"][i] + (irow,)] += df["areas"][i]
+                data[df.iloc[i]["cellid"] + (irow,)] += df["areas"][i]
         else:
             data[list(df["cellids"]), irow] = df["areas"]
 

nlmod/gwf/surface_water.py

@@ -1228,17 +1228,20 @@ def get_seaonal_timeseries(
 
 def rivdata_from_xylist(gwf, xylist, layer, stage, cond, rbot, aux=None):
     gi = flopy.utils.GridIntersect(gwf.modelgrid)
-    cellids = gi.intersect(xylist, shapetype="linestring", geo_dataframe=True)["cellids"]
+    df = gi.intersect(xylist, shapetype="linestring", geo_dataframe=True)
     riv_data = []
-    for cid in cellids:
-        if isinstance(cid, (list, tuple)) and len(cid) == 2:
-            idata = [(layer, cid[0], cid[1]), stage, cond, rbot]
+    
+    if 'row' in df.columns: # structured grid
+        for row, col in zip(df['row'], df['col']):
+            idata = [(layer, row, col), stage, cond, rbot]
             if aux is not None:
                 idata.append(aux)
             riv_data.append(idata)
-        else:
+    else: # unstructured grid
+        for cid in df['cellid']:
             idata = [(layer, cid), stage, cond, rbot]
             if aux is not None:
                 idata.append(aux)
             riv_data.append(idata)
+
     return riv_data