Merge branch 'master' into margriet_schema_300_leftovers

Author: margrietpalm

.github/workflows/release.yml

@@ -40,11 +40,11 @@ jobs:
     strategy:
       fail-fast: false
       matrix:
-        os: [ubuntu-20.04, windows-2019, macos-12]
+        os: [ubuntu-20.04, windows-2019, macos-13]
 
     steps:
       - name: Checkout source
-        uses: actions/checkout@v3
+        uses: actions/checkout@v4
 
       - uses: msys2/setup-msys2@v2
         if: matrix.os == 'windows-2019'

CHANGES.rst

@@ -2,12 +2,30 @@ Changelog of threedigrid-builder
 ================================
 
 
-1.21.1 (unreleased)
+1.21.4 (unreleased)
 -------------------
 
 - Remove internal changes made for previous schema upgrades and limit changes to db interface
 
 
+1.21.3 (2024-12-17)
+-------------------
+
+- Fix creating cross sections with schema 228
+
+
+1.21.2 (2024-12-17)
+-------------------
+
+- Set MacOs release version to 13 to fix build
+
+
+1.21.1 (2024-12-12)
+-------------------
+
+- Fix total discharge boundary type for groundwater not being properly defined.
+
+
 1.21.0 (2024-11-25)
 -------------------
 

pyproject.toml

@@ -5,7 +5,6 @@ requires = [
     "wheel",
     "cmake>=3.18",
     "scikit-build",
-    "numpy==1.17.3; python_version=='3.8'",
     "numpy==1.19.3; python_version=='3.9'",
     "numpy==1.21.3; python_version=='3.10'",
     "numpy==1.24.2; python_version=='3.11'",

setup.py

@@ -85,7 +85,7 @@ def get_version():
         "gpkg": ["geopandas"],
         "cli": ["typer"],
     },
-    python_requires=">=3.8",
+    python_requires=">=3.9",
     include_package_data=True,
     classifiers=[
         "Programming Language :: Python :: 3",

threedigrid_builder/__init__.py

@@ -2,5 +2,5 @@
 from .exceptions import *  # NOQA
 
 # fmt: off
-__version__ = '1.21.1.dev0'
+__version__ = '1.21.4.dev0'
 # fmt: on

threedigrid_builder/grid/boundary_conditions.py

@@ -18,7 +18,11 @@
 
 
 GROUNDWATER_BOUNDARY_TYPES = frozenset(
-    {BoundaryType.GROUNDWATERLEVEL, BoundaryType.GROUNDWATERDISCHARGE}
+    {
+        BoundaryType.GROUNDWATERLEVEL,
+        BoundaryType.GROUNDWATERDISCHARGE,
+        BoundaryType.GROUNDWATER_TOTAL_DISCHARGE_2D,
+    }
 )
 
 
@@ -270,6 +274,7 @@ def boundary_type_is_groundwater(type: BoundaryType) -> bool:
         return type in {
             BoundaryType.GROUNDWATERLEVEL,
             BoundaryType.GROUNDWATERDISCHARGE,
+            BoundaryType.GROUNDWATER_TOTAL_DISCHARGE_2D,
         }
 
     def check_edge_coord(

threedigrid_builder/grid/cross_section_definitions.py

@@ -65,7 +65,10 @@ def get_unique(self):
                 [getattr(self, attr)[mask] for attr in cross_section_attributes[shape]]
             )
             # Find unique rows and add these to the new_csd_dict with new id's
-            u_arr, u_idx = np.unique(attr_arr, return_index=True)
+            if len(cross_section_attributes[shape]) > 1:
+                u_arr, u_idx = np.unique(attr_arr, axis=0, return_index=True)
+            else:
+                u_arr, u_idx = np.unique(attr_arr, return_index=True)
             new_id = np.arange(len(u_idx)) + len(new_csd_dict["id"])
             for key in new_csd_dict:
                 if key == "id":

threedigrid_builder/tests/test_boundary_conditions.py

@@ -366,6 +366,12 @@ def grid2d_gw():
             LineType.LINE_2D_BOUNDARY_EAST,
             (1, 9),
         ),
+        (
+            BoundaryType.TOTAL_DISCHARGE_2D,
+            NodeType.NODE_2D_BOUNDARIES,
+            LineType.LINE_2D_BOUNDARY_EAST,
+            (1, 9),
+        ),
         (
             BoundaryType.GROUNDWATERLEVEL,
             NodeType.NODE_2D_GROUNDWATER_BOUNDARIES,
@@ -378,6 +384,12 @@ def grid2d_gw():
             LineType.LINE_2D_GROUNDWATER_BOUNDARY_EAST,
             (3, 9),
         ),
+        (
+            BoundaryType.GROUNDWATER_TOTAL_DISCHARGE_2D,
+            NodeType.NODE_2D_GROUNDWATER_BOUNDARIES,
+            LineType.LINE_2D_GROUNDWATER_BOUNDARY_EAST,
+            (3, 9),
+        ),
     ],
 )
 def test_2d_boundary_condition_types(grid2d_gw, boundary_type, node_type, kcu, line):

threedigrid_builder/tests/test_cross_section_definitions.py

@@ -515,27 +515,23 @@ def test_tabulate_yz_err(width, height, match):
 class TestCrossSectionDefinitionGetUnique:
     def test_for_closed_rectangle(self):
         csd_in = CrossSectionDefinitions(
-            id=[100, 200],
+            id=[100, 200, 300, 400],
             shape=[
                 constants.CrossSectionShape.CLOSED_RECTANGLE.value,
                 constants.CrossSectionShape.CLOSED_RECTANGLE.value,
+                constants.CrossSectionShape.CLOSED_RECTANGLE.value,
+                constants.CrossSectionShape.CLOSED_RECTANGLE.value,
             ],
-            width=[1, 1],
-            height=[1, 1],
-            cross_section_table=["foo", "bar"],
-            origin_table=["pipe", "weir"],
-            origin_id=[10, 20],
+            width=[1, 3, 1, 3],
+            height=[1, 2, 1, 2],
+            cross_section_table=["foo", "bar", "foo", "bar"],
+            origin_table=["pipe", "weir", "pipe", "pipe"],
+            origin_id=[10, 20, 30, 40],
         )
         unique_definition, _ = csd_in.get_unique()
-        assert unique_definition.id == [
-            0,
-        ]
-        assert unique_definition.width == [
-            1,
-        ]
-        assert unique_definition.height == [
-            1,
-        ]
+        np.testing.assert_array_equal(unique_definition.id, [0, 1])
+        np.testing.assert_array_equal(unique_definition.width, [1, 3])
+        np.testing.assert_array_equal(unique_definition.height, [1, 2])
 
     @pytest.mark.parametrize(
         "shape",
@@ -574,19 +570,19 @@ def test_for_tabulated_shape(self, shape):
     )
     def test_for_other_shapes(self, shape):
         csd_in = CrossSectionDefinitions(
-            id=[100, 200],
-            shape=[shape, shape],
-            width=[1, 1],
-            height=[10, 21],
-            cross_section_table=["foo", "foo"],
-            origin_table=["pipe", "weir"],
-            origin_id=[10, 20],
+            id=[100, 200, 300],
+            shape=[shape, shape, shape],
+            width=[1, 1, 100],
+            height=[10, 21, 100],
+            cross_section_table=["foo", "foo", "bar"],
+            origin_table=["pipe", "weir", "weir"],
+            origin_id=[10, 20, 30],
         )
         unique_definition, _ = csd_in.get_unique()
-        assert unique_definition.id == [
-            0,
-        ]
-        assert unique_definition.cross_section_table == ["foo"]
+        np.testing.assert_array_equal(unique_definition.id, [0, 1])
+        np.testing.assert_array_equal(
+            sorted(unique_definition.cross_section_table), sorted(["foo", "bar"])
+        )
 
     def test_mapping(self):
         csd_in = CrossSectionDefinitions(