Commit Graph

119 Commits

Author SHA1 Message Date
Emily Soth 214a617e0d Merge branch 'feature/plugins' into feature/1891 2025-05-12 15:50:31 -07:00
Emily Soth bf1726ec88 restore compiled modules to the plugins branch 2025-05-08 14:38:09 -07:00
Emily Soth 73b42aecc5 work in progress: updating tests 2025-04-28 12:07:59 -07:00
Emily Soth ef62d68a67 Merge branch 'main' into feature/plugins 2025-04-04 13:29:28 -07:00
Emily Soth 7909dfe27f abstract out flow dir arg spec to spec_utils and rename it 2025-03-26 10:33:07 -07:00
Emily Soth e9cd8e4c17
Merge branch 'release/3.15.0' into feature/routing-refactor 2025-03-11 11:50:42 -07:00
Emily Davis a9e367039b Get pixel size from test data rather than hard-coding 2025-02-10 17:16:46 -07:00
dcdenu4 0e5261305f Skip compiled model tests 2025-02-05 09:52:24 -05:00
Emily Soth 94d697e2ae add expected values for D8 mode tests 2025-01-07 17:11:38 -08:00
Emily Soth 8769f9d851 Merge branch 'feature/routing-refactor' into feature/d8-routing 2024-12-16 14:32:39 -08:00
Emily Davis 60d0035745 SDR linting cleanup 2024-12-06 19:12:05 -07:00
Emily Davis b3a77cc610 Update SDR to produce per-hectare values in raster outputs 2024-12-05 20:02:33 -07:00
Emily Soth ad59b739d2 enable gdal.UseExceptions in entrypoints and tests
Enable gdal exceptions in the CLI and server. Update all models to
expect and handle gdal exceptions where they are now raised.
2024-11-19 13:32:47 -08:00
Emily Soth d3a8395786 SDR D8 is working 2024-09-11 11:13:37 -07:00
Emily Soth 0989f89fe3 sdr working with new 'algorithm' arg 2024-09-09 13:38:29 -07:00
James Douglass 2af4a47cc3 Updating SDR regression values where affected by mutual-masking.
RE:#1433
2023-11-03 17:19:03 -07:00
James Douglass ac0df2354a Merge branch 'main' of https://github.com/natcap/invest into bugfix/1433-sdr-large-swaths-of-nodata
Conflicts:
	src/natcap/invest/sdr/sdr.py
2023-11-03 16:27:20 -07:00
Emily Soth 059264ef6c more cleanup 2023-11-02 09:32:05 -07:00
James Douglass 1caecc9f51 Updating regression values.
RE:#1433
2023-10-23 10:04:25 -07:00
Emily Soth 2f5aa5a764 sdr: set RKLS to nodata on streams #1415 2023-09-22 10:29:32 -07:00
James Douglass aac76d24ab Adding a test for the LS factor. RE:#915 2023-08-22 15:37:58 -07:00
James Douglass bef0232651 Merge branch 'main' of https://github.com/natcap/invest into bugfix/915-update-sdr-ls-factor 2023-08-17 15:17:26 -07:00
Emily Soth 73fbcadf43 update all models and tests to use new version of read_csv_to_dataframe 2023-07-06 12:44:15 -07:00
James Douglass 177c252fa4 Updating regression values in SDR tests for the new LS.
RE:#915
2023-04-28 15:07:02 -07:00
James Douglass ff83d6f35d Removing the ws_id field requirement in SDR.
This field is a relic from earlier versions of the model where we
provided an optional valuation step that associated valuation parameters
with the watersheds via the WS_ID field.  We removed the valuation
component, but forgot to remove the required WS_ID field.

RE:#1201
2023-02-27 11:37:33 -08:00
James Douglass 8a15fc5efe Renaming "Total Retention" --> "Avoided Export".
This is in line with the slack discussion at
https://stanford-natcap.slack.com/archives/CECFUU1DW/p1649109737853559?thread_ts=1647968772.949939&cid=CECFUU1DW.
2022-07-01 12:11:42 -07:00
James Douglass c83fd47b13 Making the PEP-requested changes to the output report.
RE:#887
2022-06-28 15:51:40 -07:00
James Douglass 35ddb31c77 Updating tests to go with SDR updates.
RE:#887
2022-06-28 15:17:32 -07:00
James Douglass 6bd05b9cb1 Merge branch 'main' of https://github.com/natcap/invest into task/913-sdr-clamp-sed-deposition-values
Conflicts:
	HISTORY.rst
2022-04-27 10:56:14 -05:00
davemfish 1706df3e88 removing some redundancy in tracebacks; adding assertions for custom exception messages. #890. 2022-04-26 10:17:26 -04:00
James Douglass 1024873977 Asserting no negative values in sed_deposition layer. RE:#913 2022-03-23 10:05:02 -07:00
Emily Soth 1cd5cee9b8
Merge branch 'release/3.10' into task/568 2021-12-13 18:20:38 -08:00
James Douglass 4f54b32e93 Merge branch 'main' into pr-762-resolution
Conflicts:
	HISTORY.rst
	src/natcap/invest/ndr/ndr.py
	src/natcap/invest/sdr/sdr.py
2021-12-13 15:44:14 -08:00
James Douglass e413c7e7ff Using SDR function in NDR and asserting raster exists.
RE:#621
2021-12-03 14:37:31 -08:00
James Douglass 5d20c2f392 Refactoring into an individual function.
This makes nodata-awareness much easier to provide since we don't have
to wait on a task to complete to guarantee that its raster info can be
read.  RE:#621
2021-12-03 14:02:22 -08:00
James Douglass bd91cc309d Adding a function to determine what drains.
This is tested, but has not yet been added to a raster_calculator
function. RE:#621
2021-12-03 12:35:57 -08:00
emlys 7e59939788 move model specific validation messages to top level 2021-11-08 17:19:16 -08:00
emlys 44761956e6 Merge branch 'release/3.10' into task/568 2021-10-11 16:15:17 -07:00
emlys a9ce2647dd update tests 2021-10-05 11:50:15 -07:00
emlys 76ab2a25e8 consolidate validation messages into one locations 2021-09-28 17:27:44 -07:00
emlys 257183d510 Merge branch 'main' into pr-resolution 2021-09-22 15:24:12 -07:00
emlys 3e900a6a2c correct sample data for crop production, sdr 2021-09-09 11:31:33 -07:00
emlys 1e919a4123 revert mistakes 2021-08-31 10:44:16 -07:00
emlys 0a8d668be6 update sdr and ndr expected test data 2021-08-27 16:35:38 -07:00
emlys 341b3c567e remove debugging stuff 2021-08-05 18:18:14 -06:00
emlys c8e79b9d8f update last test 2021-08-05 15:04:35 -06:00
emlys 44d304d15b update more test expected values 2021-08-05 14:51:05 -06:00
emlys 9020178cff reset sdr/ndr tests 2021-08-05 11:18:13 -06:00
emlys f55a49e471 rename stream outputs in sdr and add test 2021-07-27 11:39:30 -06:00
Rich Sharp d47c53c92b re #555 create outlets for regions that do not otherwise drain to a stream, update history, and update expected numerical results accordingly. 2021-07-26 12:29:57 -06:00