upgrade 1D

integration_tests/test_bergermeer.py

@@ -63,8 +63,6 @@ def test_integration(tmp_path, filename):
             NodeType.NODE_1D_BOUNDARIES: 4,
         }
         assert np.count_nonzero(f["nodes"]["is_manhole"][:] == 1) == 42
-        is_manhole = f["nodes"]["is_manhole"][:] == 1
-        assert np.all(f["nodes"]["zoom_category"][is_manhole] != -9999)
         assert np.count_nonzero(f["nodes"]["content_pk"][:] > 0) == 1360
         assert (
             np.count_nonzero(np.isfinite(f["nodes"]["initial_waterlevel"][:])) == 2531

setup.py

@@ -53,7 +53,7 @@ def get_version():
 
 install_requires = [
     "numpy>=1.15,<3.0",
-    "threedi-schema==0.227.*",
+    "threedi-schema @ git+https://github.com/nens/threedi-schema.git@margriet_89_schema_300_1D",
     "shapely>=2",
     "pyproj>=3",
     "condenser[geo]>=0.1.1",

threedigrid_builder/application.py

@@ -22,6 +22,7 @@
     GridAdminOut,
     SQLite,
 )
+from threedigrid_builder.interface.db import map_cross_section_definition
 
 __all__ = ["make_grid", "make_gridadmin"]
 
@@ -87,7 +88,7 @@ def _make_gridadmin(
                 grid.meta.has_groundwater_flow, node_id_counter, line_id_counter
             )
 
-        grid.set_obstacles(db.get_obstacles())
+        grid.set_obstacles_2d(db.get_obstacles())
         grid.set_boundary_conditions_2d(
             db.get_boundary_conditions_2d(),
             quadtree,
@@ -101,6 +102,20 @@ def _make_gridadmin(
     connection_nodes = db.get_connection_nodes()
     if grid_settings.use_1d_flow and len(connection_nodes) > 0:
         progress_callback(0.8, "Constructing 1D computational grid...")
+        locations = db.get_cross_section_locations()
+        pipes = db.get_pipes()
+        weirs = db.get_weirs()
+        culverts = db.get_culverts()
+        orifices = db.get_orifices()
+        cross_section_definitions = db.get_cross_section_definitions()
+        (
+            cross_section_definitions_unique,
+            mapping,
+        ) = cross_section_definitions.get_unique()
+        map_cross_section_definition(
+            [locations, orifices, pipes, culverts, weirs], mapping
+        )
+
         cn_grid = Grid.from_connection_nodes(
             connection_nodes=connection_nodes,
             node_id_counter=node_id_counter,
@@ -109,6 +124,7 @@ def _make_gridadmin(
         grid += cn_grid
 
         channels = db.get_channels()
+
         potential_breaches = db.get_potential_breaches()
         breach_points = potential_breaches.project_on_channels(channels).merge()
 
@@ -125,13 +141,11 @@ def _make_gridadmin(
             connection_node_offset=connection_node_first_id,
         )
 
-        locations = db.get_cross_section_locations()
         locations.apply_to_lines(channel_grid.lines, channels)
         windshieldings = db.get_windshieldings()
         windshieldings.apply_to_lines(channel_grid.lines)
         grid += channel_grid
 
-        pipes = db.get_pipes()
         grid += Grid.from_linear_objects(
             connection_nodes=connection_nodes,
             objects=pipes,
@@ -145,7 +159,6 @@ def _make_gridadmin(
             connection_node_offset=connection_node_first_id,
         )
 
-        culverts = db.get_culverts()
         grid += Grid.from_linear_objects(
             connection_nodes=connection_nodes,
             objects=culverts,
@@ -159,15 +172,14 @@ def _make_gridadmin(
             connection_node_offset=connection_node_first_id,
         )
 
-        weirs = db.get_weirs()
-        orifices = db.get_orifices()
         grid += grid.from_structures(
             connection_nodes=connection_nodes,
             weirs=weirs,
             orifices=orifices,
             line_id_counter=line_id_counter,
             connection_node_offset=connection_node_first_id,
         )
+        grid.set_cross_sections(cross_section_definitions_unique)
 
         grid.set_calculation_types()
         grid.set_bottom_levels()
@@ -179,7 +191,6 @@ def _make_gridadmin(
             culverts=culverts,
         )
         grid.set_boundary_conditions_1d(db.get_boundary_conditions_1d())
-        grid.set_cross_sections(db.get_cross_section_definitions())
         grid.set_pumps(db.get_pumps())
 
     if grid.nodes.has_1d and grid.nodes.has_2d:
@@ -195,8 +206,8 @@ def _make_gridadmin(
             culverts=culverts,
             potential_breaches=potential_breaches,
             line_id_counter=line_id_counter,
+            node_open_water_detection=grid_settings.node_open_water_detection,
         )
-
         if grid.meta.has_groundwater:
             channels.apply_has_groundwater_exchange(grid.nodes, grid.lines)
             pipes.apply_has_groundwater_exchange(grid.nodes, grid.lines)

threedigrid_builder/base/nodes.py

@@ -48,7 +48,7 @@ class Node:
     breach_ids: Tuple[int, int]  # referring to 1 or 2 ids of potential breaches
     has_dem_averaged: int  # Boolean attribute to tell if dem is averaged for node.
     boundary_type: BoundaryType
-    manhole_id: int  # referring to the id of a manhole
+    is_manhole: bool  # node represents a manhole
     drain_level: float  # Drain level entered for manholes
     initial_waterlevel: float
     zoom_category: int

threedigrid_builder/base/settings.py

@@ -38,6 +38,7 @@ class GridSettings:
     grid_space: float
     dist_calc_points: float
     kmax: int
+    node_open_water_detection: int
     embedded_cutoff_threshold: float = 0.05
     max_angle_1d_advection: float = 0.4 * np.pi
 

threedigrid_builder/grid/connection_nodes.py

@@ -24,14 +24,12 @@ class ConnectionNode:
     the_geom: shapely.Geometry
     code: str
     storage_area: float
-    manhole_id: int
+    is_manhole: bool
     calculation_type: CalculationType
     manhole_indicator: int
     bottom_level: float
     drain_level: float
     surface_level: float
-    shape: str  # enum with classes "00", "01", "02"
-    width: float
     initial_waterlevel: float
     display_name: str
     zoom_category: int
@@ -59,7 +57,7 @@ def get_nodes(self, node_id_counter):
             - node_type: NODE_1D_STORAGE or NODE_1D_NO_STORAGE depending on storage_area
             - calculation_type: from calculation_type (which comes from manhole)
             - dmax: from bottom_level (which comes from manhole)
-            - manhole_id: id of associated manhole.
+            - is_manhole: node is a manhole
             - drain_level: drain_level of associated manhole.
             - storage_area: area of connection_node.
         """
@@ -77,7 +75,7 @@ def get_nodes(self, node_id_counter):
             node_type=node_type,
             calculation_type=self.calculation_type,
             dmax=self.bottom_level,
-            manhole_id=self.manhole_id,
+            is_manhole=~np.isnan(self.bottom_level),
             drain_level=self.drain_level,
             storage_area=self.storage_area,
             display_name=self.display_name,
@@ -93,6 +91,14 @@ def is_closed(self, content_pk):
         """
         return self.storage_area[self.id_to_index(content_pk)] >= 0
 
+    def is_channel(self, content_pk, channels):
+        """Whether object is connected to a channel"""
+        has_channel = np.logical_or(
+            np.isin(self.id, channels.connection_node_start_id),
+            np.isin(self.id, channels.connection_node_end_id),
+        )
+        return has_channel[content_pk]
+
     def get_1d2d_exchange_levels(self, content_pk, channels, locations, **kwargs):
         """Compute the exchange level (dpumax) for 1D-2D flowlines.
 
@@ -109,17 +115,16 @@ def get_1d2d_exchange_levels(self, content_pk, channels, locations, **kwargs):
         """
         # get the corresponding connection_node ids and indexes
         connection_node_idx = self.id_to_index(content_pk)
-        is_manhole = self.manhole_id[connection_node_idx] != -9999
+        is_manhole = ~np.isnan(self.bottom_level[connection_node_idx])
         is_manhole_idx = connection_node_idx[is_manhole]
-
         # Check if manhole has drain_level below bottom_level
         has_lower_drn_lvl = (
             self.drain_level[is_manhole_idx] < self.bottom_level[is_manhole_idx]
         )
         if np.any(has_lower_drn_lvl):
-            ids = self.manhole_id[is_manhole_idx[has_lower_drn_lvl]]
+            ids = self.id[is_manhole_idx[has_lower_drn_lvl]]
             logger.warning(
-                f"Manholes {sorted(ids.tolist())} have a "
+                f"ConnectionNode {sorted(ids.tolist())} have a "
                 f"bottom_level that is above drain_level."
             )
 
@@ -143,7 +148,6 @@ def get_1d2d_exchange_levels(self, content_pk, channels, locations, **kwargs):
             _put_if_less(dpumax, cn_idx_with_channel, drain_level)
         # filter out connection nodes that were not in node_idx (non-connected ones)
         dpumax = dpumax[connection_node_idx]
-
         # for manholes: put in the drain level
         dpumax[is_manhole] = self.drain_level[is_manhole_idx]
         return dpumax
@@ -270,12 +274,13 @@ def set_bottom_levels(nodes: Nodes, lines: Lines):
     dmax = np.fmin(nodes.dmax[node_idx], dmax_per_node)
 
     # Check if the new node dmax is below the original manhole dmax
-    is_manhole = nodes.manhole_id[node_idx] != -9999
+    is_manhole = nodes.is_manhole[node_idx]
+
     has_lower_dmax = dmax[is_manhole] < nodes.dmax[node_idx[is_manhole]]
     if np.any(has_lower_dmax):
-        ids = nodes.manhole_id[node_idx[is_manhole][has_lower_dmax]]
+        ids = nodes.id[node_idx[is_manhole][has_lower_dmax]]
         logger.warning(
-            f"Manholes {sorted(ids.tolist())} have a "
+            f"Nodes {sorted(ids.tolist())} have a "
             f"bottom_level that is above one ore more of the following connected "
             f"objects: channel reference level, pipe/culvert invert level, "
             f"weir/orifice crest level."