[ClaireDons]

Fixes #1952 , following on from #1953

(Github refuses to let me stack these PRs, I probably did something wrong)

Description

This is needed for porting the MKWELLIPF iMOD5 function properly (Deltares/iMOD-Suite-transition-regional-models#17) but can be useful more generally.

Main change is that a skipna flag was added to resample_timeseries() that skips NaN values and then takes weighted average rather the forward filling values. It's by default False, so default behaviour remains unchanged. While implementing this I also went around and refactored things a little (hopefully for the best). The other change is that if all values are nodata in average_timeseries(), then the rate is set to 0 rather than staying as NaN (which is consistent with iMOD5).

Remaining questions:

• Do we want this to continue to live in util or should it move somewhere else?
• Should GroundwaterFlowModel.from_imod5_data and Modflow6Simulation.from_imod5_data expose the flag?

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
• If feature added: Added feature to API documentation
• If pixi.lock was changed: Ran pixi run generate-sbom and committed changes

[JoerivanEngelen]

Thanks for cleaning this up, and clarifying the code, I think it is much more understandable now. I have 2 comments, one just to ease my mind. Approving in advance!

[sonarqubecloud]

Quality Gate passed

Issues
0 New issues
0 Accepted issues

Measures
0 Security Hotspots
0.0% Coverage on New Code
0.0% Duplication on New Code

See analysis details on SonarQube Cloud