From 2cd5a118344f1716c6d2488c9d533cceff8e56d5 Mon Sep 17 00:00:00 2001 From: Margriet Palm Date: Mon, 25 Nov 2024 13:17:32 +0100 Subject: [PATCH 1/6] Back to development: 1.21.1 --- CHANGES.rst | 6 ++++++ threedigrid_builder/__init__.py | 2 +- 2 files changed, 7 insertions(+), 1 deletion(-) diff --git a/CHANGES.rst b/CHANGES.rst index 1b59d9d8..26cd8e04 100644 --- a/CHANGES.rst +++ b/CHANGES.rst @@ -2,6 +2,12 @@ Changelog of threedigrid-builder ================================ +1.21.1 (unreleased) +------------------- + +- Nothing changed yet. + + 1.21.0 (2024-11-25) ------------------- diff --git a/threedigrid_builder/__init__.py b/threedigrid_builder/__init__.py index f721b808..7c37ee72 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.1.dev0' # fmt: on From 197d78cae0fb6fc51eeb613bfb1a219c7532e20b Mon Sep 17 00:00:00 2001 From: Golnesa Date: Mon, 9 Dec 2024 10:05:21 +0100 Subject: [PATCH 2/6] fix gw tot discharge --- threedigrid_builder/grid/boundary_conditions.py | 7 ++++++- 1 file changed, 6 insertions(+), 1 deletion(-) 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( From b0bc530f75b9e461c8ca0bfea312492e27a90c11 Mon Sep 17 00:00:00 2001 From: Margriet Palm Date: Mon, 9 Dec 2024 13:41:28 +0100 Subject: [PATCH 3/6] Remove tests for python 3.8 and ubuntu 20.04 --- .github/workflows/test.yml | 22 +++------------------- 1 file changed, 3 insertions(+), 19 deletions(-) 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 From 4100409b800a27fbd9b4e1ed32f930bef1482543 Mon Sep 17 00:00:00 2001 From: Golnesa Date: Mon, 9 Dec 2024 15:57:14 +0100 Subject: [PATCH 4/6] tests + changelog --- CHANGES.rst | 2 +- .../tests/test_boundary_conditions.py | 12 ++++++++++++ 2 files changed, 13 insertions(+), 1 deletion(-) diff --git a/CHANGES.rst b/CHANGES.rst index 26cd8e04..f2c9affd 100644 --- a/CHANGES.rst +++ b/CHANGES.rst @@ -5,7 +5,7 @@ Changelog of threedigrid-builder 1.21.1 (unreleased) ------------------- -- Nothing changed yet. +- Fix total discharge boundary type for groundwater not being properly defined. 1.21.0 (2024-11-25) 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): From 8bf0084ff897950657f0fe7b75ae4c6f9abf645c Mon Sep 17 00:00:00 2001 From: daanvaningen Date: Thu, 12 Dec 2024 09:24:12 +0100 Subject: [PATCH 5/6] Preparing release 1.21.1 --- CHANGES.rst | 2 +- threedigrid_builder/__init__.py | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/CHANGES.rst b/CHANGES.rst index f2c9affd..b5542162 100644 --- a/CHANGES.rst +++ b/CHANGES.rst @@ -2,7 +2,7 @@ Changelog of threedigrid-builder ================================ -1.21.1 (unreleased) +1.21.1 (2024-12-12) ------------------- - Fix total discharge boundary type for groundwater not being properly defined. diff --git a/threedigrid_builder/__init__.py b/threedigrid_builder/__init__.py index 7c37ee72..31142792 100644 --- a/threedigrid_builder/__init__.py +++ b/threedigrid_builder/__init__.py @@ -2,5 +2,5 @@ from .exceptions import * # NOQA # fmt: off -__version__ = '1.21.1.dev0' +__version__ = '1.21.1' # fmt: on From 8e9625a20f8dc1b3f2ce1af162d9c51f81b2802f Mon Sep 17 00:00:00 2001 From: daanvaningen Date: Thu, 12 Dec 2024 09:24:28 +0100 Subject: [PATCH 6/6] Back to development: 1.21.2 --- CHANGES.rst | 6 ++++++ threedigrid_builder/__init__.py | 2 +- 2 files changed, 7 insertions(+), 1 deletion(-) diff --git a/CHANGES.rst b/CHANGES.rst index b5542162..ccb201c9 100644 --- a/CHANGES.rst +++ b/CHANGES.rst @@ -2,6 +2,12 @@ Changelog of threedigrid-builder ================================ +1.21.2 (unreleased) +------------------- + +- Nothing changed yet. + + 1.21.1 (2024-12-12) ------------------- diff --git a/threedigrid_builder/__init__.py b/threedigrid_builder/__init__.py index 31142792..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.1' +__version__ = '1.21.2.dev0' # fmt: on