Skip to content

Commit a230bc9

Browse files
Issue #1116 fix imod5 well import (#1142)
Fixes #1116 # Description - ``open_projectfile_data`` now groups wells by ipf name - ``GridAgnosticWell.from_imod5_data`` now validates associated IPFs whether they meet our requirements - ``GridAgnosticWell.from_imod5_data`` deactivates unassociated IPFs if not present in certain timestep anymore - Remove imod.formats.prj.convert_to_disv - Adds lots of test cases to test the well import from projectfiles # Checklist - [x] Links to correct issue - [x] Update changelog, if changes affect users - [x] PR title starts with ``Issue #nr``, e.g. ``Issue #737`` - [x] Unit tests were added - [ ] **If feature added**: Added/extended example
1 parent aa2f184 commit a230bc9

File tree

17 files changed

+1278
-1182
lines changed

17 files changed

+1278
-1182
lines changed

docs/api/changelog.rst

Lines changed: 16 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -19,7 +19,8 @@ Fixed
1919

2020
Changed
2121
~~~~~~~
22-
- :class:`imod.mf6.Well` now also validates that well filter top is above well filter bottom
22+
- :class:`imod.mf6.Well` now also validates that well filter top is above well
23+
filter bottom
2324
- :func:`open_projectfile_data` now also imports well filter top and bottom.
2425
- :class:`imod.mf6.Well` now logs a warning if any wells are removed during writing.
2526
- :class:`imod.mf6.HorizontalFlowBarrierResistance`,
@@ -30,19 +31,31 @@ Changed
3031
:func:`imod.prepare.linestring_to_square_zpolygons` and
3132
:func:`imod.prepare.linestring_to_trapezoid_zpolygons` to generate these
3233
polygons.
34+
- :func:`open_projectfile_data` now returns well data grouped by ipf name,
35+
instead of generic, separate number per entry.
3336

3437
Added
3538
~~~~~
3639

40+
- :meth:`imod.mf6.Modflow6Simulation.from_imod5_data` to import imod5 data
41+
loaded with :func:`imod.formats.prj.open_projectfile_data` as a MODFLOW 6
42+
simulation.
3743
- :func:`imod.prepare.linestring_to_square_zpolygons` and
38-
:func:`imod.prepare.linestring_to_trapezoid_zpolygons` to generate
39-
vertical polygons that can be used to specify horizontal flow barriers, specifically:
44+
:func:`imod.prepare.linestring_to_trapezoid_zpolygons` to generate vertical
45+
polygons that can be used to specify horizontal flow barriers, specifically:
4046
:class:`imod.mf6.HorizontalFlowBarrierResistance`,
4147
:class:`imod.mf6.HorizontalFlowBarrierMultiplier`,
4248
:class:`imod.mf6.HorizontalFlowBarrierHydraulicCharacteristic`.
4349
- :class:`imod.mf6.LayeredWell` to specify wells directly to layers instead
4450
assigning them with filter depths.
4551

52+
Removed
53+
~~~~~~~
54+
55+
- :func:`imod.formats.prj.convert_to_disv` has been removed. This functionality
56+
has been replaced by :meth:`imod.mf6.Modflow6Simulation.from_imod5_data`. To
57+
convert a structured simulation to an unstructured simulation, call:
58+
:meth:`imod.mf6.Modflow6Simulation.regrid_like`
4659

4760
[Unreleased]
4861
------------

docs/api/io.rst

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -29,4 +29,3 @@ Input/output
2929
prj.read_projectfile
3030
prj.open_projectfile_data
3131
prj.read_timfile
32-
prj.convert_to_disv

docs/api/mf6.rst

Lines changed: 9 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -74,6 +74,11 @@ Flow Packages
7474
HorizontalFlowBarrierHydraulicCharacteristic
7575
HorizontalFlowBarrierMultiplier
7676
HorizontalFlowBarrierResistance
77+
LayeredWell
78+
LayeredWell.from_imod5_data
79+
LayeredWell.mask
80+
LayeredWell.regrid_like
81+
LayeredWell.to_mf6_pkg
7782
InitialConditions
7883
NodePropertyFlow
7984
Recharge
@@ -82,6 +87,10 @@ Flow Packages
8287
StorageCoefficient
8388
UnsaturatedZoneFlow
8489
Well
90+
Well.from_imod5_data
91+
Well.mask
92+
Well.regrid_like
93+
Well.to_mf6_pkg
8594
WellDisStructured
8695
WellDisVertices
8796

examples/imod5-backwards-compatibility/imod5_conversion.py

Lines changed: 0 additions & 152 deletions
This file was deleted.

imod/formats/prj/__init__.py

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,2 +1 @@
1-
from imod.formats.prj.disv_conversion import convert_to_disv
21
from imod.formats.prj.prj import open_projectfile_data, read_projectfile, read_timfile

0 commit comments

Comments
 (0)