Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Update sprinkling class msw model #1232

Draft
wants to merge 69 commits into
base: master
Choose a base branch
from

Commits on May 1, 2024

  1. Issue #964 from imod5 classmethbod DIS (#981)

    Fixes #964 
    
    # Description
    Implements from_imod5 classmethod to StructuredDiscretization
    classmethod.
    
    NOTE: I had to modify the default regridding method of "idomain" as the
    "mode" method appears to have a bug with perfectly aligned structured
    grids.
    This bug requires further investigation. Will post an issue if found.
    
    # Checklist
    <!---
    Before requesting review, please go through this checklist:
    -->
    
    - [x] Links to correct issue
    - [ ] 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
    JoerivanEngelen authored May 1, 2024
    Configuration menu
    Copy the full SHA
    72515e6 View commit details
    Browse the repository at this point in the history

Commits on May 7, 2024

  1. Issue #965 npf from imod5 (#1010)

    Fixes #965 
    
    # Description
    Adds a function to import an npf package from an imod5 project file.
    Adds tests.
    
    # Checklist
    
    
    - [x] Links to correct issue
    - [ ] 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
    
    ---------
    
    Co-authored-by: Joeri van Engelen <[email protected]>
    luitjansl and JoerivanEngelen authored May 7, 2024
    Configuration menu
    Copy the full SHA
    721d5c3 View commit details
    Browse the repository at this point in the history
  2. Configuration menu
    Copy the full SHA
    3522a0a View commit details
    Browse the repository at this point in the history

Commits on May 8, 2024

  1. fixed tests after merge

    luitjansl committed May 8, 2024
    Configuration menu
    Copy the full SHA
    741ac1d View commit details
    Browse the repository at this point in the history
  2. Configuration menu
    Copy the full SHA
    387e64f View commit details
    Browse the repository at this point in the history
  3. Issue #961 flow packages from imod5 (#1023)

    Fixes #961
    
    # Description
    implements importing from a imod5 project file for storage and initial
    conditions.
    
    # Checklist
    - [X] Links to correct issue
    - [ ] 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
    
    ---------
    
    Co-authored-by: Joeri van Engelen <[email protected]>
    luitjansl and JoerivanEngelen authored May 8, 2024
    Configuration menu
    Copy the full SHA
    65ba5f2 View commit details
    Browse the repository at this point in the history
  4. Configuration menu
    Copy the full SHA
    10d46f5 View commit details
    Browse the repository at this point in the history
  5. added # noqa: F811

    luitjansl committed May 8, 2024
    Configuration menu
    Copy the full SHA
    637da9d View commit details
    Browse the repository at this point in the history

Commits on May 14, 2024

  1. Configuration menu
    Copy the full SHA
    35ba24a View commit details
    Browse the repository at this point in the history

Commits on May 21, 2024

  1. Issue #969 imod5 import recharge (#1031)

    Fixes #969
    
    # Description
    implements importing recharge packages from a project file. The recharge
    can be imported using a planar grid,
    in which case it assigns the recharge to the uppermost active cell for
    each column.
    The recharge can also be imported from a non-planar (so fully 3d) grid
    in which case it is just regridded to the target grid.
    
    # Checklist
    - [X] Links to correct issue
    - [ ] 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
    
    ---------
    
    Co-authored-by: Joeri van Engelen <[email protected]>
    luitjansl and JoerivanEngelen authored May 21, 2024
    Configuration menu
    Copy the full SHA
    9b9a2e3 View commit details
    Browse the repository at this point in the history
  2. Merge branch 'master' into imod5_converter_feature_branch

    # Conflicts:
    #	imod/mf6/dis.py
    #	imod/mf6/package.py
    #	imod/tests/test_typing/test_typing_grid.py
    #	imod/typing/grid.py
    luitjansl committed May 21, 2024
    Configuration menu
    Copy the full SHA
    b32d07f View commit details
    Browse the repository at this point in the history

Commits on May 24, 2024

  1. Configuration menu
    Copy the full SHA
    0017e1e View commit details
    Browse the repository at this point in the history
  2. Issue #967 drn conversion (#1046)

    Fixes #967 
    
    # Description
    implements importing drainage packages from imod5 data. Adds tests. 
    Methods for allocation and conductivity assignment can be specified per
    package, but it requires knowledge on what the packages are called in
    the imod5 project file (like "drn-1" and "drn-2"). If not specified,
    defaults are in place.
    
    # Checklist
    
    - [X] Links to correct issue
    - [ ] 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
    
    ---------
    
    Co-authored-by: Joeri van Engelen <[email protected]>
    luitjansl and JoerivanEngelen authored May 24, 2024
    Configuration menu
    Copy the full SHA
    b84b577 View commit details
    Browse the repository at this point in the history

Commits on May 29, 2024

  1. Configuration menu
    Copy the full SHA
    5a2da62 View commit details
    Browse the repository at this point in the history
  2. fixed tests after merge

    luitjansl committed May 29, 2024
    Configuration menu
    Copy the full SHA
    62ba721 View commit details
    Browse the repository at this point in the history
  3. fixed mypy errors

    luitjansl committed May 29, 2024
    Configuration menu
    Copy the full SHA
    3f20b3e View commit details
    Browse the repository at this point in the history
  4. uopdated docstrings

    luitjansl committed May 29, 2024
    Configuration menu
    Copy the full SHA
    fc6e1b7 View commit details
    Browse the repository at this point in the history

Commits on May 30, 2024

  1. Issue #1041 import simulation (#1059)

    Fixes #1041
    
    # Description
    Adds a function that imports a simulation from an imod5 project file. It
    creates a simulation, containing 1 GroundwaterFlowModel, containing the
    packages for which we support importing currently. This includes the
    mandatory flow packages like NPF and STO, and some boundary conditions
    (like DRN and RCH) but not yet CHD or WEL.
    
    # Checklist
    - [X] Links to correct issue
    - [ ] 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
    
    ---------
    
    Co-authored-by: Joeri van Engelen <[email protected]>
    luitjansl and JoerivanEngelen authored May 30, 2024
    Configuration menu
    Copy the full SHA
    a31d86f View commit details
    Browse the repository at this point in the history

Commits on Jun 3, 2024

  1. adding import of filter top and bottom (#1063)

    Fixes #1053 
    
    # Description
    On importing wells, the filter top and bottom are now parsed and stored
    in the project file data structure
    
    # 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
    luitjansl authored Jun 3, 2024
    Configuration menu
    Copy the full SHA
    b749857 View commit details
    Browse the repository at this point in the history

Commits on Jun 7, 2024

  1. Issue #1051 validate well filters (#1062)

    Fixes #1051
    
    # Description
    Now validates that well top > well bottom. 
    
    # Checklist
    
    - [X] Links to correct issue
    - [ ] 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
    luitjansl authored Jun 7, 2024
    Configuration menu
    Copy the full SHA
    0eed7f8 View commit details
    Browse the repository at this point in the history
  2. Issue #968 import river (#1061)

    Fixes #968 
    
    # Description
    Imports riverpackages from IMOD5. The infiltration factor (which does
    not exist in MF6) is accounted for by creating a drainage package.
    
    # Checklist
    <!---
    Before requesting review, please go through this checklist:
    -->
    
    - [x] Links to correct issue
    - [ ] 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
    
    ---------
    
    Co-authored-by: Joeri van Engelen <[email protected]>
    luitjansl and JoerivanEngelen authored Jun 7, 2024
    Configuration menu
    Copy the full SHA
    047f545 View commit details
    Browse the repository at this point in the history

Commits on Jun 14, 2024

  1. Issue #1052 log filtered wells (#1067)

    Fixes #1052 
    
    # Description
    when importing wells from imod5: If not all wells could be assigned to
    the modflow6 model (this can be due to inactive cells,
    or due to constraints of minimum thickness/permeability) then a log
    message will be generated to document in the log
    file that not all wells were successfully imported. 
    
    # 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
    
    ---------
    
    Co-authored-by: Joeri van Engelen <[email protected]>
    luitjansl and JoerivanEngelen authored Jun 14, 2024
    Configuration menu
    Copy the full SHA
    04ec40a View commit details
    Browse the repository at this point in the history
  2. Issue #502 hfb import (#1070)

    Fixes #502 
    
    # Description
    Converts hfb's from imod5 to mf6, but only in the following cases:
    
    - the hfb has an assgined layer that is not zero
    - the hfb is mappable to the LayeredHorizontalFlowBarrierResistance
    class.
    
    It creates a single mf6 hfb package containing all the hfb's that are
    present in the model domain area.
    The hfb package is added to the simulation. 
    
    # Checklist
    
    - [X] Links to correct issue
    - [ ] 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
    
    ---------
    
    Co-authored-by: Joeri van Engelen <[email protected]>
    luitjansl and JoerivanEngelen authored Jun 14, 2024
    Configuration menu
    Copy the full SHA
    f2e70aa View commit details
    Browse the repository at this point in the history

Commits on Jun 18, 2024

  1. Issue #502 hfb import (#1078)

    Follow-up on: #1070
    
    # Description
    For some reason, I erronously merged #1070. This implements my
    suggestion to concatenate pandas dataframes.
    
    # Checklist
    <!---
    Before requesting review, please go through this checklist:
    -->
    
    - [x] Links to correct issue
    - [ ] Update changelog, if changes affect users
    - [x] PR title starts with ``Issue #nr``, e.g. ``Issue #737``
    - [ ] Unit tests were added
    - [ ] **If feature added**: Added/extended example
    
    ---------
    
    Co-authored-by: luitjan <[email protected]>
    JoerivanEngelen and luitjansl authored Jun 18, 2024
    Configuration menu
    Copy the full SHA
    2e7bc85 View commit details
    Browse the repository at this point in the history

Commits on Jun 26, 2024

  1. Merge branch 'master' into imod5_converter_feature_branch

    # Conflicts:
    #	docs/api/changelog.rst
    #	imod/mf6/dis.py
    #	imod/mf6/drn.py
    #	imod/mf6/ic.py
    #	imod/mf6/npf.py
    #	imod/mf6/oc.py
    #	imod/mf6/package.py
    #	imod/mf6/rch.py
    #	imod/mf6/riv.py
    #	imod/mf6/sto.py
    #	pixi.lock
    luitjansl committed Jun 26, 2024
    Configuration menu
    Copy the full SHA
    a32ec42 View commit details
    Browse the repository at this point in the history
  2. Merge branch 'master' into imod5_converter_feature_branch

    # Conflicts:
    #	pixi.lock
    luitjansl committed Jun 26, 2024
    Configuration menu
    Copy the full SHA
    90b245d View commit details
    Browse the repository at this point in the history
  3. issue #1083 duplicate wells (#1086)

    Fixes #1083 
    
    # Description
    When importing wells, we now make sure that when the ipf file defines 2
    or more wells with the same x, y , filter_top, filter_bottom and id,
    then the ID of the second well is appended with "_1", and so on for
    successive findings of a well with the same characteristics (_2, _3
    etc).
    
    # Checklist
    
    - [X] Links to correct issue
    - [ ] 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
    luitjansl authored Jun 26, 2024
    Configuration menu
    Copy the full SHA
    9f274bd View commit details
    Browse the repository at this point in the history
  4. Issue #1064 wel from imod (#1066)

    Fixes #1064 
    
    # Description
    Imports wells as grid-agnostic well packages, based on filter top and
    filter bottom, and x/y location as stated in the imod5_dataset object.
    
    # Checklist
    - [X] Links to correct issue
    - [ ] 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
    
    ---------
    
    Co-authored-by: Joeri van Engelen <[email protected]>
    luitjansl and JoerivanEngelen authored Jun 26, 2024
    Configuration menu
    Copy the full SHA
    879d521 View commit details
    Browse the repository at this point in the history

Commits on Jun 28, 2024

  1. Issue #966 chd import or shd (#1088)

    Fixes #966
    
    # Description
    Imports chd packages present in imod5_data. These packages are imported
    one by one. If none are present, then a chd package is created at all
    locations where ibound == -1. In that case the starting head of the
    simulation is assigned as the chd value for each cell with ibound == -1.
    
    # Checklist
    - [X] Links to correct issue
    - [ ] 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
    luitjansl authored Jun 28, 2024
    Configuration menu
    Copy the full SHA
    36bc7a7 View commit details
    Browse the repository at this point in the history
  2. Issue #598 layered hfb error (#1089)

    Fixes #598
    
    # Description
    There was some confusion (also by me) about the use of the
    ``LayeredHorizontalFlowBarrier`` classes, so @HendrikKok explained me
    they were intended for single layers. I therefore changed the following
    to clarify:
    
    - Rename to ``SingleLayerHorizontalFlowBarrier`` classes
    - Throw ``ValidationError`` if multiple layers are added to dataset
    - Added missing test for SingleLayerHorizontalFlowBarrier class
    
    This means multiple SingleLayerHorizontalFlowBarrier need to be added to
    GroundwaterFlowModel object, whereas MODFLOW 6 only accepts one single
    HFB. So these have to be merged together. I think the best opportunity
    for this is to merge the low level ``Mf6HorizontalFlowBarrier`` objects.
    
    # 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
    JoerivanEngelen authored Jun 28, 2024
    Configuration menu
    Copy the full SHA
    0da466a View commit details
    Browse the repository at this point in the history

Commits on Jul 3, 2024

  1. Issue #1090 merge mf6hfb (#1093)

    Fixes #1090
    
    # Description
    This changeset implements the following:
    - Renames LayeredHorizontalFlowBarrier to
    SingleLayerHorizontalFlowBarrier
    - Moves duplictate logic into ``Package._from_dataset`` to construct
    package from a dataset
    - Adds function to merge multiple HFBs into a low-level single hfb mf6
    adapter
    - Collect HFB packages into single list ``Model.write()`` and merge them
    with function
    - ``_prepare_barrier_dataset_for_mf6_adapter`` function to prepare some
    required coordinate differences
    
    # Checklist
    <!---
    Before requesting review, please go through this 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
    JoerivanEngelen authored Jul 3, 2024
    Configuration menu
    Copy the full SHA
    41dac1c View commit details
    Browse the repository at this point in the history

Commits on Jul 4, 2024

  1. Issue #1058 period bounds (#1098)

    Fixes #1058 
    
    # Description
    When importing models from imod5 we want to import the period data as
    well- specifically for ghb, drn and riv.
    This PR implements importing period data for these packages. 
    Moved the function expand_repetitions to make it accessible from the
    packages that use it.
    
    
    # Checklist
    
    
    - [X] Links to correct issue
    - [ ] 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
    luitjansl authored Jul 4, 2024
    Configuration menu
    Copy the full SHA
    5ceb19b View commit details
    Browse the repository at this point in the history

Commits on Jul 9, 2024

  1. Configuration menu
    Copy the full SHA
    d928d63 View commit details
    Browse the repository at this point in the history

Commits on Jul 11, 2024

  1. added logging and error messages for well import when (#1104)

    Fixes #1095 
    
    # Description
    This PR adds logging to well import if the well was assigned to a layer.
    This layer will not be used and the user is informed of that in the log.
    If the filter_top and filter_bottom properties are not present in the
    imported dataset, both a log message and an exception is generated, as
    we can't import the well with this information missing
    
    # Checklist
    
    
    - [X] Links to correct issue
    - [ ] 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
    luitjansl authored Jul 11, 2024
    Configuration menu
    Copy the full SHA
    e2d1270 View commit details
    Browse the repository at this point in the history
  2. Configuration menu
    Copy the full SHA
    86abf01 View commit details
    Browse the repository at this point in the history

Commits on Jul 12, 2024

  1. Issue #1091 from_imod5_data using regrid_cache (#1105)

    Fixes #1091
    
    # Description
    -the regrid_context was renamed to regrid_cache 
    -we can now pass regridder settings to the from_imod5 import functions
    for simulation, model and packages
    -added tests.
    
    # Checklist
    - [X] Links to correct issue
    - [ ] Update changelog, if changes affect users
    - [ ] PR title starts with ``Issue #nr``, e.g. ``Issue #737``
    - [X] Unit tests were added
    - [ ] **If feature added**: Added/extended example
    luitjansl authored Jul 12, 2024
    Configuration menu
    Copy the full SHA
    bc43915 View commit details
    Browse the repository at this point in the history

Commits on Jul 15, 2024

  1. Configuration menu
    Copy the full SHA
    a0deefb View commit details
    Browse the repository at this point in the history

Commits on Jul 18, 2024

  1. Configuration menu
    Copy the full SHA
    46de1c1 View commit details
    Browse the repository at this point in the history
  2. Issue #1112 mypy (#1113)

    Fixes #1112 
    
    # Description
    solves mypy issues on the feature branch
    
    # Checklist
    
    - [X] Links to correct issue
    - [ ] Update changelog, if changes affect users
    - [ ] PR title starts with ``Issue #nr``, e.g. ``Issue #737``
    - [ ] Unit tests were added
    - [ ] **If feature added**: Added/extended example
    luitjansl authored Jul 18, 2024
    Configuration menu
    Copy the full SHA
    53d5c86 View commit details
    Browse the repository at this point in the history
  3. Issue #1068 average well rate timeseries (#1102)

    Fixes #1068 
    
    # Description
    Implements averaging of well rate timeseries onto a set of desired
    times. The imported well will have rate changes at these desired times.
    This can be both finer and coarser than the input timeseries. These
    times do not need to be equidistant.
    With this fix, when importing a project from imod5 data, we first choose
    the output temporal discretization, and the
    well timeseries on output contain these times only.
    
    # Checklist
    <!---
    Before requesting review, please go through this checklist:
    -->
    
    - [X] Links to correct issue
    - [ ] 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
    
    ---------
    
    Co-authored-by: Joeri van Engelen <[email protected]>
    luitjansl and JoerivanEngelen authored Jul 18, 2024
    Configuration menu
    Copy the full SHA
    c60acb3 View commit details
    Browse the repository at this point in the history

Commits on Jul 25, 2024

  1. Issue #678 hfb varying top bot (#1100)

    Fixes #678 
    
    # Description
    Support horizontal flow barriers with varying ztop and zbottom. Data is
    set up as vertical polygons, which is also what
    ``imod.formats.gen.read_gen()`` returns. The implementation is based on
    ``imod.formats.prj.disv_converter``. When we fix the wells, we are
    feature complete and the ``disv_converter`` can be removed.
    
    The use of the vertical dimension means a change in the public API: No
    longer are the "ztop" and "zbottom" variables in the geodataframe used.
    Setting up these vertical polygons from scratch is a bit of a hassle, so
    we could add some utility functions to help setting these up, in a later
    PR.
    
    # 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
    - [x] **If feature added**: Added/extended example
    JoerivanEngelen authored Jul 25, 2024
    Configuration menu
    Copy the full SHA
    2a3599b View commit details
    Browse the repository at this point in the history

Commits on Jul 26, 2024

  1. Issue #1092 merge chd (#1118)

    Fixes #1092 
    
    # Description
    On import, chd packages that were split over layers are merged into a
    single chd package if the names of these packages are
    "chd-x" where x is a layer number. 
    A function for this was added to mf6/utilities and not in the chd
    package to keep it hidden from users.
    
    # Checklist
    
    - [X] Links to correct issue
    - [ ] 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
    
    ---------
    
    Co-authored-by: Joeri van Engelen <[email protected]>
    luitjansl and JoerivanEngelen authored Jul 26, 2024
    Configuration menu
    Copy the full SHA
    0f8a58c View commit details
    Browse the repository at this point in the history
  2. Issue #1045 ghb allocation (#1119)

    Fixes #1045
    
    # Description
    Enables using allocation options when importing a ghb from imod5 and it
    is planar (layer=0)
    
    # Checklist
    
    - [X] Links to correct issue
    - [ ] 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
    
    ---------
    
    Co-authored-by: Joeri van Engelen <[email protected]>
    luitjansl and JoerivanEngelen authored Jul 26, 2024
    Configuration menu
    Copy the full SHA
    506020d View commit details
    Browse the repository at this point in the history

Commits on Jul 29, 2024

  1. Issue #1122 layered well from imod5 data (#1123)

    Fixes #1122, should be merged after
    #1121 (so duplication in
    changeset)
    
    # Description
    Adds ``from_imod5_data`` method to ``LayeredWell`` object.
    
    # 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
    - [x] **If feature added**: Added/extended example
    JoerivanEngelen authored Jul 29, 2024
    Configuration menu
    Copy the full SHA
    820e92f View commit details
    Browse the repository at this point in the history
  2. Issue #1122 review comments (#1128)

    Forgot to push fixes for review comments, this impelements this
    JoerivanEngelen authored Jul 29, 2024
    Configuration menu
    Copy the full SHA
    b95291d View commit details
    Browse the repository at this point in the history

Commits on Aug 1, 2024

  1. Issue #1120 import steady state lhm fixes (#1127)

    Fixes #1120
    
    # Description
    this PR contains fixes made to be able to import a version of the LHM
    that is steady state.
    **Probably not all these changes should be merged. The review should
    reveal what to keep and what not.**
    
    Changes:
    -sto package can be absent in the imod5 project file. If that is the
    case, now a default sto package is made which imposes steady state.
    -rch package can now be absent in the project file. Then no recharge is
    present in the simulation.
    - allocation option and distribution option for river imports were hard
    coded to different defaults . The old defaults gave an error, which
    could be a new issue in itself.
    -also for GHB a new default was set, because the old one gave an error.
    This could be a new issue in itself.
    
    
    # Checklist
    
    
    - [X] Links to correct issue
    - [ ] 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
    
    ---------
    
    Co-authored-by: Joeri van Engelen <[email protected]>
    luitjansl and JoerivanEngelen authored Aug 1, 2024
    Configuration menu
    Copy the full SHA
    77adae9 View commit details
    Browse the repository at this point in the history

Commits on Aug 8, 2024

  1. Issue #1139 apply factor and addition (#1140)

    Fixes #1139 
    
    # Description
    Loading project files turned out to be a time-sink for project file
    imports- especially when loading prj-file data with transient arrays
    such as chd-levels per timestep.
    These arrays were loaded in a function called
    "apply_factor_and_addition" which accounted for the fact that the user
    can specify a factor to multiply each array and a constant to add to it.
    These 2 (factor and addition) can be different for every timestep.
    Now they are applied at an earlier stage, when loading the ipf data. 
    
    No new tests were added, because the tests in test_import_prj.py already
    test the application of factors and additions. (this PR is for improving
    performance and not changing behavior)
    
    # Checklist
    <!---
    Before requesting review, please go through this checklist:
    -->
    
    - [x] Links to correct issue
    - [ ] Update changelog, if changes affect users
    - [x] PR title starts with ``Issue #nr``, e.g. ``Issue #737``
    - [ ] Unit tests were added
    - [ ] **If feature added**: Added/extended example
    luitjansl authored Aug 8, 2024
    Configuration menu
    Copy the full SHA
    aa2f184 View commit details
    Browse the repository at this point in the history

Commits on Aug 15, 2024

  1. 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
    JoerivanEngelen authored Aug 15, 2024
    Configuration menu
    Copy the full SHA
    a230bc9 View commit details
    Browse the repository at this point in the history

Commits on Aug 16, 2024

  1. Issue #1132 performance hfb (#1157)

    Fixes #1132 
    
    # Description
    This PR adds the following:
    
    - Increase performance for writing the HFB files, by using new xugrid
    create_snap_to_grid_dataframe.
    - Fixes error when multiple barriers in a single dataset would be
    snapped to same edge. These lines are now aggregated.
    - Add some basic infrastructure for user acceptance test for writing
    LHM, the path to the LHM projectfile should be set in a .env as LHM_PRJ.
    This can later be extended to TeamCity.
    
    This reduces the time spent writing the HFB packages from 34 minutes to
    12.5 minutes on my local machine. I've profiled the causes of the
    remaining bottlenecks to writing. I'll post a follow-up issue for that.
    
    # 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
    JoerivanEngelen authored Aug 16, 2024
    Configuration menu
    Copy the full SHA
    4f3b716 View commit details
    Browse the repository at this point in the history

Commits on Aug 20, 2024

  1. Issue #1158 remaining hfb bottlenecks (#1159)

    Fixes #1158 
    
    # Description
    Fix remaining HFB bottlenecks. This reduces writing the HFB package from
    the LHM from 12.5 minutes to 2 minutes.
    
    - Cache results ``xu.Ugrid2d.from_structured``, as this is a costly
    operation
    - Use ``and`` instead of ``&`` operator in the ``scalar_None`` function,
    to enable shortcutting.
    - Remove ``mask_all_packages`` function in ``from_imod5_data``, call in
    tests.
    - Create separate pixi task for slow unittests, where just in time
    compilation is enabled. ``pixi run unittests`` still runs all unittests,
    by starting two pixi tasks ``unittests_njit`` & ``unittests_jit``.
    
    # 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
    JoerivanEngelen authored Aug 20, 2024
    Configuration menu
    Copy the full SHA
    ccf9f21 View commit details
    Browse the repository at this point in the history

Commits on Aug 23, 2024

  1. Issue #1166 steady state well import (#1169)

    Fixes #1166 and somewhat fixes #1163
    
    # Description
    - Moves ``pd.to_datetime`` logic to separate place, use
    ``errors="coerce"`` setting, which turns datetimes beyond the year 2261
    to ``pd.NaT``. These seem to be consequently ignored in the
    ``resample_timeseries``.
    - Truncate well names to max 16 characters
    - Support wells defined in "steady-state" entry in the projectfile.
    - Add test cases for this.
    
    # Checklist
    - [x] Links to correct issue
    - [ ] 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
    JoerivanEngelen authored Aug 23, 2024
    Configuration menu
    Copy the full SHA
    546ad47 View commit details
    Browse the repository at this point in the history

Commits on Sep 3, 2024

  1. Issue #1164 cleanup utils (#1172)

    Fixes #1164
    
    
    # Description
    This implements the following cleanup utilities for the robin boundary
    conditions, namely the DRN, GHB, and RIV.
    
    - Cleanup helper functions, which are part of the public API (so that
    people could also use them outside MODFLOW 6)
    - Cleanup methods to the River, GeneralHeadBoundary, Drain package for
    convenience. These call the corresponding helper function. Save the user
    the hassle of manually finding the right arguments to clean up grids.
    - Add a utility method: Call function on grids, which separates grid
    variables from settings, calls a function on them, and then merges these
    dicts again.
    - Converted the fixtures in ``test_mf6_riv`` to regular functions, as
    they were used as such anyway. Without this, RivDisCases could not be
    used outside the ``test_mf6_riv`` module, now it can be imported.
    
    # Checklist
    <!---
    Before requesting review, please go through this 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
    JoerivanEngelen authored Sep 3, 2024
    Configuration menu
    Copy the full SHA
    20e4bc2 View commit details
    Browse the repository at this point in the history

Commits on Sep 5, 2024

  1. Configuration menu
    Copy the full SHA
    2d7e4d0 View commit details
    Browse the repository at this point in the history

Commits on Sep 9, 2024

  1. Configuration menu
    Copy the full SHA
    6b3641e View commit details
    Browse the repository at this point in the history
  2. Issue #1176 assign wells with point filters (#1186)

    Fixes #1176 
    
    # Description
    
    - Assign wells with point filters (filters with a zero length) to
    layers. Before, these would be removed in the compute_overlap method.
    - Add test case for wells with a point filter
    - Set validation so that screen_top can equal screen_bottom
    - Rename vague variable name "df" to "df_factor"
    
    # Checklist
    <!---
    Before requesting review, please go through this 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
    
    ---------
    
    Co-authored-by: Sunny Titus <[email protected]>
    JoerivanEngelen and Manangka authored Sep 9, 2024
    Configuration menu
    Copy the full SHA
    fa2fcfc View commit details
    Browse the repository at this point in the history

Commits on Sep 11, 2024

  1. Configuration menu
    Copy the full SHA
    4c947f8 View commit details
    Browse the repository at this point in the history
  2. Issue #1187 cleanup wells (#1206)

    Fixes #1187
    
    # Description
    Adds cleanup utility for wells, as well as a method on the ``Well``
    object. ``LayeredWell`` doesn't have ``cleanup`` method yet, as cleaning
    up almost purely focuses on adjusting filter screen levels for now. The
    function as well as the method are a bit more involved than the other
    cleanup utilities, because we are dealing here with a comparison of
    point data and grids.
    
    # 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
    JoerivanEngelen authored Sep 11, 2024
    Configuration menu
    Copy the full SHA
    657a0a8 View commit details
    Browse the repository at this point in the history

Commits on Sep 16, 2024

  1. Configuration menu
    Copy the full SHA
    0a16bdc View commit details
    Browse the repository at this point in the history

Commits on Sep 17, 2024

  1. Issue #1216 iMOD5 convert RCH unit (#1217)

    Fixes #1216 
    
    # Description
    iMOD5 interprets recharge rate in mm/d, whereas MODFLOW6 is unit
    consistent, and thus uses m/d.
    This PR adds a conversion function to do that. I updated the tests to
    also test if this conversion is done.
    
    # Checklist
    - [x] Links to correct issue
    - [ ] 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
    JoerivanEngelen authored Sep 17, 2024
    Configuration menu
    Copy the full SHA
    a25ea77 View commit details
    Browse the repository at this point in the history
  2. Issue #1210 dissappearing rivs (#1213)

    Fixes #1210 
    
    # Description
    This PR modifies the allocation and conductance distribution methods somewhat, to allow boundary
    conditions to be allocated to the first model layer when located above
    model top. This is similar to how iMOD5 does these things.
    
    # 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
    JoerivanEngelen authored Sep 17, 2024
    Configuration menu
    Copy the full SHA
    2a6133c View commit details
    Browse the repository at this point in the history
  3. Configuration menu
    Copy the full SHA
    bf5e9be View commit details
    Browse the repository at this point in the history
  4. Issue #1209 bypass value error well assign (#1211)

    Fixes #1209
    
    # Description
    - Add setting to ``to_mf6_pkg``: ``error_on_well_removal``, which throws
    an error if wells are removed entirely during well assignment.
    - Separated code to collect filtered well ids in separate method. This
    method is now also called to collect ids of errors being removed in
    error message.
    - Added attribute ``_is_from_imod5`` to Modflow6Simulation to keep track
    if the simulation is loaded from iMOD5 data or not. Based on this, some
    validation settings might be set to be a bit more permissive. (Or call
    some extra cleanup?)
    - ``is_from_imod5`` property to WriteContext to keep track of the same
    thing within the writing context.
    
    # 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
    JoerivanEngelen authored Sep 17, 2024
    Configuration menu
    Copy the full SHA
    fe1c630 View commit details
    Browse the repository at this point in the history

Commits on Sep 18, 2024

  1. Issue #1222 validation context (#1226)

    Fixes #1222
    
    # Description
    - Add a ``ValidationContext`` dataclass
    - Add a ``_validation_context`` attribute to ``Modflow6Simulation``;
    this replaces the ``_is_from_imod5`` attribute.
    - The ``ValidationContext`` contains an attribute for strict well
    checks, turned on by default. This is set to False when calling
    ``from_imod5`` or for split simulations.
    - Adds a ``_to_mf6_pkg`` method in a similar design as proposed in
    #1223, this to preserve public API.
    - Refactor ``WriteContext``, to make it a dataclass again. I had to
    ignore type annotation for ``write_directory``, otherwise MyPy would
    throw errors. The whole property shebang presumably started with MyPy
    throwing errors. Reverting it back to a dataclass reduces the lines of
    code considerably, which makes it more maintainable.
    - Use jit for examples run, this speeds them up considerably. The
    examples ran into a TimeOut on TeamCity, and this reduces the change of
    that happening again.
    
    # Checklist
    <!---
    Before requesting review, please go through this checklist:
    -->
    
    - [x] Links to correct issue
    - [x] Update changelog, if changes affect users
    - [x] PR title starts with ``Issue #nr``, e.g. ``Issue #737``
    - [ ] Unit tests were added
    - [ ] **If feature added**: Added/extended example
    JoerivanEngelen authored Sep 18, 2024
    Configuration menu
    Copy the full SHA
    46c2e85 View commit details
    Browse the repository at this point in the history
  2. Configuration menu
    Copy the full SHA
    64a7134 View commit details
    Browse the repository at this point in the history
  3. Configuration menu
    Copy the full SHA
    4562fd3 View commit details
    Browse the repository at this point in the history

Commits on Sep 24, 2024

  1. update Sprinkling class

    HendrikKok committed Sep 24, 2024
    Configuration menu
    Copy the full SHA
    cd7d7da View commit details
    Browse the repository at this point in the history

Commits on Oct 2, 2024

  1. force to float64

    HendrikKok committed Oct 2, 2024
    Configuration menu
    Copy the full SHA
    fa854cb View commit details
    Browse the repository at this point in the history

Commits on Nov 14, 2024

  1. Configuration menu
    Copy the full SHA
    ee1bfdc View commit details
    Browse the repository at this point in the history
  2. fix typo

    HendrikKok committed Nov 14, 2024
    Configuration menu
    Copy the full SHA
    edb443d View commit details
    Browse the repository at this point in the history