Skip to content

Conversation

@JoerivanEngelen
Copy link
Contributor

@JoerivanEngelen JoerivanEngelen commented Aug 12, 2024

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

  • 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

@JoerivanEngelen JoerivanEngelen marked this pull request as ready for review August 12, 2024 16:20
@sonarqubecloud
Copy link

Quality Gate Failed Quality Gate failed

Failed conditions
5.4% Duplication on New Code (required ≤ 3%)
C Reliability Rating on New Code (required ≥ A)

See analysis details on SonarCloud

Catch issues before they fail your Quality Gate with our IDE extension SonarLint

Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment

Labels

None yet

Projects

None yet

Development

Successfully merging this pull request may close these issues.

3 participants