Issue #1116 fix imod5 well import #1142
Merged
Conversation
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Fixes #1125 and #1136 # Description This PR adds: - ``open_projectfile_data`` now returns well data differently. They are now grouped by ipf name, with lists with the times, layers, multiplication and addition factors and dataframes. All error handling for faulty cases will be done in ``Well.from_imod5_data.`` - Test cases to test further developments on #1116. Tests calling ``from_imod5_data`` with a WEL defined in the projectfile will probably break now, as a different data object is returned now. These will be fixed in the follow-up issue #1137 # 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
Fixes #1137 # Description Updates ``from_imod5_data`` to accept data of ``open_projectfile_data`` in new form - Remove ``imod.formats.prj.disv_conversion`` as it is not used anymore, and all functionality in that is now covered by Simulation.from_imod5_data. - Ensure all well data is returned with column name "filt_top" and "filt_bot" (not "top" and "bottom"). We might be able to make this more consistent with the ``mf6`` module by naming it to ``screen_top`` and ``screen_bottom``? - Refactor the ``from_imod5_data`` to generalize this into GridAgnosticWell base class, reducing code duplication. - For this, add ``_imod5_depth_colnames`` and `` _depth_colnames`` attributes - Only resample timeseries when loading ipf with associated timeseries - Set unassociated wells when not specified in projectfile on requested timestamp to zero - Associated wells are forward filled in this case - Associated wells are validated for overlapping definitions with different additions, multiplications or same associated wells defined to two layers - Add extra test cases to ``imod/tests/test_formats/test_prj_wel.py`` - Use years in time domain of timeseries associated to ipfs in cases in ``imod/tests/test_formats/test_prj_wel.py`` - Add tests to load from_imod5_data with times within and outside well time range. # 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
changed the base branch from
master
to
imod5_converter_feature_branch
|
3 tasks
Closed
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
Fixes #1116
Description
open_projectfile_datanow groups wells by ipf nameGridAgnosticWell.from_imod5_datanow validates associated IPFs whether they meet our requirementsGridAgnosticWell.from_imod5_datadeactivates unassociated IPFs if not present in certain timestep anymoreChecklist
Issue #nr, e.g.Issue #737