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

Add EPANET MSX enhancements #426

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

Add EPANET MSX enhancements #426

wants to merge 104 commits into from

Commits on Aug 17, 2023

  1. initial creation of MSX reaction object 

    The class will be similar to the WaterNetworkModel in terms of its
structure and options.
    @dbhart
    dbhart committed Aug 17, 2023
    Configuration menu
    Copy the full SHA
    136fe58 View commit details
    Browse the repository at this point in the history

Commits on Aug 18, 2023

  1. update requirements so that reactions test with sympy

    @dbhart
    dbhart committed Aug 18, 2023
    Configuration menu
    Copy the full SHA
    173e4b9 View commit details
    Browse the repository at this point in the history

  2. Importing module before it existed, oops

    @dbhart
    dbhart committed Aug 18, 2023
    Configuration menu
    Copy the full SHA
    a47305d View commit details
    Browse the repository at this point in the history

  3. Merge pull request #128 from USEPA/main 

    Merge main into development branch
    @dbhart
    dbhart authored Aug 18, 2023
    Configuration menu
    Copy the full SHA
    a931261 View commit details
    Browse the repository at this point in the history

  4. Documentation updates

    @dbhart
    dbhart committed Aug 18, 2023
    Configuration menu
    Copy the full SHA
    5431a84 View commit details
    Browse the repository at this point in the history

Commits on Aug 25, 2023

  1. Code updates for MSX utilities

    @dbhart
    dbhart committed Aug 25, 2023
    Configuration menu
    Copy the full SHA
    4ae43db View commit details
    Browse the repository at this point in the history

  2. Forgot some files

    @dbhart
    dbhart committed Aug 25, 2023
    Configuration menu
    Copy the full SHA
    6b4394a View commit details
    Browse the repository at this point in the history

  3. Updated code structure checkin

    @dbhart
    dbhart committed Aug 25, 2023
    Configuration menu
    Copy the full SHA
    8036ef3 View commit details
    Browse the repository at this point in the history

Commits on Aug 28, 2023

  1. Update to core reactions model codes

    @dbhart
    dbhart committed Aug 28, 2023
    Configuration menu
    Copy the full SHA
    b37a1d5 View commit details
    Browse the repository at this point in the history

  2. Updates to read things in - there are bugs

    @dbhart
    dbhart committed Aug 28, 2023
    Configuration menu
    Copy the full SHA
    4892363 View commit details
    Browse the repository at this point in the history

Commits on Aug 29, 2023

  1. Updates to documentation and completing the I/O

    @dbhart
    dbhart committed Aug 29, 2023
    Configuration menu
    Copy the full SHA
    3649f60 View commit details
    Browse the repository at this point in the history

Commits on Aug 31, 2023

  1. Completed MSX-input file IO

    @dbhart
    dbhart committed Aug 31, 2023
    Configuration menu
    Copy the full SHA
    25f18a9 View commit details
    Browse the repository at this point in the history

Commits on Sep 11, 2023

  1. Citations update

    @dbhart
    dbhart committed Sep 11, 2023
    Configuration menu
    Copy the full SHA
    bb3ec89 View commit details
    Browse the repository at this point in the history

  2. Adding a (very basic) citations class

    @dbhart
    dbhart committed Sep 11, 2023
    Configuration menu
    Copy the full SHA
    455958d View commit details
    Browse the repository at this point in the history

  3. Update documentation

    @dbhart
    dbhart committed Sep 11, 2023
    Configuration menu
    Copy the full SHA
    d746e4f View commit details
    Browse the repository at this point in the history

  4. Updates after internal discussion

    @dbhart
    dbhart committed Sep 11, 2023
    Configuration menu
    Copy the full SHA
    57a9d2f View commit details
    Browse the repository at this point in the history

Commits on Sep 12, 2023

  1. Update to read/write citations on the WaterNetworkModel

    @dbhart
    dbhart committed Sep 12, 2023
    Configuration menu
    Copy the full SHA
    74a056f View commit details
    Browse the repository at this point in the history

  2. Documentation updates

    @dbhart
    dbhart committed Sep 12, 2023
    Configuration menu
    Copy the full SHA
    b19122e View commit details
    Browse the repository at this point in the history

  3. Merge branch 'msx' into citations

    @dbhart
    dbhart authored Sep 12, 2023
    Configuration menu
    Copy the full SHA
    f739713 View commit details
    Browse the repository at this point in the history

  4. Merge pull request #129 from dbhart/citations 

    Citations
    @dbhart
    dbhart authored Sep 12, 2023
    Configuration menu
    Copy the full SHA
    7a6f46f View commit details
    Browse the repository at this point in the history

  5. Update to add basic citation class

    @dbhart
    dbhart committed Sep 12, 2023
    Configuration menu
    Copy the full SHA
    d4c31b5 View commit details
    Browse the repository at this point in the history

  6. Getting rid of merge conflict

    @dbhart
    dbhart committed Sep 12, 2023
    Configuration menu
    Copy the full SHA
    a2b0c4f View commit details
    Browse the repository at this point in the history

  7. Merge pull request #131 from dbhart/citation 

    Update to add basic citation class
    @dbhart
    dbhart authored Sep 12, 2023
    Configuration menu
    Copy the full SHA
    6fac521 View commit details
    Browse the repository at this point in the history

Commits on Sep 16, 2023

  1. Merge pull request #132 from dbhart/exceptions 

    Exceptions
    @dbhart
    dbhart authored Sep 16, 2023
    Configuration menu
    Copy the full SHA
    da46076 View commit details
    Browse the repository at this point in the history

  2. Exceptions (#133) 

    * Update to exception documentation

* Update documentation for EN errors
    @dbhart
    dbhart authored Sep 16, 2023
    Configuration menu
    Copy the full SHA
    60af118 View commit details
    Browse the repository at this point in the history

  3. Update to sphinx config (#134)

    @dbhart
    dbhart authored Sep 16, 2023
    Configuration menu
    Copy the full SHA
    5e97685 View commit details
    Browse the repository at this point in the history

  4. Updates to toolkit

    @dbhart
    dbhart committed Sep 16, 2023
    Configuration menu
    Copy the full SHA
    74b1a05 View commit details
    Browse the repository at this point in the history

  5. Rebase library

    @dbhart
    dbhart committed Sep 16, 2023
    Configuration menu
    Copy the full SHA
    52de3d5 View commit details
    Browse the repository at this point in the history

Commits on Sep 19, 2023

  1. Updates to documentation, organization, and utilities

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

Commits on Sep 20, 2023

  1. Rename

    @dbhart
    dbhart committed Sep 20, 2023
    Configuration menu
    Copy the full SHA
    51f2a7c View commit details
    Browse the repository at this point in the history

  2. Typo

    @dbhart
    dbhart committed Sep 20, 2023
    Configuration menu
    Copy the full SHA
    ffcc1a5 View commit details
    Browse the repository at this point in the history

  3. Updates to tests and organization

    @dbhart
    dbhart committed Sep 20, 2023
    Configuration menu
    Copy the full SHA
    eb6e7af View commit details
    Browse the repository at this point in the history

Commits on Sep 26, 2023

  1. Updates for testing and documentation

    @dbhart
    dbhart committed Sep 26, 2023
    Configuration menu
    Copy the full SHA
    45d5976 View commit details
    Browse the repository at this point in the history

Commits on Oct 6, 2023

  1. Update to documentation and library functionality

    @dbhart
    dbhart committed Oct 6, 2023
    Configuration menu
    Copy the full SHA
    8862e25 View commit details
    Browse the repository at this point in the history

Commits on Oct 16, 2023

  1. Merge branch 'USEPA:main' into msx

    @dbhart
    dbhart authored Oct 16, 2023
    Configuration menu
    Copy the full SHA
    6806c59 View commit details
    Browse the repository at this point in the history

Commits on Oct 27, 2023

  1. Updates pulling MSX into the WaterNetworkModel 

    * Added as a part of the WaterNetworkModel named "msx"
* Made names consistent with wntr.network namings
    @dbhart
    dbhart committed Oct 27, 2023
    Configuration menu
    Copy the full SHA
    6b73e6c View commit details
    Browse the repository at this point in the history

  2. Stashing

    @dbhart
    dbhart committed Oct 27, 2023
    Configuration menu
    Copy the full SHA
    ca3451a View commit details
    Browse the repository at this point in the history

  3. Update to package structure

    @dbhart
    dbhart committed Oct 27, 2023
    Configuration menu
    Copy the full SHA
    9902471 View commit details
    Browse the repository at this point in the history

  4. Tests still broken, but now fully running MSX

    @dbhart
    dbhart committed Oct 27, 2023
    Configuration menu
    Copy the full SHA
    84e92ea View commit details
    Browse the repository at this point in the history

  5. Renaming to conform to other wntr styles

    @dbhart
    dbhart committed Oct 27, 2023
    Configuration menu
    Copy the full SHA
    25a48e0 View commit details
    Browse the repository at this point in the history

Commits on Nov 6, 2023

  1. Updates to naming, documentation

    @dbhart
    dbhart committed Nov 6, 2023
    Configuration menu
    Copy the full SHA
    0bc2088 View commit details
    Browse the repository at this point in the history

  2. Merge branch 'USEPA:main' into msx

    @dbhart
    dbhart authored Nov 6, 2023
    Configuration menu
    Copy the full SHA
    a8d0fd6 View commit details
    Browse the repository at this point in the history

Commits on Nov 9, 2023

  1. Merge branch 'msx' of https://github.com/dbhart/WNTR into msx

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

  2. Delete test file

    @dbhart
    dbhart committed Nov 9, 2023
    Configuration menu
    Copy the full SHA
    1f8c3dd View commit details
    Browse the repository at this point in the history

  3. Add test file

    @dbhart
    dbhart committed Nov 9, 2023
    Configuration menu
    Copy the full SHA
    e44e347 View commit details
    Browse the repository at this point in the history

  4. Merge branch 'msx' of https://github.com/dbhart/WNTR into msx

    @kaklise
    kaklise committed Nov 9, 2023
    Configuration menu
    Copy the full SHA
    1c200fe View commit details
    Browse the repository at this point in the history

  5. Updates to documentation for MSX

    @dbhart
    dbhart committed Nov 9, 2023
    Configuration menu
    Copy the full SHA
    8766bbd View commit details
    Browse the repository at this point in the history

  6. Update to example files and tests

    @dbhart
    dbhart committed Nov 9, 2023
    Configuration menu
    Copy the full SHA
    54690ce View commit details
    Browse the repository at this point in the history

  7. Merge branch 'msx' of https://github.com/dbhart/WNTR into msx

    @kaklise
    kaklise committed Nov 9, 2023
    Configuration menu
    Copy the full SHA
    7d193ed View commit details
    Browse the repository at this point in the history

  8. Test updates

    @dbhart
    dbhart committed Nov 9, 2023
    Configuration menu
    Copy the full SHA
    73264e4 View commit details
    Browse the repository at this point in the history

  9. Fix tolerances

    @dbhart
    dbhart committed Nov 9, 2023
    Configuration menu
    Copy the full SHA
    f4244c7 View commit details
    Browse the repository at this point in the history

  10. Merge branch 'msx' of https://github.com/dbhart/WNTR into msx

    @kaklise
    kaklise committed Nov 9, 2023
    Configuration menu
    Copy the full SHA
    46cf2db View commit details
    Browse the repository at this point in the history

Commits on Nov 10, 2023

  1. MSX documentation update

    @kaklise
    kaklise committed Nov 10, 2023
    Configuration menu
    Copy the full SHA
    8d1a41e View commit details
    Browse the repository at this point in the history

  2. minor updates

    @kaklise
    kaklise committed Nov 10, 2023
    Configuration menu
    Copy the full SHA
    0b11e42 View commit details
    Browse the repository at this point in the history

  3. MSX docs update (#135) 

    * Add scheduled testing to workflow

* MSX documentation update

* minor updates

---------

Co-authored-by: Kirk Bonney <[email protected]>
    @kaklise @kbonney
    kaklise and kbonney authored Nov 10, 2023
    Configuration menu
    Copy the full SHA
    cdcb4d1 View commit details
    Browse the repository at this point in the history

  4. API docs update, removed excess imports, removed cite_msx

    @kaklise
    kaklise committed Nov 10, 2023
    Configuration menu
    Copy the full SHA
    6c93a63 View commit details
    Browse the repository at this point in the history

  5. API docs update, removed excess imports, removed cite_msx (#136) 

    * Add scheduled testing to workflow

* MSX documentation update

* minor updates

* API docs update, removed excess imports, removed cite_msx

---------

Co-authored-by: Kirk Bonney <[email protected]>
    @kaklise @kbonney
    kaklise and kbonney authored Nov 10, 2023
    Configuration menu
    Copy the full SHA
    9bc4140 View commit details
    Browse the repository at this point in the history

  6. Merge branch 'USEPA:main' into msx

    @dbhart
    dbhart authored Nov 10, 2023
    Configuration menu
    Copy the full SHA
    f21f81a View commit details
    Browse the repository at this point in the history

Commits on Nov 13, 2023

  1. Merge pull request #137 from kaklise/msx 

    Msx
    @dbhart
    dbhart authored Nov 13, 2023
    Configuration menu
    Copy the full SHA
    7b3975a View commit details
    Browse the repository at this point in the history

  2. Docs update

    @dbhart
    dbhart committed Nov 13, 2023
    Configuration menu
    Copy the full SHA
    d347ad6 View commit details
    Browse the repository at this point in the history

Commits on Nov 17, 2023

  1. Fix changed name

    @dbhart
    dbhart committed Nov 17, 2023
    Configuration menu
    Copy the full SHA
    e07e292 View commit details
    Browse the repository at this point in the history

  2. Update to correct the exceptions listings

    @dbhart
    dbhart committed Nov 17, 2023
    Configuration menu
    Copy the full SHA
    361f167 View commit details
    Browse the repository at this point in the history

  3. fix exceptions

    @dbhart
    dbhart committed Nov 17, 2023
    Configuration menu
    Copy the full SHA
    be11447 View commit details
    Browse the repository at this point in the history

  4. Updates to address comments in PR. Tests forthcoming

    @dbhart
    dbhart committed Nov 17, 2023
    Configuration menu
    Copy the full SHA
    d467860 View commit details
    Browse the repository at this point in the history

  5. Added the tests for exceptions

    @dbhart
    dbhart committed Nov 17, 2023
    Configuration menu
    Copy the full SHA
    4c9600a View commit details
    Browse the repository at this point in the history

  6. Get rid of apidoc to match docs-theme

    @dbhart
    dbhart committed Nov 17, 2023
    Configuration menu
    Copy the full SHA
    54e045e View commit details
    Browse the repository at this point in the history

  7. Exceptions/docs-theme merges

    @dbhart
    dbhart committed Nov 17, 2023
    Configuration menu
    Copy the full SHA
    fd965c7 View commit details
    Browse the repository at this point in the history

  8. Final conflict

    @dbhart
    dbhart committed Nov 17, 2023
    Configuration menu
    Copy the full SHA
    853536e View commit details
    Browse the repository at this point in the history

  9. Merge pull request #139 from dbhart/exceptions 

    Exceptions
    @dbhart
    dbhart authored Nov 17, 2023
    Configuration menu
    Copy the full SHA
    033a675 View commit details
    Browse the repository at this point in the history

Commits on Dec 13, 2023

  1. Updates to msx docs

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

Commits on Dec 14, 2023

  1. Merge pull request #140 from kaklise/msx 

    Doc updates
    @dbhart
    dbhart authored Dec 14, 2023
    Configuration menu
    Copy the full SHA
    fd3ae03 View commit details
    Browse the repository at this point in the history

  2. Fixing typos

    @dbhart
    dbhart committed Dec 14, 2023
    Configuration menu
    Copy the full SHA
    48a6faf View commit details
    Browse the repository at this point in the history

Commits on Dec 18, 2023

  1. Adding MSX binary files and updating .gitignore

    @dbhart
    dbhart committed Dec 18, 2023
    Configuration menu
    Copy the full SHA
    08b60b7 View commit details
    Browse the repository at this point in the history

  2. Update dll paths

    @dbhart
    dbhart committed Dec 18, 2023
    Configuration menu
    Copy the full SHA
    263b9d6 View commit details
    Browse the repository at this point in the history

Commits on Dec 19, 2023

  1. Updating tests...ish

    @dbhart
    dbhart committed Dec 19, 2023
    Configuration menu
    Copy the full SHA
    1709f1f View commit details
    Browse the repository at this point in the history

Commits on Feb 12, 2024

  1. MSX binaries update

    @dbhart
    dbhart committed Feb 12, 2024
    Configuration menu
    Copy the full SHA
    6b146c5 View commit details
    Browse the repository at this point in the history

  2. Updates to documentation configuration

    @dbhart
    dbhart committed Feb 12, 2024
    Configuration menu
    Copy the full SHA
    076d202 View commit details
    Browse the repository at this point in the history

  3. Merge branch 'USEPA:main' into msx

    @dbhart
    dbhart authored Feb 12, 2024
    Configuration menu
    Copy the full SHA
    8791ccc View commit details
    Browse the repository at this point in the history

Commits on Mar 11, 2024

  1. Merge branch 'msx' of github.com:dbhart/WNTR into msx

    @dbhart
    dbhart committed Mar 11, 2024
    Configuration menu
    Copy the full SHA
    229f09f View commit details
    Browse the repository at this point in the history

  2. Merge branch 'USEPA:main' into msx

    @dbhart
    dbhart authored Mar 11, 2024
    Configuration menu
    Copy the full SHA
    8eadd15 View commit details
    Browse the repository at this point in the history

Commits on Mar 13, 2024

  1. Fix toolkit problems. 

    * Updated MSX binaries, PR issued to EPANETMSX main
* Updated toolkit to match modified code in MSX DLL
* Fixed an error in the filename encoding
    @dbhart
    dbhart committed Mar 13, 2024
    Configuration menu
    Copy the full SHA
    63d782a View commit details
    Browse the repository at this point in the history

Commits on Apr 7, 2024

  1. Updates to fix the wn.msx variable assignment

    @dbhart
    dbhart committed Apr 7, 2024
    Configuration menu
    Copy the full SHA
    f95bbdf View commit details
    Browse the repository at this point in the history

Commits on Apr 30, 2024

  1. JSON schema commit

    @dbhart
    dbhart committed Apr 30, 2024
    Configuration menu
    Copy the full SHA
    f76e997 View commit details
    Browse the repository at this point in the history

  2. Merge branch 'USEPA:main' into msx

    @dbhart
    dbhart authored Apr 30, 2024
    Configuration menu
    Copy the full SHA
    e5db660 View commit details
    Browse the repository at this point in the history

Commits on May 4, 2024

  1. Update to MSX examples and bug fix

    @dbhart
    dbhart committed May 4, 2024
    Configuration menu
    Copy the full SHA
    d1df04e View commit details
    Browse the repository at this point in the history

Commits on May 5, 2024

  1. Update to MSX demo

    @dbhart
    dbhart committed May 5, 2024
    Configuration menu
    Copy the full SHA
    168e59d View commit details
    Browse the repository at this point in the history

Commits on May 7, 2024

  1. Update to the MSX demo jupyter notebook.

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

  2. Update to demo

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

  3. Merge branch 'USEPA:main' into msx

    @dbhart
    dbhart authored May 7, 2024
    Configuration menu
    Copy the full SHA
    53cb5be View commit details
    Browse the repository at this point in the history

Commits on May 20, 2024

  1. MSX updates 

    * Move library to new directory
* Updates to documentation
* New ipynb demo
* various bug fixes
    @dbhart
    dbhart committed May 20, 2024
    Configuration menu
    Copy the full SHA
    8124da7 View commit details
    Browse the repository at this point in the history

Commits on Jul 2, 2024

  1. Merge branch 'USEPA:main' into msx

    @dbhart
    dbhart authored Jul 2, 2024
    Configuration menu
    Copy the full SHA
    b7e260f View commit details
    Browse the repository at this point in the history

  2. Reverting

    @dbhart
    dbhart committed Jul 2, 2024
    Configuration menu
    Copy the full SHA
    366b7d7 View commit details
    Browse the repository at this point in the history

Commits on Jul 15, 2024

  1. add msx simulation test

    @kbonney
    kbonney committed Jul 15, 2024
    Configuration menu
    Copy the full SHA
    6c6dc92 View commit details
    Browse the repository at this point in the history

  2. Revert documentation config changes

    @dbhart
    dbhart committed Jul 15, 2024
    Configuration menu
    Copy the full SHA
    2469acb View commit details
    Browse the repository at this point in the history

  3. Revert conf.py

    @dbhart
    dbhart committed Jul 15, 2024
    Configuration menu
    Copy the full SHA
    891d33c View commit details
    Browse the repository at this point in the history

  4. Finish revert erroneous commits

    @dbhart
    dbhart committed Jul 15, 2024
    Configuration menu
    Copy the full SHA
    fe5ca29 View commit details
    Browse the repository at this point in the history

Commits on Jul 20, 2024

  1. CrowdStrike mess backup

    @dbhart
    dbhart committed Jul 20, 2024
    Configuration menu
    Copy the full SHA
    2ec9b81 View commit details
    Browse the repository at this point in the history

Commits on Aug 26, 2024

  1. Merge pull request #142 from USEPA/main 

    Pull up to main
    @dbhart
    dbhart authored Aug 26, 2024
    Configuration menu
    Copy the full SHA
    a203e76 View commit details
    Browse the repository at this point in the history

Commits on Oct 1, 2024

  1. Merge pull request #144 from USEPA/main 

    Pull in USEPA/wntr/main
    @dbhart
    dbhart authored Oct 1, 2024
    Configuration menu
    Copy the full SHA
    920c480 View commit details
    Browse the repository at this point in the history

  2. Merge pull request #141 from kbonney/msx 

    add msx simulation test
    @dbhart
    dbhart authored Oct 1, 2024
    Configuration menu
    Copy the full SHA
    a5c2ed3 View commit details
    Browse the repository at this point in the history

  3. This addresses comments made regarding the msx model files. Documenta… 

    …tion is not pulled in this commit
    @dbhart
    dbhart committed Oct 1, 2024
    Configuration menu
    Copy the full SHA
    f307ae9 View commit details
    Browse the repository at this point in the history

Commits on Oct 7, 2024

  1. Update the epanetmsx binary builds from the USEPA official branch

    @dbhart
    dbhart committed Oct 7, 2024
    Configuration menu
    Copy the full SHA
    6bfe13c View commit details
    Browse the repository at this point in the history

  2. tests: correct filename in demo file, clean binary objects out of ipynb

    @dbhart
    dbhart committed Oct 7, 2024
    Configuration menu
    Copy the full SHA
    c75d744 View commit details
    Browse the repository at this point in the history

Commits on Oct 21, 2024

  1. Merge branch 'USEPA:main' into msx

    @dbhart
    dbhart authored Oct 21, 2024
    Configuration menu
    Copy the full SHA
    1c3279f View commit details
    Browse the repository at this point in the history