Merged
Conversation
- add prt submodule with PRT packages (missing FMI at the moment)
- deprecate mpf, add ibound kwarg - add structured kwarg to pg_from_pd (needed for structured models)
- allow directly registering solution pkgs if model is passed - add EMS package
- add hash_xarray_coords() to compute hashes on coordinates - add hash_xarray_data_vars() to compute hashes on data arrays - optionally include metadata to hash, default is False - include NumpyEncoder to allow dumping numpy objects to json. - add an ugly fix to cast layer dtype to the one the cached dataset is using Co-authored-by: Bas des Tombe <bdestombe@gmail.com>
* Update regis.get_layer_names() to return pre 2.2.3 names * Renaming regis layer names if version > 2.2.3 If regis version would receive a small version bump, the origional code would crash. With the proposed changes less likely so. * formatting * Refactor get_layer_names function to accept dataset as an argument and streamline layer name assignment in get_regis function. * Remove unused import of 'get' from the arrow module in regis.py * Removed trainling white space
* add option to maken cross section animation with variable heads * remove logger and small fix * fix comments Davíd and add norm by default * remove animation from local grid refinement, add aniomation for Schoonhoven * remove comment * textual
And change `assert ds.gridtype == "structured"` to `assert is_structured(ds)`
Add PRT support
- usually not necessary but I think this was causing a weird error for me
Voronoi example
mini adjustment to ensure we get the right int in our modpath input
* Mutiple changes Add method `nlmod.grid.gdf_area_per_index_to_da' Replace `"angrot" in ds.attrs and ds.attrs["angrot"] != 0.0` by `is_rotated(ds_out)` in `nlmod.grid` Add docstring to `nlmod.time.dataframe_to_flopy_timeseries` Add `nlmod.plot.get_ahn_colormap` Add parameter `season_filename` to `nlmod.gwf.surface_water.gdf_to_seasonal_pkg` * Fix Codacy issues * Add docstring to `nlmod.plot.get_ahn_colormap` * Change some names
Add pathlib.Path to the list of supported types in _same_function_arguments for proper cache validation when Path objects are used as function arguments.
martinvonk
reviewed
Jul 18, 2025
| return lay * shape[1] * shape[2] + row * shape[2] + col | ||
|
|
||
|
|
||
| def get_node_vertex(lay, icell2d, shape): |
Collaborator
There was a problem hiding this comment.
missing docstring for parameters shape?
Collaborator
There was a problem hiding this comment.
Also, what is the shape for a vertex grid? Not (nrow, ncol) right?
Collaborator
Author
There was a problem hiding this comment.
It is (nlay, ncpl). The modflow manual uses ncpl to define the number of icell2d-cells. Added this to the docstring.
martinvonk
reviewed
Jul 18, 2025
nlmod/dims/grid.py
Outdated
| col : int | ||
| column number. | ||
| shape : tuple | ||
| shape of the model grid. |
Collaborator
There was a problem hiding this comment.
Maybe good to add a definition of the shape: (nrow, ncol)
Collaborator
Author
There was a problem hiding this comment.
it is (nlay, nrow, ncol) I think. Added this to the docstring
martinvonk
reviewed
Jul 18, 2025
| obs_ds["modellayer"].values = ds["layer"][ | ||
| obs_ds["modellayer"].astype(int) | ||
| ].values | ||
| elif drop_nan_layers: |
Collaborator
There was a problem hiding this comment.
maybe we can convert (i)layer to an int when we drop nans.
Collaborator
Author
There was a problem hiding this comment.
I do not really know what you mean by this. Let;s handle this later, I am afraid to break stuff now.
martinvonk
reviewed
Jul 18, 2025
nlmod/dims/time.py
Outdated
|
|
||
|
|
||
| def get_time_step_length(perlen, nstp, tsmult): | ||
| """Get the length of the timesteps within a singe stress-period. |
martinvonk
approved these changes
Jul 18, 2025
Collaborator
Author
|
All 26 remaining codacy issues cannot be solved, as most are not real issues. |
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
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
6 participants
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.
So with support for PRT and the renaming of all download-methods, I think it's time for a new version: 0.10.0.