Skip to content

SWY Report#2453

Merged
davemfish merged 40 commits intorelease/3.19.0from
feature/swy-report
Mar 24, 2026
Merged

SWY Report#2453
davemfish merged 40 commits intorelease/3.19.0from
feature/swy-report

Conversation

@megannissel
Copy link
Copy Markdown
Contributor

@megannissel megannissel commented Mar 24, 2026

Description

Fixes #2321

PR to get the SWY report into the release branch. There are no additional changes on this branch since the review of #2439

User's Guide updates are a WIP: natcap/invest.users-guide#224

Checklist

  • Updated HISTORY.rst and link to any relevant issue (if these changes are user-facing)
  • Updated the user's guide (if needed)
  • Tested the Workbench UI (if relevant)

@megannissel
move some vector plotting functionality into vector_utils.py (#2321)
39111f1
@megannissel
groundwork for a swy report (#2321)
a92d069
@megannissel
Merge branch 'release/3.18.0' into feature/2321-swy-report
a257cba
@megannissel
second iteration of swy report (#2321)
03ef51f
@megannissel
Merge branch 'main' into feature/2321-swy-report
e3eefbc
@megannissel
interactive baseflow and quickflow plots, now in m3/s (#2321)
eb61c0d
@megannissel
adjust raster_utils.raster_inputs_summary to check input csvs for ras…
6e1bd1d 
…ter paths (#2321)
@megannissel
reorganize report sections; include monthly qf rasters alongside annu…
4afb5e1 
…al (#2321)
@megannissel
fix qf+b graph to show sums when multiple features are selected (#2321)
fc6b23b
@megannissel
move chart_landmass back into CV reporter (not used elsewhere) (#2321)
a56e945
@megannissel
fix alignment of monthly tickmarks; add FID to aggregate_vector.shp r…
d779405 
…ather than creating another copy of the AOI (#2321)
@megannissel
move construction of monthly qf & b csv into execute (#2321)
aa4dfb4
@megannissel
update SWY created_if conditions; update reporter conditional logic t…
70b252e 
…o reflect these conditions (#2321)
@megannissel
mask qf rasters by stream network for improved contrast (#2321)
f90e7d5
@megannissel
fix quotes in f-string (#2321)
faa6ed0
@megannissel
Revert "mask qf rasters by stream network for improved contrast (#2321)"
b7e061c 
This reverts commit f90e7d5.
@megannissel
log-transform qf plots for increased contrast; add small plots and cu…
cbfe933 
…stom colormap functionality (#2321)
@megannissel
summarize output raster stats for nested paths; expand utils.fake_exe…
169be1e 
…cute to provide a test case (#2321)
@megannissel
minor edits to swy reporter, including supertitle for raster facet gr…
18047bc 
…oup (#2321)
@megannissel
update SWY outputs units in model_spec (#2321)
3b3b0f5
@megannissel
basic testing for swy reporter template (#2321)
d096609
@megannissel
always pass model spec to raster_inputs_summary (#2321)
26753e3
@megannissel
swy report template testing (#2321)
cecba2e
@megannissel
accept either str or colormap object for RasterPlotConfig.colormap; u…
375e96c 
…nified colorbar for raster facet plots (#2321)
@megannissel
improvements to SWY reporter, including better axis and legend config…
7e51bdd 
… for linked chart+map (#2321)
@megannissel
document geom_id in aggregate vector output spec; adjust gemon_id des…
93f9c73 
…cription in csv output spec (#2321)
@megannissel
update SWY model to index all monthly outputs consistently by month, …
8c45a1a 
…where January=1 (#2321)
@megannissel
reduce tests checking quickflow/baseflow CSV values to the base regre…
4c4a789 
…ssion mfd and d8 cases (#2321)
@megannissel
snapshot tests for plot_raster_facets small plots (#2321)
5e78639
@megannissel
raster_workspace_summary: recursively handle nested file_registry (#2321
68f4641 
)
megannissel and others added 10 commits March 20, 2026 12:45
@megannissel
provide quickflow, baseflow, and precip CSV values in m3/month (#2321)
3903ad4
@megannissel
update qf+b+precip chart axis labels to reflect m3/month (#2321)
47b69cb
@megannissel
update MONTH_ID_TO_LABEL so that it is indexed in line with month num…
6645ee4 
…bers (to support consistent month indexing) (#2321)
@megannissel
add regression test for user_defined_climate_zones base case (#2321)
7150fca
@megannissel
fix test docstring (#2321)
24b9f96
@megannissel
fixes and improvements to utils; different color scheme for qb, vri_s…
779f84f 
…um plots; point Makefile to invest-test-data revision (#2321)
@megannissel
custom matplotlib colormap for local recharge raster that matches the…
c3a7f95 
… qb + vri_sum plot color scheme (#2321)
@megannissel
use built-in matplotlib BrBG instead of custom version (#2321)
30c8535
@megannissel
update HISTORY.rst to reflect updates to the SWY model and report (#2321
b86deab 
)
@davemfish
Merge pull request #2439 from megannissel/feature/2321-swy-report
25bdb43 
SWY Report
@megannissel megannissel requested a review from davemfish March 24, 2026 18:50
@davemfish davemfish merged commit e25de0c into release/3.19.0 Mar 24, 2026
116 of 118 checks passed
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment

Reviewers

@davemfish davemfish davemfish approved these changes

Assignees

No one assigned

Labels

None yet

Projects

None yet

Milestone

No milestone

Development

Successfully merging this pull request may close these issues.

2 participants

@megannissel @davemfish