diff --git a/.github/workflows/test.yml b/.github/workflows/test.yml index b7464b2d..d84e1b5b 100644 --- a/.github/workflows/test.yml +++ b/.github/workflows/test.yml @@ -15,28 +15,12 @@ jobs: fail-fast: false matrix: include: - # 2019 - - python: 3.8 - os: ubuntu-20.04 - setuptools: setuptools==63.* - numpy: numpy==1.17.* - display_name: "2019" - pins: "h5py==2.10.* sqlalchemy==1.4.10 shapely==2.0.* pyproj==3.0.*" - extras: "[test,gridadmin]" - # 2020 - - python: 3.9 - os: ubuntu-20.04 - setuptools: setuptools==63.* - numpy: numpy==1.19.* - display_name: "2020" - pins: "h5py==3.1.* sqlalchemy==1.4.20 shapely==2.0.* pyproj==3.0.*" - extras: "[test,gridadmin]" - # 2021 + # 2022 - python: 3.9 - os: ubuntu-20.04 + os: ubuntu-22.04 setuptools: setuptools==63.* numpy: numpy==1.21.* - display_name: "2021" + display_name: "2022" pins: "h5py==3.3.* sqlalchemy==1.4.30 shapely==2.0.* pyproj==3.2.*" extras: "[test,gridadmin]" # 2022 diff --git a/CHANGES.rst b/CHANGES.rst index 1b59d9d8..ccb201c9 100644 --- a/CHANGES.rst +++ b/CHANGES.rst @@ -2,6 +2,18 @@ Changelog of threedigrid-builder ================================ +1.21.2 (unreleased) +------------------- + +- Nothing changed yet. + + +1.21.1 (2024-12-12) +------------------- + +- Fix total discharge boundary type for groundwater not being properly defined. + + 1.21.0 (2024-11-25) ------------------- diff --git a/threedigrid_builder/__init__.py b/threedigrid_builder/__init__.py index f721b808..f85c6450 100644 --- a/threedigrid_builder/__init__.py +++ b/threedigrid_builder/__init__.py @@ -2,5 +2,5 @@ from .exceptions import * # NOQA # fmt: off -__version__ = '1.21.0' +__version__ = '1.21.2.dev0' # fmt: on diff --git a/threedigrid_builder/grid/boundary_conditions.py b/threedigrid_builder/grid/boundary_conditions.py index 633fec0d..7113af51 100644 --- a/threedigrid_builder/grid/boundary_conditions.py +++ b/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( diff --git a/threedigrid_builder/tests/test_boundary_conditions.py b/threedigrid_builder/tests/test_boundary_conditions.py index f7a1683f..d7b8a52c 100644 --- a/threedigrid_builder/tests/test_boundary_conditions.py +++ b/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):