Commit 4b599fc
authored
Added Foundational Hydrology Tools (#921)
* Add D8 flow direction module: foundational hydrology operation
Implements D8 flow direction using ESRI power-of-2 encoding (compatible
with GDAL/ArcGIS) across all four backends (numpy, cupy, dask+numpy,
dask+cupy). Follows the slope.py pattern with explicit cellsize-
parameterized backend wrappers.
New files:
- xrspatial/flow_direction.py — CPU kernel (@ngjit), GPU device/global
kernels, four backend wrappers, public API with @supports_dataset
- xrspatial/tests/test_flow_direction.py — 66 tests (flat, cardinal,
diagonal, known bowl, NaN handling, cross-backend, boundary modes,
dtype acceptance, dataset support, cellsize effect, valid codes)
- benchmarks/benchmarks/flow_direction.py — ASV benchmark
Modified files:
- xrspatial/__init__.py — export flow_direction
- xrspatial/accessor.py — add Hydrology section to both accessors
- README.md — add Hydrology section with Flow Direction entry
* Add stream order module: Strahler and Shreve ordering of drainage networks
* Add BoundaryStore: memmap-backed boundary strip storage for dask tile sweeps
* Add D8 flow accumulation module with iterative dask tile sweep
* Add depression fill module using Planchon-Darboux iterative flooding
* Add sink identification module with connected-component labeling
* Add watershed delineation and drainage basin labeling module
* Add hydrology table entries to README, fix minor docstring wording
* Add standalone basin module, fix BoundaryStore temp file leaks
Extract basin delineation from watershed.py into its own basin.py
module with a basin() public function. The old basins() stays as a
backward-compatible wrapper. Add basin to __init__.py and both
xarray accessors.
Add BoundarySnapshot to _boundary_store.py -- a read-only in-memory
copy of converged boundary strips. BoundaryStore.snapshot() copies
strip data to plain numpy arrays and closes the underlying memmap
temp files. Apply this pattern across all hydrology dask backends
(flow_accumulation, watershed, fill, stream_order) so temp
directories are cleaned up before the lazy dask result is returned.
Previously, BoundaryStore objects captured in map_blocks closures
kept temp files alive indefinitely.
* Add stream link segmentation module with all four backends
Assigns unique position-based IDs to each stream segment between
junctions, headwaters, and outlets. Supports numpy, cupy, dask+numpy,
and dask+cupy backends.
* Add snap pour point module with all four backends
Moves each pour point to the highest flow-accumulation cell within a
circular search radius so that watershed delineation starts from the
actual drainage channel. Dask backend extracts sparse pour points
chunk-by-chunk (map_blocks flag pass + selective load) to keep memory
bounded regardless of grid size.
* Add flow path tracing module with all four backends
* Add D-infinity flow direction module with all four backends
* Fix flow_path Dask OOM: vectorized chunk grouping, numpy buffers, adaptive cache
Replace three memory/performance bottlenecks in _flow_path_dask:
- Path tracing (phase 3): growable numpy buffers (~24 bytes/cell)
instead of list-of-tuples (~164 bytes/cell)
- Output assembly (phase 4): pre-group cells by chunk via vectorized
searchsorted + stable argsort, then O(1) dict lookup per block
instead of O(n_chunks * n_cells) linear scan
- LRU cache: adaptive sizing capped at ~512 MB instead of fixed 32
entries regardless of chunk size
* Add flow length, TWI, and HAND modules with tests and notebook
* Add benchmarks for flow_length, TWI, and HAND1 parent 80e073f commit 4b599fc
File tree
41 files changed
+14006
-2
lines changed- benchmarks/benchmarks
- examples/user_guide
- xrspatial
- tests
Some content is hidden
Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.
41 files changed
+14006
-2
lines changed| Original file line number | Diff line number | Diff line change | |
|---|---|---|---|
| |||
239 | 239 | | |
240 | 240 | | |
241 | 241 | | |
| 242 | + | |
| 243 | + | |
| 244 | + | |
| 245 | + | |
| 246 | + | |
| 247 | + | |
| 248 | + | |
| 249 | + | |
| 250 | + | |
| 251 | + | |
| 252 | + | |
| 253 | + | |
| 254 | + | |
| 255 | + | |
| 256 | + | |
| 257 | + | |
242 | 258 | | |
243 | 259 | | |
244 | 260 | | |
| |||
| Original file line number | Diff line number | Diff line change | |
|---|---|---|---|
| |||
| 1 | + | |
| 2 | + | |
| 3 | + | |
| 4 | + | |
| 5 | + | |
| 6 | + | |
| 7 | + | |
| 8 | + | |
| 9 | + | |
| 10 | + | |
| 11 | + | |
| 12 | + | |
| 13 | + | |
| 14 | + | |
| 15 | + | |
| 16 | + | |
| 17 | + | |
| 18 | + | |
| 19 | + | |
| 20 | + | |
| 21 | + | |
| 22 | + | |
| 23 | + | |
| 24 | + | |
| 25 | + | |
| 26 | + | |
| 27 | + | |
| 28 | + | |
| Original file line number | Diff line number | Diff line change | |
|---|---|---|---|
| |||
| 1 | + | |
| 2 | + | |
| 3 | + | |
| 4 | + | |
| 5 | + | |
| 6 | + | |
| 7 | + | |
| 8 | + | |
| 9 | + | |
| 10 | + | |
| 11 | + | |
| Original file line number | Diff line number | Diff line change | |
|---|---|---|---|
| |||
| 1 | + | |
| 2 | + | |
| 3 | + | |
| 4 | + | |
| 5 | + | |
| 6 | + | |
| 7 | + | |
| 8 | + | |
| 9 | + | |
| 10 | + | |
| 11 | + | |
| 12 | + | |
| 13 | + | |
| 14 | + | |
| 15 | + | |
| 16 | + | |
| 17 | + | |
| 18 | + | |
| 19 | + | |
| 20 | + | |
| 21 | + | |
| 22 | + | |
| 23 | + | |
| 24 | + | |
| 25 | + | |
| 26 | + | |
| 27 | + | |
| 28 | + | |
| 29 | + | |
| 30 | + | |
| 31 | + | |
| Original file line number | Diff line number | Diff line change | |
|---|---|---|---|
| |||
| 1 | + | |
| 2 | + | |
| 3 | + | |
| 4 | + | |
| 5 | + | |
| 6 | + | |
| 7 | + | |
| 8 | + | |
| 9 | + | |
| 10 | + | |
| 11 | + | |
| 12 | + | |
| 13 | + | |
| 14 | + | |
| 15 | + | |
| 16 | + | |
| 17 | + | |
| 18 | + | |
| 19 | + | |
| 20 | + | |
| 21 | + | |
| 22 | + | |
| 23 | + | |
| 24 | + | |
| 25 | + | |
| 26 | + | |
| 27 | + | |
| 28 | + | |
| 29 | + | |
| 30 | + | |
| 31 | + | |
| Original file line number | Diff line number | Diff line change | |
|---|---|---|---|
| |||
| 1 | + | |
| 2 | + | |
| 3 | + | |
| 4 | + | |
| 5 | + | |
| 6 | + | |
| 7 | + | |
| 8 | + | |
| 9 | + | |
| 10 | + | |
| 11 | + | |
| 12 | + | |
| 13 | + | |
| 14 | + | |
| 15 | + | |
| 16 | + | |
| 17 | + | |
| 18 | + | |
| 19 | + | |
| 20 | + | |
| 21 | + | |
| 22 | + | |
| 23 | + | |
| 24 | + | |
| 25 | + | |
| 26 | + | |
| 27 | + | |
| 28 | + | |
| 29 | + | |
| 30 | + | |
| Original file line number | Diff line number | Diff line change | |
|---|---|---|---|
| |||
| 1 | + | |
| 2 | + | |
| 3 | + | |
| 4 | + | |
| 5 | + | |
| 6 | + | |
| 7 | + | |
| 8 | + | |
| 9 | + | |
| 10 | + | |
| 11 | + | |
| 12 | + | |
| 13 | + | |
| 14 | + | |
| 15 | + | |
| 16 | + | |
| 17 | + | |
| 18 | + | |
| 19 | + | |
| 20 | + | |
| 21 | + | |
| 22 | + | |
| 23 | + | |
| 24 | + | |
| 25 | + | |
| 26 | + | |
| 27 | + | |
| 28 | + | |
| 29 | + | |
| 30 | + | |
| 31 | + | |
| 32 | + | |
| 33 | + | |
| 34 | + | |
| 35 | + | |
| 36 | + | |
| 37 | + | |
| 38 | + | |
| 39 | + | |
| 40 | + | |
| 41 | + | |
| 42 | + | |
| 43 | + | |
| 44 | + | |
| 45 | + | |
| 46 | + | |
| 47 | + | |
| 48 | + | |
| 49 | + | |
| 50 | + | |
| 51 | + | |
| 52 | + | |
| 53 | + | |
| 54 | + | |
| 55 | + | |
| 56 | + | |
| 57 | + | |
| 58 | + | |
| 59 | + | |
| 60 | + | |
| 61 | + | |
| 62 | + | |
| 63 | + | |
| 64 | + | |
Large diffs are not rendered by default.
| Original file line number | Diff line number | Diff line change | |
|---|---|---|---|
| |||
14 | 14 | | |
15 | 15 | | |
16 | 16 | | |
| 17 | + | |
| 18 | + | |
| 19 | + | |
| 20 | + | |
| 21 | + | |
| 22 | + | |
17 | 23 | | |
| 24 | + | |
18 | 25 | | |
19 | 26 | | |
20 | 27 | | |
| |||
31 | 38 | | |
32 | 39 | | |
33 | 40 | | |
| 41 | + | |
| 42 | + | |
| 43 | + | |
| 44 | + | |
34 | 45 | | |
35 | 46 | | |
36 | 47 | | |
| |||
39 | 50 | | |
40 | 51 | | |
41 | 52 | | |
| 53 | + | |
42 | 54 | | |
43 | 55 | | |
| 56 | + | |
| 57 | + | |
| 58 | + | |
44 | 59 | | |
45 | 60 | | |
46 | 61 | | |
| |||
0 commit comments