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

Jump to bottom

Addition of stormwater and wastewater capabilities in WNTR #437

Open
wants to merge 77 commits into
base: main
Choose a base branch
from
Open

Addition of stormwater and wastewater capabilities in WNTR #437

wants to merge 77 commits into from

Commits on Jul 21, 2023

  1. prototype storm water module in WNTR

    @kaklise
    kaklise committed Jul 21, 2023
    Configuration menu
    Copy the full SHA
    90a9122 View commit details
    Browse the repository at this point in the history

  2. simple examples and benchmark model

    @kaklise
    kaklise committed Jul 21, 2023
    Configuration menu
    Copy the full SHA
    2a4cb85 View commit details
    Browse the repository at this point in the history

Commits on Aug 5, 2023

  1. stormwater updates

    @kaklise
    kaklise committed Aug 5, 2023
    Configuration menu
    Copy the full SHA
    2b30956 View commit details
    Browse the repository at this point in the history

Commits on Sep 19, 2023

  1. Added outline for storm water documentation

    @kaklise
    kaklise committed Sep 19, 2023
    Configuration menu
    Copy the full SHA
    9f297ba View commit details
    Browse the repository at this point in the history

  2. Merge branch 'main' of https://github.com/USEPA/WNTR into swmm

    @kaklise
    kaklise committed Sep 19, 2023
    Configuration menu
    Copy the full SHA
    f320df0 View commit details
    Browse the repository at this point in the history

Commits on Oct 16, 2023

  1. updated sim and network attributes

    @kaklise
    kaklise committed Oct 16, 2023
    Configuration menu
    Copy the full SHA
    fc85408 View commit details
    Browse the repository at this point in the history

  2. corrected rst for stormwater

    @kaklise
    kaklise committed Oct 16, 2023
    Configuration menu
    Copy the full SHA
    4e13a04 View commit details
    Browse the repository at this point in the history

Commits on Oct 17, 2023

  1. stormwater updates

    @kaklise
    kaklise committed Oct 17, 2023
    Configuration menu
    Copy the full SHA
    7e621f0 View commit details
    Browse the repository at this point in the history

Commits on Oct 18, 2023

  1. bug fix

    @kaklise
    kaklise committed Oct 18, 2023
    Configuration menu
    Copy the full SHA
    5cb7597 View commit details
    Browse the repository at this point in the history

Commits on Oct 23, 2023

  1. minor updates

    @kaklise
    kaklise committed Oct 23, 2023
    Configuration menu
    Copy the full SHA
    9854c8e View commit details
    Browse the repository at this point in the history

Commits on Oct 26, 2023

  1. added ability to weight and modify direction in the graph

    @kaklise
    kaklise committed Oct 26, 2023
    Configuration menu
    Copy the full SHA
    7ff1308 View commit details
    Browse the repository at this point in the history

  2. added upstream and downstream metrics

    @kaklise
    kaklise committed Oct 26, 2023
    Configuration menu
    Copy the full SHA
    f586507 View commit details
    Browse the repository at this point in the history

  3. concatenated link and nodes into read only databases and updated Node… 

    … and Link classes
    @kaklise
    kaklise committed Oct 26, 2023
    Configuration menu
    Copy the full SHA
    4522843 View commit details
    Browse the repository at this point in the history

Commits on Oct 28, 2023

  1. removed duplicate code

    @kaklise
    kaklise committed Oct 28, 2023
    Configuration menu
    Copy the full SHA
    b0131e3 View commit details
    Browse the repository at this point in the history

  2. added directed network plot

    @kaklise
    kaklise committed Oct 28, 2023
    Configuration menu
    Copy the full SHA
    21f3e31 View commit details
    Browse the repository at this point in the history

Commits on Dec 20, 2023

  1. Merge branch 'main' of https://github.com/USEPA/WNTR into swmm

    @kaklise
    kaklise committed Dec 20, 2023
    Configuration menu
    Copy the full SHA
    2153987 View commit details
    Browse the repository at this point in the history

Commits on Jan 16, 2024

  1. stormwater updates, docs and tests

    @kaklise
    kaklise committed Jan 16, 2024
    Configuration menu
    Copy the full SHA
    2af371c View commit details
    Browse the repository at this point in the history

  2. added stormwater tests

    @kaklise
    kaklise committed Jan 16, 2024
    Configuration menu
    Copy the full SHA
    a44f1a1 View commit details
    Browse the repository at this point in the history

Commits on Jan 17, 2024

  1. Updated GIS to build from dataframes, added more tests

    @kaklise
    kaklise committed Jan 17, 2024
    Configuration menu
    Copy the full SHA
    a974561 View commit details
    Browse the repository at this point in the history

Commits on Jan 19, 2024

  1. Add pump outage, updated graphics, additional tests

    @kaklise
    kaklise committed Jan 19, 2024
    Configuration menu
    Copy the full SHA
    a7fb551 View commit details
    Browse the repository at this point in the history

Commits on Jan 23, 2024

  1. removed apidoc files

    @kaklise
    kaklise committed Jan 23, 2024
    Configuration menu
    Copy the full SHA
    bf5bea1 View commit details
    Browse the repository at this point in the history

  2. clean up examples

    @kaklise
    kaklise committed Jan 23, 2024
    Configuration menu
    Copy the full SHA
    1810d87 View commit details
    Browse the repository at this point in the history

Commits on Jan 26, 2024

  1. cleaned up network sections, generated from swmmio

    @kaklise
    kaklise committed Jan 26, 2024
    Configuration menu
    Copy the full SHA
    6b2aa2c View commit details
    Browse the repository at this point in the history

  2. controls stored in a pd.Series

    @kaklise
    kaklise committed Jan 26, 2024
    Configuration menu
    Copy the full SHA
    dc8f267 View commit details
    Browse the repository at this point in the history

  3. updated docs

    @kaklise
    kaklise committed Jan 26, 2024
    Configuration menu
    Copy the full SHA
    3ae748d View commit details
    Browse the repository at this point in the history

  4. minor updates

    @kaklise
    kaklise committed Jan 26, 2024
    Configuration menu
    Copy the full SHA
    959833b View commit details
    Browse the repository at this point in the history

Commits on Feb 4, 2024

  1. swntr doc updates

    @kaklise
    kaklise committed Feb 4, 2024
    Configuration menu
    Copy the full SHA
    56af2f8 View commit details
    Browse the repository at this point in the history

  2. swntr doc updates

    @kaklise
    kaklise committed Feb 4, 2024
    Configuration menu
    Copy the full SHA
    c351cb1 View commit details
    Browse the repository at this point in the history

Commits on Feb 5, 2024

  1. updated title to fit on one line

    @kaklise
    kaklise committed Feb 5, 2024
    Configuration menu
    Copy the full SHA
    f693b74 View commit details
    Browse the repository at this point in the history

Commits on Feb 15, 2024

  1. SWMM files after export from SWMM

    @kaklise
    kaklise committed Feb 15, 2024
    Configuration menu
    Copy the full SHA
    1369349 View commit details
    Browse the repository at this point in the history

  2. s-wntr doc updates

    @kaklise
    kaklise committed Feb 15, 2024
    Configuration menu
    Copy the full SHA
    4088182 View commit details
    Browse the repository at this point in the history

  3. updated valid sections

    @kaklise
    kaklise committed Feb 15, 2024
    Configuration menu
    Copy the full SHA
    ed1ecc5 View commit details
    Browse the repository at this point in the history

  4. swntr doc update

    @kaklise
    kaklise committed Feb 15, 2024
    Configuration menu
    Copy the full SHA
    cafc1a4 View commit details
    Browse the repository at this point in the history

Commits on Mar 6, 2024

  1. updates for swmmio, added additional metrics, cleanup

    @kaklise
    kaklise committed Mar 6, 2024
    Configuration menu
    Copy the full SHA
    19224b3 View commit details
    Browse the repository at this point in the history

  2. cleaned up imports and skip tests

    @kaklise
    kaklise committed Mar 6, 2024
    Configuration menu
    Copy the full SHA
    ffccf5b View commit details
    Browse the repository at this point in the history

Commits on Mar 9, 2024

  1. added additional methods to network, updated docs, return summary wit… 

    …h results
    @kaklise
    kaklise committed Mar 9, 2024
    Configuration menu
    Copy the full SHA
    4c3b3fa View commit details
    Browse the repository at this point in the history

Commits on Mar 12, 2024

  1. updated swntr docs

    @kaklise
    kaklise committed Mar 12, 2024
    Configuration menu
    Copy the full SHA
    039859f View commit details
    Browse the repository at this point in the history

Commits on Mar 14, 2024

  1. added tests

    @kaklise
    kaklise committed Mar 14, 2024
    Configuration menu
    Copy the full SHA
    9acb7f7 View commit details
    Browse the repository at this point in the history

Commits on Mar 26, 2024

  1. Added cross section and missing sections to StormWaterNetworkModel

    @kaklise
    kaklise committed Mar 26, 2024
    Configuration menu
    Copy the full SHA
    c23f44f View commit details
    Browse the repository at this point in the history

  2. Added response time and other path metrics

    @kaklise
    kaklise committed Mar 26, 2024
    Configuration menu
    Copy the full SHA
    12b80f5 View commit details
    Browse the repository at this point in the history

Commits on Apr 8, 2024

  1. updated shortest path metrics

    @kaklise
    kaklise committed Apr 8, 2024
    Configuration menu
    Copy the full SHA
    fd4f05e View commit details
    Browse the repository at this point in the history

  2. changed input to path metrics, list of nodes

    @kaklise
    kaklise committed Apr 8, 2024
    Configuration menu
    Copy the full SHA
    4161d31 View commit details
    Browse the repository at this point in the history

Commits on Apr 9, 2024

  1. updated metrics

    @kaklise
    kaklise committed Apr 9, 2024
    Configuration menu
    Copy the full SHA
    5163124 View commit details
    Browse the repository at this point in the history

  2. updated metrics

    @kaklise
    kaklise committed Apr 9, 2024
    Configuration menu
    Copy the full SHA
    b7dc064 View commit details
    Browse the repository at this point in the history

Commits on Apr 10, 2024

  1. refactored to_graph to not use swmmio

    @kaklise
    kaklise committed Apr 10, 2024
    Configuration menu
    Copy the full SHA
    92dfde9 View commit details
    Browse the repository at this point in the history

Commits on Apr 11, 2024

  1. time to capacity update, changed to connected

    @kaklise
    kaklise committed Apr 11, 2024
    Configuration menu
    Copy the full SHA
    522e6fb View commit details
    Browse the repository at this point in the history

Commits on Apr 13, 2024

  1. documentation and model updates

    @kaklise
    kaklise committed Apr 13, 2024
    Configuration menu
    Copy the full SHA
    48ea472 View commit details
    Browse the repository at this point in the history

  2. doc update

    @kaklise
    kaklise committed Apr 13, 2024
    Configuration menu
    Copy the full SHA
    f58ca90 View commit details
    Browse the repository at this point in the history

  3. fixed spacing

    @kaklise
    kaklise committed Apr 13, 2024
    Configuration menu
    Copy the full SHA
    e23dff5 View commit details
    Browse the repository at this point in the history

  4. updated test

    @kaklise
    kaklise committed Apr 13, 2024
    Configuration menu
    Copy the full SHA
    147689f View commit details
    Browse the repository at this point in the history

Commits on May 6, 2024

  1. Merge branch 'swntr' of https://github.com/kaklise/WNTR into swntr

    @kaklise
    kaklise committed May 6, 2024
    Configuration menu
    Copy the full SHA
    a3ddebb View commit details
    Browse the repository at this point in the history

Commits on May 7, 2024

  1. install latest swmmio

    @kaklise
    kaklise committed May 7, 2024
    Configuration menu
    Copy the full SHA
    04b5a88 View commit details
    Browse the repository at this point in the history

  2. removed pip install of swmmio

    @kaklise
    kaklise committed May 7, 2024
    Configuration menu
    Copy the full SHA
    34f9aea View commit details
    Browse the repository at this point in the history

  3. install swmmio from clone

    @kaklise
    kaklise committed May 7, 2024
    Configuration menu
    Copy the full SHA
    6eac257 View commit details
    Browse the repository at this point in the history

  4. use pyswmm simulator

    @kaklise
    kaklise committed May 7, 2024
    Configuration menu
    Copy the full SHA
    01767c6 View commit details
    Browse the repository at this point in the history

  5. Fixed paths and removed subprocess calling swmmio

    @kaklise
    kaklise committed May 7, 2024
    Configuration menu
    Copy the full SHA
    1bf3c3a View commit details
    Browse the repository at this point in the history

  6. cleanup

    @kaklise
    kaklise committed May 7, 2024
    Configuration menu
    Copy the full SHA
    aeddb0b View commit details
    Browse the repository at this point in the history

Commits on May 8, 2024

  1. Added subcatchment plotting options

    @kaklise
    kaklise committed May 8, 2024
    Configuration menu
    Copy the full SHA
    2421730 View commit details
    Browse the repository at this point in the history

  2. check for empty dataframe before concat to avoid future warning

    @kaklise
    kaklise committed May 8, 2024
    Configuration menu
    Copy the full SHA
    d8414c2 View commit details
    Browse the repository at this point in the history

  3. merge

    @kaklise
    kaklise committed May 8, 2024
    Configuration menu
    Copy the full SHA
    f5c382e View commit details
    Browse the repository at this point in the history

Commits on Jul 17, 2024

  1. Merge branch 'main' of https://github.com/USEPA/WNTR into swntr

    @kaklise
    kaklise committed Jul 17, 2024
    Configuration menu
    Copy the full SHA
    e80fc00 View commit details
    Browse the repository at this point in the history

Commits on Jul 18, 2024

  1. Merge branch 'main' of https://github.com/USEPA/WNTR into swntr

    @kaklise
    kaklise committed Jul 18, 2024
    Configuration menu
    Copy the full SHA
    9d97c8a View commit details
    Browse the repository at this point in the history

  2. Added tests and cleanup

    @kaklise
    kaklise committed Jul 18, 2024
    Configuration menu
    Copy the full SHA
    881aca3 View commit details
    Browse the repository at this point in the history

Commits on Jul 19, 2024

  1. Updated stormwater.metrics tests and apidocs

    @kaklise
    kaklise committed Jul 19, 2024
    Configuration menu
    Copy the full SHA
    9f57f1e View commit details
    Browse the repository at this point in the history

  2. added ability to convert patterns to ts, anonymize coordinates, store… 

    … node and link type in G
    @kaklise
    kaklise committed Jul 19, 2024
    Configuration menu
    Copy the full SHA
    66ae4b8 View commit details
    Browse the repository at this point in the history

  3. swntr doc updates

    @kaklise
    kaklise committed Jul 19, 2024
    Configuration menu
    Copy the full SHA
    136d486 View commit details
    Browse the repository at this point in the history

Commits on Jul 22, 2024

  1. Added add_datetime_indexed_patterns and tests

    @kaklise
    kaklise committed Jul 22, 2024
    Configuration menu
    Copy the full SHA
    4d0de71 View commit details
    Browse the repository at this point in the history

  2. added swmmio as an optional requirement

    @kaklise
    kaklise committed Jul 22, 2024
    Configuration menu
    Copy the full SHA
    3ef3ff6 View commit details
    Browse the repository at this point in the history

  3. removed duplicate INP files

    @kaklise
    kaklise committed Jul 22, 2024
    Configuration menu
    Copy the full SHA
    a882083 View commit details
    Browse the repository at this point in the history

  4. minor update

    @kaklise
    kaklise committed Jul 22, 2024
    Configuration menu
    Copy the full SHA
    3ebdfd5 View commit details
    Browse the repository at this point in the history

Commits on Jul 23, 2024

  1. minor updates

    @kaklise
    kaklise committed Jul 23, 2024
    Configuration menu
    Copy the full SHA
    56df3a5 View commit details
    Browse the repository at this point in the history

Commits on Jul 24, 2024

  1. Updated pandas display options for gis docs

    @kaklise
    kaklise committed Jul 24, 2024
    Configuration menu
    Copy the full SHA
    7b971c8 View commit details
    Browse the repository at this point in the history

  2. added api docs to graphics

    @kaklise
    kaklise committed Jul 24, 2024
    Configuration menu
    Copy the full SHA
    26ecf95 View commit details
    Browse the repository at this point in the history

  3. minor update

    @kaklise
    kaklise committed Jul 24, 2024
    Configuration menu
    Copy the full SHA
    c640914 View commit details
    Browse the repository at this point in the history

Commits on Aug 26, 2024

  1. Added ability to anonymize coordinates using graphviz (using networkx)

    @kaklise
    kaklise committed Aug 26, 2024
    Configuration menu
    Copy the full SHA
    84d5888 View commit details
    Browse the repository at this point in the history

Commits on Oct 1, 2024

  1. Merge branch 'main' of https://github.com/USEPA/WNTR into swntr

    @kaklise
    kaklise committed Oct 1, 2024
    Configuration menu
    Copy the full SHA
    d1d0f2d View commit details
    Browse the repository at this point in the history

Commits on Nov 1, 2024

  1. Merge branch 'USEPA:main' into swntr

    @kaklise
    kaklise authored Nov 1, 2024
    Configuration menu
    Copy the full SHA
    4c47a03 View commit details
    Browse the repository at this point in the history