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.

Sign up for GitHub

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

D8 routing #1633

Merged
merged 35 commits into from
Jan 24, 2025
Merged

D8 routing #1633

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
35 commits
Select commit Hold shift + click to select a range
f5d7902
work in progress
emlys Sep 3, 2024
6e04d91
sdr tests passing with new c++ implementation
emlys Sep 6, 2024
d2be7bb
work in progress: D8 or MFD option for sediment deposition
emlys Sep 7, 2024
0989f89
sdr working with new 'algorithm' arg
emlys Sep 9, 2024
d3a8395
SDR D8 is working
emlys Sep 11, 2024
585364c
ndr C++ implementation appears to be working
emlys Sep 17, 2024
9d9d3d1
ndr C++ implementation working
emlys Sep 18, 2024
085002d
SWY core functions compiling successfully in C++
emlys Sep 19, 2024
8999d9d
SWY tests passing with new C++ implementation
emlys Sep 19, 2024
b71559f
SWY tests passing in MFD mode
emlys Sep 20, 2024
2c430c3
SWY D8 test
emlys Sep 23, 2024
cbf8098
run and test ndr in D8 mode
emlys Sep 25, 2024
72ca430
add D8/MFD option to model interfaces
emlys Sep 25, 2024
274e61d
fix SWY nodata bug
emlys Oct 1, 2024
8769f9d
Merge branch 'feature/routing-refactor' into feature/d8-routing
emlys Dec 16, 2024
b68632b
implement is_local_high_point for D8; don't inherit increment operators
emlys Jan 8, 2025
26327a8
clean up print statements
emlys Jan 8, 2025
94d697e
add expected values for D8 mode tests
emlys Jan 8, 2025
79279a0
remove testing dir name
emlys Jan 8, 2025
411012a
update sample data commit hash
emlys Jan 8, 2025
00fde51
update sample data commit hash
emlys Jan 8, 2025
b8d89a7
remove a bunch of unneeded include statements
emlys Jan 8, 2025
a20d480
rewrite list iteration to avoid size_t int comparison
emlys Jan 9, 2025
85a18ee
run build on ubuntu-latest to identify issues on RTD build
emlys Jan 9, 2025
8f99915
remove class redefinition
emlys Jan 9, 2025
c98d913
try removing unused template argument from constructor
emlys Jan 9, 2025
4c91922
try removing another unused template argument
emlys Jan 9, 2025
e46c0c5
remove more unused template arguments
emlys Jan 9, 2025
e4a7cd5
debugging on GHA ubuntu
emlys Jan 9, 2025
cc37e1a
specify const for templated constructor argument types
emlys Jan 9, 2025
a915cd9
more debugging ubuntu build
emlys Jan 9, 2025
1eacf04
addressing some compiler warnings on windows
emlys Jan 9, 2025
546a358
addressing more compiler warnings on windows
emlys Jan 9, 2025
0143083
address more compiler warnings
emlys Jan 9, 2025
184cdd3
add declaration comments to major functions
emlys Jan 9, 2025
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
2 changes: 1 addition & 1 deletion Makefile
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,7 @@
DATA_DIR := data
GIT_SAMPLE_DATA_REPO := https://bitbucket.org/natcap/invest-sample-data.git
GIT_SAMPLE_DATA_REPO_PATH := $(DATA_DIR)/invest-sample-data
GIT_SAMPLE_DATA_REPO_REV := 0f8b41557753dad3670ba8220f41650b51435a93
GIT_SAMPLE_DATA_REPO_REV := 08b1a727598fcdbdc9a787f0cf1d47dc6bac3aec

GIT_TEST_DATA_REPO := https://bitbucket.org/natcap/invest-test-data.git
GIT_TEST_DATA_REPO_PATH := $(DATA_DIR)/invest-test-data
Expand Down
Loading
Loading