-
Notifications
You must be signed in to change notification settings - Fork 0
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
[WIP] Create quarter administration #360
Merged
Merged
Changes from 1 commit
Commits
Show all changes
17 commits
Select commit
Hold shift + click to select a range
42f59a1
Create quarter administration
martijn-siemerink e91585d
exclude groundwater
martijn-siemerink 5804e6c
info for tests.
martijn-siemerink 479646b
info for tests.
martijn-siemerink b580819
info for tests.
martijn-siemerink 13da203
info for tests.
martijn-siemerink c967451
info for tests.
martijn-siemerink ffcd00d
info for tests.
martijn-siemerink dbccf00
info for tests.
martijn-siemerink 9f944aa
info for tests.
martijn-siemerink 4095851
fix tests.
martijn-siemerink f3510bc
CHANGES.
martijn-siemerink cde80b1
CHANGES.
martijn-siemerink 688a7ab
CHANGES.
martijn-siemerink c3b0eae
requested changes from review.
martijn-siemerink 488568a
Improvements.
martijn-siemerink e013f3a
Merge branch 'master' into martijn-waterlevel-interpolation
martijn-siemerink File filter
Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
Next
Next commit
Create quarter administration
- Loading branch information
commit 42f59a12bb68ee70ae1bf89f415c677562ce17b1
There are no files selected for viewing
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
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
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
Original file line number | Diff line number | Diff line change |
---|---|---|
|
@@ -93,6 +93,9 @@ def _make_gridadmin( | |
node_id_counter, | ||
line_id_counter, | ||
) | ||
|
||
grid.set_quarter_administration(quadtree) | ||
|
||
dem_average_areas = db.get_dem_average_areas() | ||
grid.set_dem_averaged_cells(dem_average_areas) | ||
|
||
|
@@ -225,6 +228,7 @@ def make_gridadmin( | |
progress_callback: Optional[Callable[[float, str], None]] = None, | ||
upgrade: bool = False, | ||
convert_to_geopackage: bool = False, | ||
create_triangulation: bool = False, | ||
There was a problem hiding this comment. Choose a reason for hiding this commentThe reason will be displayed to describe this comment to others. Learn more. This is never used? |
||
): | ||
"""Create a Grid instance from sqlite and DEM paths | ||
|
||
|
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
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
Original file line number | Diff line number | Diff line change |
---|---|---|
@@ -0,0 +1,15 @@ | ||
from typing import Tuple | ||
from .array import Array | ||
|
||
__all__ = ["Quarters"] | ||
|
||
|
||
class Quarter: | ||
id: int | ||
line: Tuple[int, int] | ||
neighbour_node: Tuple[int, int] | ||
|
||
|
||
class Quarters(Array[Quarter]): | ||
"""Calculation quarters.""" | ||
pass |
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
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
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
Oops, something went wrong.
Oops, something went wrong.
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.
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
Some comments here explaining the logic would be nice I think.