Issue #342 imod refactor primod update #352
Merged
+6,307
−3,188
Conversation
This file contains 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
* Temporarily install imod python from feature branch for feature development * Use Mf6Wel object instead of WellDisStructuredDis * Drop unused "layer" coord that was causing trouble * Set fill value to -1 for rasterio >=1.3.10 * Set dtype explicitly after imod-python update. Otherwise defaults to using the dtype of like, which is an integer. This causes problem for the fill value "nan" which the ribamod coupling depends on.
* * Provide wel at write instead of at init. * Derive Mf6Wel package from coupler dict * Use special method to get diskey, for future support of unstructured grids * Update test fixture and cases * Make sprinkling optional and improve function name. * Also fetch MF6 packages in RibaMetaMod * Move function to static method in a modflow mixin * Add unittest for get_mf6_pkgs_with_coupling_dict * Remove well arg from call to metaswap_model * Update remove sprinkling function, as initialization of Coupling object is not necessary anymore. * Better namespace of model mixin * Update docstring * Update internal variable name * Rename ModflowMixin to MetaModMixin, and rename to get_mf6_pkgs_for_metaswap
HendrikKok
approved these changes
Nov 13, 2024
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 #342
This PR merges the refactoring branch of MetaSWAP to main. You reviewed this work earlier.
The extra fixes I made with respect to #351 only are in the pixi.toml. What I did:
In #351, one test job for python 3.10 broke. This was because, pandas 2.0 is required for the ribasim test models, and for some reason, the installed pandas version was set back to 1.5 in the python 3.10 environment. I therefore forced pandas >2.0 in the
pixi.toml.Furthermore, I added pandera, as this was still missing, whereas it is quite essential in our dev environment, as ribasim python is built on top of it.