Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Issue #1158 remaining hfb bottlenecks #1159

Merged
Changes from 1 commit
Commits
Show all changes
35 commits
Select commit Hold shift + click to select a range
5c4daa7
update to new xugrid version to allow aggregating hfbs
JoerivanEngelen Aug 13, 2024
3fa3ece
Update lockfile
JoerivanEngelen Aug 13, 2024
a0b091f
Add test to convert LHM
JoerivanEngelen Aug 13, 2024
66cc255
Add test with multiple linestrings
JoerivanEngelen Aug 13, 2024
2bb61cd
Call proper assert function
JoerivanEngelen Aug 14, 2024
5bc8fb1
Aggregate lines to edges
JoerivanEngelen Aug 14, 2024
386af3a
Move snapping and aggregation logic to separate function.
JoerivanEngelen Aug 14, 2024
8564f0c
format
JoerivanEngelen Aug 14, 2024
16ff403
Add function to enforce ugrid dataarays
JoerivanEngelen Aug 15, 2024
9cfe7f9
Better name
JoerivanEngelen Aug 15, 2024
cde947b
Further improve naming
JoerivanEngelen Aug 15, 2024
2573907
Apply enforce_uda function
JoerivanEngelen Aug 15, 2024
a301e7e
Make test to write HFBs work
JoerivanEngelen Aug 15, 2024
c13a8d2
Add LHM and a pixi task for user acceptance tests.
JoerivanEngelen Aug 16, 2024
5a24e8c
format
JoerivanEngelen Aug 16, 2024
7ce2d33
mark with "user_acceptance" instead "lhm"
JoerivanEngelen Aug 16, 2024
be20a24
update changelog
JoerivanEngelen Aug 16, 2024
b505b52
Also update mark in pytest ini options
JoerivanEngelen Aug 16, 2024
e28b4ee
Update geodataframe type, to avoid restricted pip installation failing.
JoerivanEngelen Aug 16, 2024
756120a
Ensure shortcut taken in and comparison and improve readability
JoerivanEngelen Aug 16, 2024
a3b922f
Remove automatic masking
JoerivanEngelen Aug 16, 2024
6f8cd6a
Cache from_structured grid
JoerivanEngelen Aug 16, 2024
f9ddb1b
format
JoerivanEngelen Aug 16, 2024
6334b72
Update changelog
JoerivanEngelen Aug 16, 2024
1366f76
Merge branch 'imod5_converter_feature_branch' into issue_#1158_remain…
JoerivanEngelen Aug 19, 2024
a80110b
Cache topology instead of dataarray
JoerivanEngelen Aug 19, 2024
b8fcf83
Add snap_to_grid test that got accidentily removed in merge again
JoerivanEngelen Aug 19, 2024
ceb49fa
In model cleanup in tests, add mask_all_models
JoerivanEngelen Aug 19, 2024
d7fd9fa
Separate slow unittests to separate task with jitting enabled
JoerivanEngelen Aug 19, 2024
2d0d5c7
Extend docstrings again that were accidentily removed during merging
JoerivanEngelen Aug 19, 2024
86a05f4
Make sure cache size is not exceeded and add method to clear cache
JoerivanEngelen Aug 19, 2024
4bef88d
format
JoerivanEngelen Aug 19, 2024
61e4752
Add unittests for as_ugrid_dataarray and grid cache
JoerivanEngelen Aug 19, 2024
999c90c
Fix code smells
JoerivanEngelen Aug 19, 2024
be685f1
Fix mypy error
JoerivanEngelen Aug 20, 2024
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
Prev Previous commit
Next Next commit
format
  • Loading branch information
JoerivanEngelen committed Aug 16, 2024
commit f9ddb1b4aa6608a32ad5eb39765683a6576951f8
1 change: 1 addition & 0 deletions imod/typing/grid.py
Original file line number Diff line number Diff line change
@@ -440,6 +440,7 @@ class GridCache:
Cache grids in this object for a specific function, lookup grids based on
unique geometry hash.
"""

def __init__(self, func: Callable, max_cache_size=5):
self.max_cache_size = max_cache_size
self.grid_cache: dict[int, GridDataArray] = {}