fixed 1d2d reading

hydrolib/core/dflowfm/net/models.py

@@ -780,7 +780,8 @@ class Mesh1d(BaseModel):
     )
 
     def is_empty(self) -> bool:
-        return self.mesh1d_node_x.size == 0
+        # return self.mesh1d_node_x.size == 0
+        return self.meshkernel.mesh1d_get().node_x.size == 0
 
     def _get_mesh1d(self) -> mk.Mesh1d:
         """Return mesh1d from meshkernel. Note that the meshkernel.Mesh1d instance

hydrolib/core/dflowfm/net/reader.py

@@ -64,6 +64,7 @@ def read_mesh1d_network1d(self, mesh1d: Mesh1d) -> None:
 
         # Process network
         mesh1d._process_network1d()
+        mesh1d._set_mesh1d() # TODO: we still require this here to sync new attrs with meshkernel instance
 
         ds.close()
 
@@ -86,7 +87,7 @@ def read_mesh2d(self, mesh2d: Mesh2d) -> None:
             setattr(mesh2d, meshkey, self._read_nc_attribute(ds[nckey]))
         # TODO: replace with xugrid reader
 
-        mesh2d._set_mesh2d()  # TODO: we still require this here to sync new attrs with meshkernel instance
+        mesh2d._set_mesh2d() # TODO: we still require this here to sync new attrs with meshkernel instance
 
         ds.close()
 

pyproject.toml

@@ -88,6 +88,7 @@ multi_line_output = 3
 line_length = 88
 
 [tool.pytest.ini_options]
+addopts = "-m \"not plots\""
 markers = [
     "plots",
     "docker"

tests/dflowfm/test_net.py

@@ -77,7 +77,7 @@ def test_create_1d_by_branch():
     network.to_file(test_output_dir / "test_net.nc")
 
 
-@pytest.mark.plots
+# @pytest.mark.plots
 def test_create_1d_branch_structure_offset():
 
     line = np.array([[0, 0], [100, 0]])
@@ -120,7 +120,7 @@ def get_circle_gl(r, detail=100):
     return polygon
 
 
-@pytest.mark.plots
+# @pytest.mark.plots
 def test_create_1d_2d_1d2d():
 
     # Define line (spiral)
@@ -261,8 +261,20 @@ def test_read_net_nc(filepath):
 
     # Create network model
     network = NetworkModel(filepath=filepath)
+    # network = networkmodel.network
     assert not network._mesh1d.is_empty()
     assert network._mesh2d.is_empty()
+
+    # test whether meshkernel instance and hydrolib mesh2d/mesh1d instance are consistent
+    nnodes_internal = network._mesh2d.mesh2d_node_x.size
+    nnodes_mk = network._mesh2d.get_mesh2d().node_x.size
+    nnodes_mk2 = network._mesh2d.meshkernel.mesh2d_get().node_x.size
+    assert nnodes_internal == nnodes_mk == nnodes_mk2
+    nnodes_internal = network._mesh1d.mesh1d_node_x.size
+    nnodes_mk = network._mesh1d._get_mesh1d().node_x.size
+    nnodes_mk2 = network._mesh1d.meshkernel.mesh1d_get().node_x.size
+    assert nnodes_internal == nnodes_mk == nnodes_mk2
+
 
 
 @pytest.mark.parametrize("filepath", cases)
@@ -442,7 +454,8 @@ def test_read_net_nc_2d_without_faces(self):
         # test whether meshkernel instance and hydrolib mesh2d instance are consistent
         nnodes_internal = network._mesh2d.mesh2d_node_x.size
         nnodes_mk = network._mesh2d.get_mesh2d().node_x.size
-        assert nnodes_internal == nnodes_mk
+        nnodes_mk2 = network._mesh2d.meshkernel.mesh2d_get().node_x.size
+        assert nnodes_internal == nnodes_mk == nnodes_mk2
 
 
 class TestNCExplorer:
@@ -641,6 +654,13 @@ def test_add_1d2d_links():
         np.array([[3, 70], [4, 62], [5, 54], [6, 45], [7, 37], [8, 29]]),
     )
 
+    # test whether meshkernel instance and hydrolib mesh2d instance are consistent
+    nnodes_internal = network._mesh1d.mesh1d_node_x.size
+    nnodes_mk = network._mesh1d._get_mesh1d().node_x.size
+    nnodes_mk2 = network._mesh1d.meshkernel.mesh1d_get().node_x.size
+    assert nnodes_internal == nnodes_mk == nnodes_mk2
+
+
 
 def test_write_netcdf_with_custom_fillvalue_correctly_writes_fillvalue():
     nc_output_file = Path(test_output_dir / "test.nc")