Merge branch 'master' of https://github.com/rustychris/stompy

Author: gei-rusty

stompy/grid/multi_ugrid.py

@@ -394,6 +394,7 @@ def __init__(self,paths,cleanup_dfm='auto',xr_kwargs={},grid=None,
                     if f in g.cells.dtype.names:
                         log.warning("Dropping extra cell field %s to avoid max_sides issues"%f)
                         g.delete_cell_field(f)
+                g.edge_to_cells(recalc=True) # 20250813: failing to merge, seems to be edge ordering. 
         if is_dfm:
             # kludge DFM output (ver. 2021.03) has nNetElem and nFlowElem, which appear to
             # both be for the cell dimension

stompy/grid/unstructured_grid.py

@@ -865,12 +865,14 @@ def process_as_index(varname):
         if 'face_edge_connectivity' in mesh.attrs:
             v=mesh.attrs['face_edge_connectivity']
             if v in nc:
+                start_index=nc[v].attrs.get('start_index',0)
                 # Some files advertise variable they don't have. Trust no one.
-                ug.cells['edges'] = nc[v].values
+                ug.cells['edges'] = nc[v].values - start_index
         if 'edge_face_connectivity' in mesh.attrs:
             v=mesh.attrs['edge_face_connectivity']
             if v in nc:
-                cells = nc[v].values
+                start_index=nc[v].attrs.get('start_index',0)
+                cells = nc[v].values - start_index
                 ug.edges['cells'] = np.where( np.isfinite(cells), cells, -1)
 
         if dialect=='fishptm':

stompy/model/delft/dflow_model.py

@@ -53,6 +53,10 @@ class DFlowModel(hm.HydroModel,hm.MpiModel):
     dwaq=False
     # Specify location of proc_def.def file:
     waq_proc_def=None
+
+    # Explicitly write points in dry areas to make sure DFM doesn't turn islands into
+    # cells. Hasn't generally been needed.
+    automatic_dry_points=False
 
     # flow and source/sink BCs will get the adjacent nodes dredged
     # down to this depth in order to ensure the impose flow doesn't
@@ -955,9 +959,23 @@ def write_config(self):
         # Assumes update_config() already called
         self.write_structures() # updates mdu
         self.write_monitors()
+        if self.automatic_dry_points:
+            self.write_dry_points()
         log.info("Writing MDU to %s"%self.mdu.filename)
         self.mdu.write()
 
+    def write_dry_points(self):
+        self.mdu['geometry','DryPointsFile'] = 'dry_points.xyz'
+        dest=os.path.join(self.run_dir, self.mdu['geometry','DryPointsFile'])
+
+        lines=self.grid.boundary_linestrings()
+        with open(dest,'wt') as fp:
+            for line in lines:
+                # outer boundary has negative area, skip it.
+                if utils.signed_area(line)<0: continue
+                pnt=geometry.Polygon(line).representative_point().coords[0]
+                fp.write(f"{pnt[0]:.6f},{pnt[1]:0.6f},0\n")
+        
     def write_monitors(self):
         # start with empty
         if not self.mdu['output','ObsFile']: