Skip to content

Commit

Permalink
Merge commit '8e9625a20f8dc1b3f2ce1af162d9c51f81b2802f' into cut_lines
Browse files Browse the repository at this point in the history
  • Loading branch information
benvanbasten-ns committed Dec 13, 2024
2 parents 200a9ce + 8e9625a commit 8b9a514
Show file tree
Hide file tree
Showing 5 changed files with 34 additions and 21 deletions.
22 changes: 3 additions & 19 deletions .github/workflows/test.yml
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down
12 changes: 12 additions & 0 deletions CHANGES.rst
Original file line number Diff line number Diff line change
Expand Up @@ -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)
-------------------

Expand Down
2 changes: 1 addition & 1 deletion threedigrid_builder/__init__.py
Original file line number Diff line number Diff line change
Expand Up @@ -2,5 +2,5 @@
from .exceptions import * # NOQA

# fmt: off
__version__ = '1.21.0'
__version__ = '1.21.2.dev0'
# fmt: on
7 changes: 6 additions & 1 deletion threedigrid_builder/grid/boundary_conditions.py
Original file line number Diff line number Diff line change
Expand Up @@ -18,7 +18,11 @@


GROUNDWATER_BOUNDARY_TYPES = frozenset(
{BoundaryType.GROUNDWATERLEVEL, BoundaryType.GROUNDWATERDISCHARGE}
{
BoundaryType.GROUNDWATERLEVEL,
BoundaryType.GROUNDWATERDISCHARGE,
BoundaryType.GROUNDWATER_TOTAL_DISCHARGE_2D,
}
)


Expand Down Expand Up @@ -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(
Expand Down
12 changes: 12 additions & 0 deletions threedigrid_builder/tests/test_boundary_conditions.py
Original file line number Diff line number Diff line change
Expand Up @@ -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,
Expand All @@ -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):
Expand Down

0 comments on commit 8b9a514

Please sign in to comment.