D8 routing #1633
Open
D8 routing #1633
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
3 tasks
emlys
commented
Jan 9, 2025
| @@ -337,15 +340,15 @@ class ManagedRaster { | |||
| } | |||
| }; | |||
|
|
|||
| template<class T> | |||
There was a problem hiding this comment.
This is a class template. ManagedFlowDirRaster is not a class, but ManagedFlowDirRasater<MFD> and ManagedFlowDirRasater<D8> are classes that can be created from this template.
emlys
commented
Jan 9, 2025
| ManagedFlowDirRaster() {} | ||
|
|
||
| ManagedFlowDirRaster(char* raster_path, int band_id, bool write_mode) | ||
| : ManagedRaster(raster_path, band_id, write_mode) {} | ||
|
|
||
| template<typename T_ = T, std::enable_if_t<std::is_same<T_, MFD>::value>* = nullptr> |
There was a problem hiding this comment.
This tells the compiler to use this implementation of is_local_high_point if the template argument is MFD. The same pattern is used in all the iterator classes below.
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.
Description
This PR implements D8 equivalents of the routing functions that previously only supported MFD.
A "routing algorithm" option input (MFD or D8) is added to each model. Based on that option, the appropriate pygeoprocessing routing functions are called. For the model-specific routing functions, I used C++ templates to implement switching between MFD and D8 "modes" on the iterator classes in ManagedRaster.h. To make it possible to call the templated functions, I rewrote the bulk of the SDR, NDR, and SWY routing functions from Cython to C++. I'm happy to discuss pros and cons of this.
Future work: add logging to python from C++ extensions, add templating for
ManagedRasterto read and return values of different data typesChecklist