From 9283fbcacd8c82cb0c282ad784497c84a81783a3 Mon Sep 17 00:00:00 2001 From: wpbonelli Date: Wed, 11 Nov 2026 07:03:31 -0800 Subject: [PATCH] regenerate against devtools' boundname fix Bump modflow-devtools to 8b11d69, which includes MODFLOW-ORG/modflow-devtools#410, and regenerate from the same MF6 DFNs (65278c9). CHDG, DRNG, EVTA, GHBG, RCHA, RIVG and WELG have no boundnames, so their observation ids are cellids only. Reading an OBS id now rejects a boundname where the observation type takes none, instead of guessing. Co-Authored-By: Claude Opus 5.5 --- flopy4/mf6/gwf/chdg.py | 2 +- flopy4/mf6/gwf/drng.py | 4 +-- flopy4/mf6/gwf/evta.py | 2 +- flopy4/mf6/gwf/ghbg.py | 4 +-- flopy4/mf6/gwf/rcha.py | 2 +- flopy4/mf6/gwf/rivg.py | 4 +-- flopy4/mf6/gwf/welg.py | 6 ++-- flopy4/mf6/item.py | 16 +++++++++-- pixi.lock | 56 +++++++++++++++++++++----------------- test/mf6/test_mf6_codec.py | 19 +++++++++++++ 10 files changed, 76 insertions(+), 39 deletions(-) diff --git a/flopy4/mf6/gwf/chdg.py b/flopy4/mf6/gwf/chdg.py index 10c43d9c..b00abaea 100644 --- a/flopy4/mf6/gwf/chdg.py +++ b/flopy4/mf6/gwf/chdg.py @@ -23,7 +23,7 @@ class Chdg(Package): } observations: ClassVar[dict[str, tuple[tuple[str, ...], ...]]] = { - "chd": (("cellid",), ("string",)), + "chd": (("cellid",),), } key_sets: ClassVar[dict[str, str]] = { diff --git a/flopy4/mf6/gwf/drng.py b/flopy4/mf6/gwf/drng.py index 8b02629f..be5de497 100644 --- a/flopy4/mf6/gwf/drng.py +++ b/flopy4/mf6/gwf/drng.py @@ -23,8 +23,8 @@ class Drng(Package): } observations: ClassVar[dict[str, tuple[tuple[str, ...], ...]]] = { - "drn": (("cellid",), ("string",)), - "to-mvr": (("cellid",), ("string",)), + "drn": (("cellid",),), + "to-mvr": (("cellid",),), } key_sets: ClassVar[dict[str, str]] = { diff --git a/flopy4/mf6/gwf/evta.py b/flopy4/mf6/gwf/evta.py index 8247df59..97130bee 100644 --- a/flopy4/mf6/gwf/evta.py +++ b/flopy4/mf6/gwf/evta.py @@ -24,7 +24,7 @@ class Evta(Package): } observations: ClassVar[dict[str, tuple[tuple[str, ...], ...]]] = { - "evt": (("cellid",), ("string",)), + "evt": (("cellid",),), } readasarrays: bool = keyword( diff --git a/flopy4/mf6/gwf/ghbg.py b/flopy4/mf6/gwf/ghbg.py index 722edfd6..0c7c7eff 100644 --- a/flopy4/mf6/gwf/ghbg.py +++ b/flopy4/mf6/gwf/ghbg.py @@ -23,8 +23,8 @@ class Ghbg(Package): } observations: ClassVar[dict[str, tuple[tuple[str, ...], ...]]] = { - "ghb": (("cellid",), ("string",)), - "to-mvr": (("cellid",), ("string",)), + "ghb": (("cellid",),), + "to-mvr": (("cellid",),), } key_sets: ClassVar[dict[str, str]] = { diff --git a/flopy4/mf6/gwf/rcha.py b/flopy4/mf6/gwf/rcha.py index d563a456..44a5271b 100644 --- a/flopy4/mf6/gwf/rcha.py +++ b/flopy4/mf6/gwf/rcha.py @@ -24,7 +24,7 @@ class Rcha(Package): } observations: ClassVar[dict[str, tuple[tuple[str, ...], ...]]] = { - "rch": (("cellid",), ("string",)), + "rch": (("cellid",),), } readasarrays: bool = keyword( diff --git a/flopy4/mf6/gwf/rivg.py b/flopy4/mf6/gwf/rivg.py index deb83d7c..e44ec888 100644 --- a/flopy4/mf6/gwf/rivg.py +++ b/flopy4/mf6/gwf/rivg.py @@ -23,8 +23,8 @@ class Rivg(Package): } observations: ClassVar[dict[str, tuple[tuple[str, ...], ...]]] = { - "riv": (("cellid",), ("string",)), - "to-mvr": (("cellid",), ("string",)), + "riv": (("cellid",),), + "to-mvr": (("cellid",),), } key_sets: ClassVar[dict[str, str]] = { diff --git a/flopy4/mf6/gwf/welg.py b/flopy4/mf6/gwf/welg.py index 8aa0d4e1..3f67eb35 100644 --- a/flopy4/mf6/gwf/welg.py +++ b/flopy4/mf6/gwf/welg.py @@ -24,9 +24,9 @@ class Welg(Package): } observations: ClassVar[dict[str, tuple[tuple[str, ...], ...]]] = { - "to-mvr": (("cellid",), ("string",)), - "wel": (("cellid",), ("string",)), - "wel-reduction": (("cellid",), ("string",)), + "to-mvr": (("cellid",),), + "wel": (("cellid",),), + "wel-reduction": (("cellid",),), } key_sets: ClassVar[dict[str, str]] = { diff --git a/flopy4/mf6/item.py b/flopy4/mf6/item.py index 20bcc053..444edef0 100644 --- a/flopy4/mf6/item.py +++ b/flopy4/mf6/item.py @@ -352,9 +352,21 @@ def solve(i: int, pos: int, form: "tuple[str, ...] | None") -> "tuple[int, list] for form in forms or (None,): if (solved := solve(0, 0, form)) is not None: return {f.name: v for f, v in zip(fields, solved[1]) if v is not None} - if forms: # ids its observation type doesn't take: guess - return _read_unions(fields, full, ncelldim, prefer) names = ", ".join(f.name for f in fields) + if forms: # ids its observation type doesn't take: guess, but not a boundname + guess = _read_unions(fields, full, ncelldim, prefer) + for i, f in enumerate(fields): + v = guess.get(f.name) + if ( + isinstance(v, str) + and not _token_fits(v, float) + and not any(len(form) > i and form[i] == "string" for form in forms) + ): + raise ValueError( + f"can't read {names} from {full}: {v!r} is a boundname, " + f"but this observation type takes only {list(forms)}" + ) + return guess raise ValueError(f"can't read {names} from {full}") diff --git a/pixi.lock b/pixi.lock index eccb5405..889bd30b 100644 --- a/pixi.lock +++ b/pixi.lock @@ -106,7 +106,7 @@ environments: - conda: https://conda.anaconda.org/conda-forge/noarch/python_abi-3.13-9_cp313.conda - conda: https://conda.anaconda.org/conda-forge/noarch/tzdata-2026c-h151e31d_0.conda - pypi: ./ - - pypi: git+https://github.com/MODFLOW-ORG/modflow-devtools.git#a1468117be89a5e990cfc06d02c6c2e1761173c8 + - pypi: git+https://github.com/MODFLOW-ORG/modflow-devtools.git#8b11d69c6112978443da9d0c2801fe9a0e85f1ce - pypi: https://files.pythonhosted.org/packages/02/be/5d2d47b1fb58943194fb59dcf222f7c4e35122ec0ffe8c36e18b5d728f0b/tblib-3.2.2-py3-none-any.whl - pypi: https://files.pythonhosted.org/packages/07/70/746ab7140121dcf04bade9ab7d2e65b6d5eb5b23bb7dc04b7ad22742ca0f/xugrid-0.15.3-py3-none-any.whl - pypi: https://files.pythonhosted.org/packages/09/4e/23e0009b6d5d415c223ea38fcf1e38dc9b0fc6d3ff15b5c5090dcc1f6d88/sparse-0.19.2-py2.py3-none-any.whl @@ -258,7 +258,7 @@ environments: - conda: https://conda.anaconda.org/conda-forge/osx-64/tk-8.6.13-ha6c374e_4.conda - conda: https://conda.anaconda.org/conda-forge/osx-64/zstd-1.5.7-hbc1a06c_7.conda - pypi: ./ - - pypi: git+https://github.com/MODFLOW-ORG/modflow-devtools.git#a1468117be89a5e990cfc06d02c6c2e1761173c8 + - pypi: git+https://github.com/MODFLOW-ORG/modflow-devtools.git#8b11d69c6112978443da9d0c2801fe9a0e85f1ce - pypi: https://files.pythonhosted.org/packages/02/be/5d2d47b1fb58943194fb59dcf222f7c4e35122ec0ffe8c36e18b5d728f0b/tblib-3.2.2-py3-none-any.whl - pypi: https://files.pythonhosted.org/packages/07/06/b823a7e818c756d9a7123ba2cda7d07bc2dd32835648d1a7b7b7a05d848d/tomli-2.4.1-cp313-cp313-macosx_10_13_x86_64.whl - pypi: https://files.pythonhosted.org/packages/07/70/746ab7140121dcf04bade9ab7d2e65b6d5eb5b23bb7dc04b7ad22742ca0f/xugrid-0.15.3-py3-none-any.whl @@ -410,7 +410,7 @@ environments: - conda: https://conda.anaconda.org/conda-forge/osx-arm64/tk-8.6.13-hbeba79b_4.conda - conda: https://conda.anaconda.org/conda-forge/osx-arm64/zstd-1.5.7-hf451053_7.conda - pypi: ./ - - pypi: git+https://github.com/MODFLOW-ORG/modflow-devtools.git#a1468117be89a5e990cfc06d02c6c2e1761173c8 + - pypi: git+https://github.com/MODFLOW-ORG/modflow-devtools.git#8b11d69c6112978443da9d0c2801fe9a0e85f1ce - pypi: https://files.pythonhosted.org/packages/02/be/5d2d47b1fb58943194fb59dcf222f7c4e35122ec0ffe8c36e18b5d728f0b/tblib-3.2.2-py3-none-any.whl - pypi: https://files.pythonhosted.org/packages/07/70/746ab7140121dcf04bade9ab7d2e65b6d5eb5b23bb7dc04b7ad22742ca0f/xugrid-0.15.3-py3-none-any.whl - pypi: https://files.pythonhosted.org/packages/09/4e/23e0009b6d5d415c223ea38fcf1e38dc9b0fc6d3ff15b5c5090dcc1f6d88/sparse-0.19.2-py2.py3-none-any.whl @@ -556,7 +556,7 @@ environments: - conda: https://conda.anaconda.org/conda-forge/win-64/vcomp14-14.51.36247-habf1de7_41.conda - conda: https://conda.anaconda.org/conda-forge/win-64/zstd-1.5.7-h534d264_7.conda - pypi: ./ - - pypi: git+https://github.com/MODFLOW-ORG/modflow-devtools.git#a1468117be89a5e990cfc06d02c6c2e1761173c8 + - pypi: git+https://github.com/MODFLOW-ORG/modflow-devtools.git#8b11d69c6112978443da9d0c2801fe9a0e85f1ce - pypi: https://files.pythonhosted.org/packages/02/be/5d2d47b1fb58943194fb59dcf222f7c4e35122ec0ffe8c36e18b5d728f0b/tblib-3.2.2-py3-none-any.whl - pypi: https://files.pythonhosted.org/packages/05/73/c4abe620b841b6b791f2edc248f556900667a5a1cf023a6646967ae98335/markupsafe-3.0.3-cp313-cp313-win_amd64.whl - pypi: https://files.pythonhosted.org/packages/07/70/746ab7140121dcf04bade9ab7d2e65b6d5eb5b23bb7dc04b7ad22742ca0f/xugrid-0.15.3-py3-none-any.whl @@ -721,7 +721,7 @@ environments: - conda: https://conda.anaconda.org/conda-forge/noarch/python_abi-3.11-9_cp311.conda - conda: https://conda.anaconda.org/conda-forge/noarch/tzdata-2026c-h151e31d_0.conda - pypi: ./ - - pypi: git+https://github.com/MODFLOW-ORG/modflow-devtools.git#a1468117be89a5e990cfc06d02c6c2e1761173c8 + - pypi: git+https://github.com/MODFLOW-ORG/modflow-devtools.git#8b11d69c6112978443da9d0c2801fe9a0e85f1ce - pypi: https://files.pythonhosted.org/packages/02/08/9c41fb51ab5b43eb21674aff13df270e8ba6c4b29c8624e328dc7a9482af/distlib-0.4.3-py2.py3-none-any.whl - pypi: https://files.pythonhosted.org/packages/02/36/ecc85bc96c273dc8a11273ed4782272975e6338d4a3e9228621175edf0e3/jaraco_functools-4.6.0-py3-none-any.whl - pypi: https://files.pythonhosted.org/packages/02/be/5d2d47b1fb58943194fb59dcf222f7c4e35122ec0ffe8c36e18b5d728f0b/tblib-3.2.2-py3-none-any.whl @@ -1007,7 +1007,7 @@ environments: - conda: https://conda.anaconda.org/conda-forge/osx-64/tk-8.6.13-ha6c374e_4.conda - conda: https://conda.anaconda.org/conda-forge/osx-64/zstd-1.5.7-hbc1a06c_7.conda - pypi: ./ - - pypi: git+https://github.com/MODFLOW-ORG/modflow-devtools.git#a1468117be89a5e990cfc06d02c6c2e1761173c8 + - pypi: git+https://github.com/MODFLOW-ORG/modflow-devtools.git#8b11d69c6112978443da9d0c2801fe9a0e85f1ce - pypi: https://files.pythonhosted.org/packages/02/08/9c41fb51ab5b43eb21674aff13df270e8ba6c4b29c8624e328dc7a9482af/distlib-0.4.3-py2.py3-none-any.whl - pypi: https://files.pythonhosted.org/packages/02/36/ecc85bc96c273dc8a11273ed4782272975e6338d4a3e9228621175edf0e3/jaraco_functools-4.6.0-py3-none-any.whl - pypi: https://files.pythonhosted.org/packages/02/be/5d2d47b1fb58943194fb59dcf222f7c4e35122ec0ffe8c36e18b5d728f0b/tblib-3.2.2-py3-none-any.whl @@ -1291,7 +1291,7 @@ environments: - conda: https://conda.anaconda.org/conda-forge/osx-arm64/tk-8.6.13-hbeba79b_4.conda - conda: https://conda.anaconda.org/conda-forge/osx-arm64/zstd-1.5.7-hf451053_7.conda - pypi: ./ - - pypi: git+https://github.com/MODFLOW-ORG/modflow-devtools.git#a1468117be89a5e990cfc06d02c6c2e1761173c8 + - pypi: git+https://github.com/MODFLOW-ORG/modflow-devtools.git#8b11d69c6112978443da9d0c2801fe9a0e85f1ce - pypi: https://files.pythonhosted.org/packages/02/08/9c41fb51ab5b43eb21674aff13df270e8ba6c4b29c8624e328dc7a9482af/distlib-0.4.3-py2.py3-none-any.whl - pypi: https://files.pythonhosted.org/packages/02/36/ecc85bc96c273dc8a11273ed4782272975e6338d4a3e9228621175edf0e3/jaraco_functools-4.6.0-py3-none-any.whl - pypi: https://files.pythonhosted.org/packages/02/be/5d2d47b1fb58943194fb59dcf222f7c4e35122ec0ffe8c36e18b5d728f0b/tblib-3.2.2-py3-none-any.whl @@ -1569,7 +1569,7 @@ environments: - conda: https://conda.anaconda.org/conda-forge/win-64/vcomp14-14.51.36247-habf1de7_41.conda - conda: https://conda.anaconda.org/conda-forge/win-64/zstd-1.5.7-h534d264_7.conda - pypi: ./ - - pypi: git+https://github.com/MODFLOW-ORG/modflow-devtools.git#a1468117be89a5e990cfc06d02c6c2e1761173c8 + - pypi: git+https://github.com/MODFLOW-ORG/modflow-devtools.git#8b11d69c6112978443da9d0c2801fe9a0e85f1ce - pypi: https://files.pythonhosted.org/packages/02/08/9c41fb51ab5b43eb21674aff13df270e8ba6c4b29c8624e328dc7a9482af/distlib-0.4.3-py2.py3-none-any.whl - pypi: https://files.pythonhosted.org/packages/02/36/ecc85bc96c273dc8a11273ed4782272975e6338d4a3e9228621175edf0e3/jaraco_functools-4.6.0-py3-none-any.whl - pypi: https://files.pythonhosted.org/packages/02/be/5d2d47b1fb58943194fb59dcf222f7c4e35122ec0ffe8c36e18b5d728f0b/tblib-3.2.2-py3-none-any.whl @@ -1862,7 +1862,7 @@ environments: - conda: https://conda.anaconda.org/conda-forge/noarch/python_abi-3.11-9_cp311.conda - conda: https://conda.anaconda.org/conda-forge/noarch/tzdata-2026c-h151e31d_0.conda - pypi: ./ - - pypi: git+https://github.com/MODFLOW-ORG/modflow-devtools.git#a1468117be89a5e990cfc06d02c6c2e1761173c8 + - pypi: git+https://github.com/MODFLOW-ORG/modflow-devtools.git#8b11d69c6112978443da9d0c2801fe9a0e85f1ce - pypi: https://files.pythonhosted.org/packages/01/f9/575c8d760eae1fc99651b7cc5efd96ad5379ca4d6b53750b0fb4fe983f34/imagesize-2.0.1-py3-none-any.whl - pypi: https://files.pythonhosted.org/packages/02/be/5d2d47b1fb58943194fb59dcf222f7c4e35122ec0ffe8c36e18b5d728f0b/tblib-3.2.2-py3-none-any.whl - pypi: https://files.pythonhosted.org/packages/04/4b/29cac41a4d98d144bf5f6d33995617b185d14b22401f75ca86f384e87ff1/h11-0.16.0-py3-none-any.whl @@ -2132,7 +2132,7 @@ environments: - conda: https://conda.anaconda.org/conda-forge/osx-64/tk-8.6.13-ha6c374e_4.conda - conda: https://conda.anaconda.org/conda-forge/osx-64/zstd-1.5.7-hbc1a06c_7.conda - pypi: ./ - - pypi: git+https://github.com/MODFLOW-ORG/modflow-devtools.git#a1468117be89a5e990cfc06d02c6c2e1761173c8 + - pypi: git+https://github.com/MODFLOW-ORG/modflow-devtools.git#8b11d69c6112978443da9d0c2801fe9a0e85f1ce - pypi: https://files.pythonhosted.org/packages/01/f9/575c8d760eae1fc99651b7cc5efd96ad5379ca4d6b53750b0fb4fe983f34/imagesize-2.0.1-py3-none-any.whl - pypi: https://files.pythonhosted.org/packages/02/be/5d2d47b1fb58943194fb59dcf222f7c4e35122ec0ffe8c36e18b5d728f0b/tblib-3.2.2-py3-none-any.whl - pypi: https://files.pythonhosted.org/packages/04/4b/29cac41a4d98d144bf5f6d33995617b185d14b22401f75ca86f384e87ff1/h11-0.16.0-py3-none-any.whl @@ -2403,7 +2403,7 @@ environments: - conda: https://conda.anaconda.org/conda-forge/osx-arm64/tk-8.6.13-hbeba79b_4.conda - conda: https://conda.anaconda.org/conda-forge/osx-arm64/zstd-1.5.7-hf451053_7.conda - pypi: ./ - - pypi: git+https://github.com/MODFLOW-ORG/modflow-devtools.git#a1468117be89a5e990cfc06d02c6c2e1761173c8 + - pypi: git+https://github.com/MODFLOW-ORG/modflow-devtools.git#8b11d69c6112978443da9d0c2801fe9a0e85f1ce - pypi: https://files.pythonhosted.org/packages/01/f9/575c8d760eae1fc99651b7cc5efd96ad5379ca4d6b53750b0fb4fe983f34/imagesize-2.0.1-py3-none-any.whl - pypi: https://files.pythonhosted.org/packages/02/be/5d2d47b1fb58943194fb59dcf222f7c4e35122ec0ffe8c36e18b5d728f0b/tblib-3.2.2-py3-none-any.whl - pypi: https://files.pythonhosted.org/packages/04/4b/29cac41a4d98d144bf5f6d33995617b185d14b22401f75ca86f384e87ff1/h11-0.16.0-py3-none-any.whl @@ -2667,7 +2667,7 @@ environments: - conda: https://conda.anaconda.org/conda-forge/win-64/vcomp14-14.51.36247-habf1de7_41.conda - conda: https://conda.anaconda.org/conda-forge/win-64/zstd-1.5.7-h534d264_7.conda - pypi: ./ - - pypi: git+https://github.com/MODFLOW-ORG/modflow-devtools.git#a1468117be89a5e990cfc06d02c6c2e1761173c8 + - pypi: git+https://github.com/MODFLOW-ORG/modflow-devtools.git#8b11d69c6112978443da9d0c2801fe9a0e85f1ce - pypi: https://files.pythonhosted.org/packages/01/f9/575c8d760eae1fc99651b7cc5efd96ad5379ca4d6b53750b0fb4fe983f34/imagesize-2.0.1-py3-none-any.whl - pypi: https://files.pythonhosted.org/packages/02/be/5d2d47b1fb58943194fb59dcf222f7c4e35122ec0ffe8c36e18b5d728f0b/tblib-3.2.2-py3-none-any.whl - pypi: https://files.pythonhosted.org/packages/04/4b/29cac41a4d98d144bf5f6d33995617b185d14b22401f75ca86f384e87ff1/h11-0.16.0-py3-none-any.whl @@ -2950,7 +2950,7 @@ environments: - conda: https://conda.anaconda.org/conda-forge/noarch/python_abi-3.11-9_cp311.conda - conda: https://conda.anaconda.org/conda-forge/noarch/tzdata-2026c-h151e31d_0.conda - pypi: ./ - - pypi: git+https://github.com/MODFLOW-ORG/modflow-devtools.git#a1468117be89a5e990cfc06d02c6c2e1761173c8 + - pypi: git+https://github.com/MODFLOW-ORG/modflow-devtools.git#8b11d69c6112978443da9d0c2801fe9a0e85f1ce - pypi: https://files.pythonhosted.org/packages/02/be/5d2d47b1fb58943194fb59dcf222f7c4e35122ec0ffe8c36e18b5d728f0b/tblib-3.2.2-py3-none-any.whl - pypi: https://files.pythonhosted.org/packages/04/4b/29cac41a4d98d144bf5f6d33995617b185d14b22401f75ca86f384e87ff1/h11-0.16.0-py3-none-any.whl - pypi: https://files.pythonhosted.org/packages/07/6c/aa3f2f849e01cb6a001cd8554a88d4c77c5c1a31c95bdf1cf9301e6d9ef4/defusedxml-0.7.1-py2.py3-none-any.whl @@ -3204,7 +3204,7 @@ environments: - conda: https://conda.anaconda.org/conda-forge/osx-64/tk-8.6.13-ha6c374e_4.conda - conda: https://conda.anaconda.org/conda-forge/osx-64/zstd-1.5.7-hbc1a06c_7.conda - pypi: ./ - - pypi: git+https://github.com/MODFLOW-ORG/modflow-devtools.git#a1468117be89a5e990cfc06d02c6c2e1761173c8 + - pypi: git+https://github.com/MODFLOW-ORG/modflow-devtools.git#8b11d69c6112978443da9d0c2801fe9a0e85f1ce - pypi: https://files.pythonhosted.org/packages/02/be/5d2d47b1fb58943194fb59dcf222f7c4e35122ec0ffe8c36e18b5d728f0b/tblib-3.2.2-py3-none-any.whl - pypi: https://files.pythonhosted.org/packages/04/4b/29cac41a4d98d144bf5f6d33995617b185d14b22401f75ca86f384e87ff1/h11-0.16.0-py3-none-any.whl - pypi: https://files.pythonhosted.org/packages/07/6c/aa3f2f849e01cb6a001cd8554a88d4c77c5c1a31c95bdf1cf9301e6d9ef4/defusedxml-0.7.1-py2.py3-none-any.whl @@ -3459,7 +3459,7 @@ environments: - conda: https://conda.anaconda.org/conda-forge/osx-arm64/tk-8.6.13-hbeba79b_4.conda - conda: https://conda.anaconda.org/conda-forge/osx-arm64/zstd-1.5.7-hf451053_7.conda - pypi: ./ - - pypi: git+https://github.com/MODFLOW-ORG/modflow-devtools.git#a1468117be89a5e990cfc06d02c6c2e1761173c8 + - pypi: git+https://github.com/MODFLOW-ORG/modflow-devtools.git#8b11d69c6112978443da9d0c2801fe9a0e85f1ce - pypi: https://files.pythonhosted.org/packages/02/be/5d2d47b1fb58943194fb59dcf222f7c4e35122ec0ffe8c36e18b5d728f0b/tblib-3.2.2-py3-none-any.whl - pypi: https://files.pythonhosted.org/packages/04/4b/29cac41a4d98d144bf5f6d33995617b185d14b22401f75ca86f384e87ff1/h11-0.16.0-py3-none-any.whl - pypi: https://files.pythonhosted.org/packages/04/90/67bd7260b4ea9b8b20b4f58afef6c223ecb3abf368eb4ec5bc2cdef81b49/pyproj-3.7.2.tar.gz @@ -3708,7 +3708,7 @@ environments: - conda: https://conda.anaconda.org/conda-forge/win-64/vcomp14-14.51.36247-habf1de7_41.conda - conda: https://conda.anaconda.org/conda-forge/win-64/zstd-1.5.7-h534d264_7.conda - pypi: ./ - - pypi: git+https://github.com/MODFLOW-ORG/modflow-devtools.git#a1468117be89a5e990cfc06d02c6c2e1761173c8 + - pypi: git+https://github.com/MODFLOW-ORG/modflow-devtools.git#8b11d69c6112978443da9d0c2801fe9a0e85f1ce - pypi: https://files.pythonhosted.org/packages/02/be/5d2d47b1fb58943194fb59dcf222f7c4e35122ec0ffe8c36e18b5d728f0b/tblib-3.2.2-py3-none-any.whl - pypi: https://files.pythonhosted.org/packages/04/4b/29cac41a4d98d144bf5f6d33995617b185d14b22401f75ca86f384e87ff1/h11-0.16.0-py3-none-any.whl - pypi: https://files.pythonhosted.org/packages/07/6c/aa3f2f849e01cb6a001cd8554a88d4c77c5c1a31c95bdf1cf9301e6d9ef4/defusedxml-0.7.1-py2.py3-none-any.whl @@ -3970,7 +3970,7 @@ environments: - conda: https://conda.anaconda.org/conda-forge/noarch/python_abi-3.12-9_cp312.conda - conda: https://conda.anaconda.org/conda-forge/noarch/tzdata-2026c-h151e31d_0.conda - pypi: ./ - - pypi: git+https://github.com/MODFLOW-ORG/modflow-devtools.git#a1468117be89a5e990cfc06d02c6c2e1761173c8 + - pypi: git+https://github.com/MODFLOW-ORG/modflow-devtools.git#8b11d69c6112978443da9d0c2801fe9a0e85f1ce - pypi: https://files.pythonhosted.org/packages/02/be/5d2d47b1fb58943194fb59dcf222f7c4e35122ec0ffe8c36e18b5d728f0b/tblib-3.2.2-py3-none-any.whl - pypi: https://files.pythonhosted.org/packages/04/4b/29cac41a4d98d144bf5f6d33995617b185d14b22401f75ca86f384e87ff1/h11-0.16.0-py3-none-any.whl - pypi: https://files.pythonhosted.org/packages/04/8f/d2f3f532616be4d06c316ef119683e832bd3d41e112bf3a88f4151c95b17/rpds_py-2026.6.3-cp312-cp312-manylinux_2_17_x86_64.manylinux2014_x86_64.whl @@ -4221,7 +4221,7 @@ environments: - conda: https://conda.anaconda.org/conda-forge/osx-64/tk-8.6.13-ha6c374e_4.conda - conda: https://conda.anaconda.org/conda-forge/osx-64/zstd-1.5.7-hbc1a06c_7.conda - pypi: ./ - - pypi: git+https://github.com/MODFLOW-ORG/modflow-devtools.git#a1468117be89a5e990cfc06d02c6c2e1761173c8 + - pypi: git+https://github.com/MODFLOW-ORG/modflow-devtools.git#8b11d69c6112978443da9d0c2801fe9a0e85f1ce - pypi: https://files.pythonhosted.org/packages/02/be/5d2d47b1fb58943194fb59dcf222f7c4e35122ec0ffe8c36e18b5d728f0b/tblib-3.2.2-py3-none-any.whl - pypi: https://files.pythonhosted.org/packages/04/4b/29cac41a4d98d144bf5f6d33995617b185d14b22401f75ca86f384e87ff1/h11-0.16.0-py3-none-any.whl - pypi: https://files.pythonhosted.org/packages/07/6c/aa3f2f849e01cb6a001cd8554a88d4c77c5c1a31c95bdf1cf9301e6d9ef4/defusedxml-0.7.1-py2.py3-none-any.whl @@ -4473,7 +4473,7 @@ environments: - conda: https://conda.anaconda.org/conda-forge/osx-arm64/tk-8.6.13-hbeba79b_4.conda - conda: https://conda.anaconda.org/conda-forge/osx-arm64/zstd-1.5.7-hf451053_7.conda - pypi: ./ - - pypi: git+https://github.com/MODFLOW-ORG/modflow-devtools.git#a1468117be89a5e990cfc06d02c6c2e1761173c8 + - pypi: git+https://github.com/MODFLOW-ORG/modflow-devtools.git#8b11d69c6112978443da9d0c2801fe9a0e85f1ce - pypi: https://files.pythonhosted.org/packages/02/96/5c48977168f32de067bfafce7f584dd04becf152152bf088636cc034828e/shapely-2.2.0-cp312-cp312-macosx_11_0_arm64.whl - pypi: https://files.pythonhosted.org/packages/02/be/5d2d47b1fb58943194fb59dcf222f7c4e35122ec0ffe8c36e18b5d728f0b/tblib-3.2.2-py3-none-any.whl - pypi: https://files.pythonhosted.org/packages/04/4b/29cac41a4d98d144bf5f6d33995617b185d14b22401f75ca86f384e87ff1/h11-0.16.0-py3-none-any.whl @@ -4719,7 +4719,7 @@ environments: - conda: https://conda.anaconda.org/conda-forge/win-64/vcomp14-14.51.36247-habf1de7_41.conda - conda: https://conda.anaconda.org/conda-forge/win-64/zstd-1.5.7-h534d264_7.conda - pypi: ./ - - pypi: git+https://github.com/MODFLOW-ORG/modflow-devtools.git#a1468117be89a5e990cfc06d02c6c2e1761173c8 + - pypi: git+https://github.com/MODFLOW-ORG/modflow-devtools.git#8b11d69c6112978443da9d0c2801fe9a0e85f1ce - pypi: https://files.pythonhosted.org/packages/02/8b/b83f7780dad22e0878e4c7bd9158ebd24ed12bc3d5e3a471cd0576f77ded/pyzmq-27.2.0-cp312-abi3-win_amd64.whl - pypi: https://files.pythonhosted.org/packages/02/be/5d2d47b1fb58943194fb59dcf222f7c4e35122ec0ffe8c36e18b5d728f0b/tblib-3.2.2-py3-none-any.whl - pypi: https://files.pythonhosted.org/packages/04/3a/f0ee4d4dde9d3b69dedf1b5f74e7a40017046d55052d173e418c6a94f960/rpds_py-2026.6.3-cp312-cp312-win_amd64.whl @@ -4977,7 +4977,7 @@ environments: - conda: https://conda.anaconda.org/conda-forge/noarch/python_abi-3.13-9_cp313.conda - conda: https://conda.anaconda.org/conda-forge/noarch/tzdata-2026c-h151e31d_0.conda - pypi: ./ - - pypi: git+https://github.com/MODFLOW-ORG/modflow-devtools.git#a1468117be89a5e990cfc06d02c6c2e1761173c8 + - pypi: git+https://github.com/MODFLOW-ORG/modflow-devtools.git#8b11d69c6112978443da9d0c2801fe9a0e85f1ce - pypi: https://files.pythonhosted.org/packages/02/be/5d2d47b1fb58943194fb59dcf222f7c4e35122ec0ffe8c36e18b5d728f0b/tblib-3.2.2-py3-none-any.whl - pypi: https://files.pythonhosted.org/packages/04/4b/29cac41a4d98d144bf5f6d33995617b185d14b22401f75ca86f384e87ff1/h11-0.16.0-py3-none-any.whl - pypi: https://files.pythonhosted.org/packages/07/6c/aa3f2f849e01cb6a001cd8554a88d4c77c5c1a31c95bdf1cf9301e6d9ef4/defusedxml-0.7.1-py2.py3-none-any.whl @@ -5230,7 +5230,7 @@ environments: - conda: https://conda.anaconda.org/conda-forge/osx-64/tk-8.6.13-ha6c374e_4.conda - conda: https://conda.anaconda.org/conda-forge/osx-64/zstd-1.5.7-hbc1a06c_7.conda - pypi: ./ - - pypi: git+https://github.com/MODFLOW-ORG/modflow-devtools.git#a1468117be89a5e990cfc06d02c6c2e1761173c8 + - pypi: git+https://github.com/MODFLOW-ORG/modflow-devtools.git#8b11d69c6112978443da9d0c2801fe9a0e85f1ce - pypi: https://files.pythonhosted.org/packages/02/be/5d2d47b1fb58943194fb59dcf222f7c4e35122ec0ffe8c36e18b5d728f0b/tblib-3.2.2-py3-none-any.whl - pypi: https://files.pythonhosted.org/packages/04/4b/29cac41a4d98d144bf5f6d33995617b185d14b22401f75ca86f384e87ff1/h11-0.16.0-py3-none-any.whl - pypi: https://files.pythonhosted.org/packages/07/06/b823a7e818c756d9a7123ba2cda7d07bc2dd32835648d1a7b7b7a05d848d/tomli-2.4.1-cp313-cp313-macosx_10_13_x86_64.whl @@ -5484,7 +5484,7 @@ environments: - conda: https://conda.anaconda.org/conda-forge/osx-arm64/tk-8.6.13-hbeba79b_4.conda - conda: https://conda.anaconda.org/conda-forge/osx-arm64/zstd-1.5.7-hf451053_7.conda - pypi: ./ - - pypi: git+https://github.com/MODFLOW-ORG/modflow-devtools.git#a1468117be89a5e990cfc06d02c6c2e1761173c8 + - pypi: git+https://github.com/MODFLOW-ORG/modflow-devtools.git#8b11d69c6112978443da9d0c2801fe9a0e85f1ce - pypi: https://files.pythonhosted.org/packages/02/be/5d2d47b1fb58943194fb59dcf222f7c4e35122ec0ffe8c36e18b5d728f0b/tblib-3.2.2-py3-none-any.whl - pypi: https://files.pythonhosted.org/packages/04/4b/29cac41a4d98d144bf5f6d33995617b185d14b22401f75ca86f384e87ff1/h11-0.16.0-py3-none-any.whl - pypi: https://files.pythonhosted.org/packages/07/6c/aa3f2f849e01cb6a001cd8554a88d4c77c5c1a31c95bdf1cf9301e6d9ef4/defusedxml-0.7.1-py2.py3-none-any.whl @@ -5732,7 +5732,7 @@ environments: - conda: https://conda.anaconda.org/conda-forge/win-64/vcomp14-14.51.36247-habf1de7_41.conda - conda: https://conda.anaconda.org/conda-forge/win-64/zstd-1.5.7-h534d264_7.conda - pypi: ./ - - pypi: git+https://github.com/MODFLOW-ORG/modflow-devtools.git#a1468117be89a5e990cfc06d02c6c2e1761173c8 + - pypi: git+https://github.com/MODFLOW-ORG/modflow-devtools.git#8b11d69c6112978443da9d0c2801fe9a0e85f1ce - pypi: https://files.pythonhosted.org/packages/02/8b/b83f7780dad22e0878e4c7bd9158ebd24ed12bc3d5e3a471cd0576f77ded/pyzmq-27.2.0-cp312-abi3-win_amd64.whl - pypi: https://files.pythonhosted.org/packages/02/be/5d2d47b1fb58943194fb59dcf222f7c4e35122ec0ffe8c36e18b5d728f0b/tblib-3.2.2-py3-none-any.whl - pypi: https://files.pythonhosted.org/packages/04/4b/29cac41a4d98d144bf5f6d33995617b185d14b22401f75ca86f384e87ff1/h11-0.16.0-py3-none-any.whl @@ -11000,29 +11000,35 @@ packages: - build ; extra == 'build' - twine ; extra == 'build' requires_python: '>=3.11,<3.14' -- pypi: git+https://github.com/MODFLOW-ORG/modflow-devtools.git#a1468117be89a5e990cfc06d02c6c2e1761173c8 +- pypi: git+https://github.com/MODFLOW-ORG/modflow-devtools.git#8b11d69c6112978443da9d0c2801fe9a0e85f1ce name: modflow-devtools version: 1.10.0.dev1 requires_dist: - boltons ; extra == 'dfn' - filelock ; extra == 'dfn' + - packaging ; extra == 'dfn' - pooch ; extra == 'dfn' - pyaml ; extra == 'dfn' - pydantic ; extra == 'dfn' + - requests ; extra == 'dfn' - tomli ; extra == 'dfn' - tomli-w ; extra == 'dfn' - boltons ; extra == 'ecosystem' - filelock ; extra == 'ecosystem' + - packaging ; extra == 'ecosystem' - pooch ; extra == 'ecosystem' - pyaml ; extra == 'ecosystem' - pydantic ; extra == 'ecosystem' + - requests ; extra == 'ecosystem' - tomli ; extra == 'ecosystem' - tomli-w ; extra == 'ecosystem' - boltons ; extra == 'models' - filelock ; extra == 'models' + - packaging ; extra == 'models' - pooch ; extra == 'models' - pyaml ; extra == 'models' - pydantic ; extra == 'models' + - requests ; extra == 'models' - tomli ; extra == 'models' - tomli-w ; extra == 'models' - numpy ; extra == 'pytest' diff --git a/test/mf6/test_mf6_codec.py b/test/mf6/test_mf6_codec.py index 369e6a5a..b0861b0d 100644 --- a/test/mf6/test_mf6_codec.py +++ b/test/mf6/test_mf6_codec.py @@ -5276,6 +5276,25 @@ def test_obs_ids_by_obstype(tmp_path, parent, dims, row, ids): assert (obs_row.id_, obs_row.id2) == ids +@pytest.mark.parametrize("parent", ["Chdg", "Drng", "Evta", "Ghbg", "Rcha", "Rivg", "Welg"]) +def test_obs_boundname_rejected_by_grid_package(tmp_path, parent): + """A grid package has no boundnames, so its OBS ids are cellids only, + as in MF6: a boundname is an error, not a guess.""" + from flopy4.mf6 import gwf + from flopy4.mf6.codec.reader import loads + from flopy4.mf6.converter.ingress.structure import structure_component + + cls = getattr(gwf, parent) + obstype = next(iter(cls.observations)) + (tmp_path / "p.obs").write_text( + f"BEGIN CONTINUOUS FILEOUT p.csv\n o1 {obstype} well-a\nEND CONTINUOUS\n" + ) + raw = loads("BEGIN OPTIONS\n OBS6 FILEIN p.obs\nEND OPTIONS\n") + context = LoadContext(workspace=tmp_path, dims=_DISV) + with pytest.raises(ValueError, match="'well-a' is a boundname"): + structure_component(raw, cls, context=context) + + def test_block_end_keeps_only_an_index(): assert writer.filters.block_begin("continuous FILEOUT Heads.csv") == ( "CONTINUOUS FILEOUT Heads.csv"