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.

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

Merge main into network gen branch #146

Merged
merged 8 commits into from
Nov 18, 2024
Merged

Conversation

dbhart
Copy link
Owner

@dbhart dbhart commented Nov 4, 2024

No description provided.

kbonney and others added 3 commits October 15, 2024 15:32
* run doctests on quick_check

* update documentation workflow to test documentation building on pull requests.
Update the quick_check to no longer fast-fail.
* define sample_raster

* adding module check in sample_raster

* exposing sample_raster to wntr.gis interface

* add test for sample_raster

* trivial whitespace commit to re-run actions

* adding rasterio to optional requirement

* added tif to gitignore

* updated docs for rasterio

* clean up for raster functionality

* update test to use net1. add user manual documentation. figure and data added for raster example

* adjusting test to produce a smaller tiff file.

* small updates to user docs

* rename datafile

* update test to include tanks

* update gis to include tanks, add elevations to model, and mention hazard datasets. Figure filename changed.

* cleanup test

* adding documentation updates

---------

Co-authored-by: kaklise <[email protected]>
kaklise and others added 5 commits November 12, 2024 09:20
* bug fix, missing commas in _base_attributes

* Updates to remove the use of node_type and link_type in WaterNetworkGIS GeoDataFrames

* updated/added tests

* removed user tests, geodataframes no longer store node_type

* Added "name" back into the list of valid gis columns, updated tests

* updated documentation

* minor updates

---------

Co-authored-by: kbonney <[email protected]>
* Added D-W conversion for roughness coefficient for inp file i/o

* bug fix in roughness conversion

* Added a warning if the user changes headloss to/from D-W

* Added additional tests for changing headloss formula

* Updated test

* commented out graphics in test
…om gis (#447)

* Add ability to input single demand from giw/dict

* Add test

* update doctests to account for column name changes

* change default return in junction properties to reflect default values in add_junction

* fix doctests

* move demand attributes from optional to base. fix docstest accordingly

* fix doctest

* fix doctest by adding sort to column name list

* rewrite portions of IO documentation for clarity

* add cross references for methods

---------

Co-authored-by: Angus <[email protected]>
Co-authored-by: kbonney <[email protected]>
@dbhart dbhart merged commit a10885e into dbhart:network-gen Nov 18, 2024
2 checks passed
@dbhart dbhart deleted the dbhart-pr-146 branch November 18, 2024 18:14
dbhart added a commit that referenced this pull request Dec 16, 2024
Merge main into network gen branch
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
None yet
Projects
None yet
Development

Successfully merging this pull request may close these issues.

5 participants