Improve split layers ds #156
Merged
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
now also works for other variables now also works for vertex grids split_dict can contain layer names as keys, and values do not have to add up to 1 anymore split_reindexer in attrs contains layer names now First splitted layer gets _1 suffix Less code
For when da is in another crs For when grid-refinement is used
Can now also read data from "kusthoogte" and "vaklodingen" More options to get a specific time
fixes UserWarning: Transform that is non-rectilinear or with rotation found. Unable to recalculate.
And update some documentation
Also remove imod-dependency for generation of docs
|
This pull request is ready for review. Tests fail as the server of Riviereland is offline, and remaining codacy issue can be ignored. |
And add documentation And change timeout to 120 seconds in some places (from 1200 seconds)
OnnoEbbens
reviewed
Apr 6, 2023
| "# use imod's calculate_gxg method to calculate the GHG\n", | ||
| "gxg = imod.evaluate.calculate_gxg(head_structured.sel(layer=\"HLc\"))\n", | ||
| "# use nlmod's calculate_gxg method to calculate the GVG, GLG and GHG.\n", | ||
| "gxg = nlmod.evaluate.calculate_gxg(head.sel(layer=\"HLc\"))\n", |
There was a problem hiding this comment.
Je kan de calculate_gxg functie ook in de gwf.output module zetten.
There was a problem hiding this comment.
Modified in commit 2ca61f7
OnnoEbbens
reviewed
Apr 6, 2023
| @@ -206,7 +206,7 @@ def extrapolate_ds(ds, mask=None): | |||
| return ds | |||
| if mask.all(): | |||
| raise (Exception("The model only contains NaNs")) | |||
| if ds.gridtype == "vertex": | |||
| if "gridtype" in ds.attrs and ds.gridtype == "vertex": | |||
There was a problem hiding this comment.
Is de eerste check niet overbodig? Als de gridtype attribute niet aanwezig is in de ds krijg je nu een error bij het tweede deel ds.gridtype == "vertex" toch?
There was a problem hiding this comment.
nevermind, ik wist niet dat het tweede deel van de and niet wordt uitgevoerd als het eerste deel al False is
OnnoEbbens
approved these changes
Apr 6, 2023
And improve error logging
This was referenced Apr 11, 2023
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.
This pull request started with improving the split_layers method, but on top of that other improvements were made as well: