Code

Add EPANET MSX enhancements#426

Code

Closed

dbhart wants to merge 149 commits intoUSEPA:mainUSEPA/WNTR:mainfrom dbhart:msxdbhart/WNTR:msxCopy head branch name to clipboard

+9,058-692

Commits

Commits on Aug 17, 2023

• initial creation of MSX reaction object

  Show description for 136fe58
  dbhart

  committed
  136fe58

  Copy full SHA for 136fe58

Commits on Aug 18, 2023

• update requirements so that reactions test with sympy

  dbhart

  committed
  173e4b9

  Copy full SHA for 173e4b9

• Importing module before it existed, oops

  dbhart

  committed
  a47305d

  Copy full SHA for a47305d

• Merge pull request #128 from USEPA/main

  Show description for a931261
  dbhart

  authored
  a931261

  Copy full SHA for a931261

• Documentation updates

  dbhart

  committed
  5431a84

  Copy full SHA for 5431a84

Commits on Aug 25, 2023

• Code updates for MSX utilities

  dbhart

  committed
  4ae43db

  Copy full SHA for 4ae43db

• Forgot some files

  dbhart

  committed
  6b4394a

  Copy full SHA for 6b4394a

• Updated code structure checkin

  dbhart

  committed
  8036ef3

  Copy full SHA for 8036ef3

Commits on Aug 28, 2023

• Update to core reactions model codes

  dbhart

  committed
  b37a1d5

  Copy full SHA for b37a1d5

• Updates to read things in - there are bugs

  dbhart

  committed
  4892363

  Copy full SHA for 4892363

Commits on Aug 29, 2023

• Updates to documentation and completing the I/O

  dbhart

  committed
  3649f60

  Copy full SHA for 3649f60

Commits on Aug 31, 2023

• Completed MSX-input file IO

  dbhart

  committed
  25f18a9

  Copy full SHA for 25f18a9

Commits on Sep 11, 2023

• Citations update

  dbhart

  committed
  bb3ec89

  Copy full SHA for bb3ec89

• Adding a (very basic) citations class

  dbhart

  committed
  455958d

  Copy full SHA for 455958d

• Update documentation

  dbhart

  committed
  d746e4f

  Copy full SHA for d746e4f

• Updates after internal discussion

  dbhart

  committed
  57a9d2f

  Copy full SHA for 57a9d2f

Commits on Sep 12, 2023

• Update to read/write citations on the WaterNetworkModel

  dbhart

  committed
  74a056f

  Copy full SHA for 74a056f

• Documentation updates

  dbhart

  committed
  b19122e

  Copy full SHA for b19122e

• Merge branch 'msx' into citations

  dbhart

  authored
  f739713

  Copy full SHA for f739713

• Merge pull request #129 from dbhart/citations

  Show description for 7a6f46f
  dbhart

  authored
  7a6f46f

  Copy full SHA for 7a6f46f

• Update to add basic citation class

  dbhart

  committed
  d4c31b5

  Copy full SHA for d4c31b5

• Getting rid of merge conflict

  dbhart

  committed
  a2b0c4f

  Copy full SHA for a2b0c4f

• Merge pull request #131 from dbhart/citation

  Show description for 6fac521
  dbhart

  authored
  6fac521

  Copy full SHA for 6fac521

Commits on Sep 16, 2023

• Merge pull request #132 from dbhart/exceptions

  Show description for da46076
  dbhart

  authored
  da46076

  Copy full SHA for da46076

• Exceptions (#133)

  Show description for 60af118
  dbhart

  authored
  60af118

  Copy full SHA for 60af118

• Update to sphinx config (#134)

  dbhart

  authored
  5e97685

  Copy full SHA for 5e97685

• Updates to toolkit

  dbhart

  committed
  74b1a05

  Copy full SHA for 74b1a05

• Rebase library

  dbhart

  committed
  52de3d5

  Copy full SHA for 52de3d5

Commits on Sep 19, 2023

• Updates to documentation, organization, and utilities

  dbhart

  committed
  a68835b

  Copy full SHA for a68835b

Commits on Sep 20, 2023

• Rename

  dbhart

  committed
  51f2a7c

  Copy full SHA for 51f2a7c

• Typo

  dbhart

  committed
  ffcc1a5

  Copy full SHA for ffcc1a5

• Updates to tests and organization

  dbhart

  committed
  eb6e7af

  Copy full SHA for eb6e7af

Commits on Sep 26, 2023

• Updates for testing and documentation

  dbhart

  committed
  45d5976

  Copy full SHA for 45d5976

Commits on Oct 6, 2023

• Update to documentation and library functionality

  dbhart

  committed
  8862e25

  Copy full SHA for 8862e25

Commits on Oct 16, 2023

• Merge branch 'USEPA:main' into msx

  dbhart

  authored
  6806c59

  Copy full SHA for 6806c59

Commits on Oct 27, 2023

• Updates pulling MSX into the WaterNetworkModel

  Show description for 6b73e6c
  dbhart

  committed
  6b73e6c

  Copy full SHA for 6b73e6c

• Stashing

  dbhart

  committed
  ca3451a

  Copy full SHA for ca3451a

• Update to package structure

  dbhart

  committed
  9902471

  Copy full SHA for 9902471

• Tests still broken, but now fully running MSX

  dbhart

  committed
  84e92ea

  Copy full SHA for 84e92ea

• Renaming to conform to other wntr styles

  dbhart

  committed
  25a48e0

  Copy full SHA for 25a48e0

Commits on Nov 6, 2023

• Updates to naming, documentation

  dbhart

  committed
  0bc2088

  Copy full SHA for 0bc2088

• Merge branch 'USEPA:main' into msx

  dbhart

  authored
  a8d0fd6

  Copy full SHA for a8d0fd6

Commits on Nov 9, 2023

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

  kaklise

  committed
  bc16886

  Copy full SHA for bc16886

• Delete test file

  dbhart

  committed
  1f8c3dd

  Copy full SHA for 1f8c3dd

• Add test file

  dbhart

  committed
  e44e347

  Copy full SHA for e44e347

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

  kaklise

  committed
  1c200fe

  Copy full SHA for 1c200fe

• Updates to documentation for MSX

  dbhart

  committed
  8766bbd

  Copy full SHA for 8766bbd

• Update to example files and tests

  dbhart

  committed
  54690ce

  Copy full SHA for 54690ce

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

  kaklise

  committed
  7d193ed

  Copy full SHA for 7d193ed

• Test updates

  dbhart

  committed
  73264e4

  Copy full SHA for 73264e4

• Fix tolerances

  dbhart

  committed
  f4244c7

  Copy full SHA for f4244c7

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

  kaklise

  committed
  46cf2db

  Copy full SHA for 46cf2db

Commits on Nov 10, 2023

• MSX documentation update

  kaklise

  committed
  8d1a41e

  Copy full SHA for 8d1a41e

• minor updates

  kaklise

  committed
  0b11e42

  Copy full SHA for 0b11e42

• MSX docs update (#135)

  Show description for cdcb4d1
  

  kaklise

  and

  kbonney

  authored
  cdcb4d1

  Copy full SHA for cdcb4d1

• API docs update, removed excess imports, removed cite_msx

  kaklise

  committed
  6c93a63

  Copy full SHA for 6c93a63

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

  Show description for 9bc4140
  

  kaklise

  and

  kbonney

  authored
  9bc4140

  Copy full SHA for 9bc4140

• Merge branch 'USEPA:main' into msx

  dbhart

  authored
  f21f81a

  Copy full SHA for f21f81a

Commits on Nov 13, 2023

• Merge pull request #137 from kaklise/msx

  Show description for 7b3975a
  dbhart

  authored
  7b3975a

  Copy full SHA for 7b3975a

• Docs update

  dbhart

  committed
  d347ad6

  Copy full SHA for d347ad6

Commits on Nov 17, 2023

• Fix changed name

  dbhart

  committed
  e07e292

  Copy full SHA for e07e292

• Update to correct the exceptions listings

  dbhart

  committed
  361f167

  Copy full SHA for 361f167

• fix exceptions

  dbhart

  committed
  be11447

  Copy full SHA for be11447

• Updates to address comments in PR. Tests forthcoming

  dbhart

  committed
  d467860

  Copy full SHA for d467860

• Added the tests for exceptions

  dbhart

  committed
  4c9600a

  Copy full SHA for 4c9600a

• Get rid of apidoc to match docs-theme

  dbhart

  committed
  54e045e

  Copy full SHA for 54e045e

• Exceptions/docs-theme merges

  dbhart

  committed
  fd965c7

  Copy full SHA for fd965c7

• Final conflict

  dbhart

  committed
  853536e

  Copy full SHA for 853536e

• Merge pull request #139 from dbhart/exceptions

  Show description for 033a675
  dbhart

  authored
  033a675

  Copy full SHA for 033a675

Commits on Dec 13, 2023

• Updates to msx docs

  kaklise

  committed
  7ea6a6e

  Copy full SHA for 7ea6a6e

Commits on Dec 14, 2023

• Merge pull request #140 from kaklise/msx

  Show description for fd3ae03
  dbhart

  authored
  fd3ae03

  Copy full SHA for fd3ae03

• Fixing typos

  dbhart

  committed
  48a6faf

  Copy full SHA for 48a6faf

Commits on Dec 18, 2023

• Adding MSX binary files and updating .gitignore

  dbhart

  committed
  08b60b7

  Copy full SHA for 08b60b7

• Update dll paths

  dbhart

  committed
  263b9d6

  Copy full SHA for 263b9d6

Commits on Dec 19, 2023

• Updating tests...ish

  dbhart

  committed
  1709f1f

  Copy full SHA for 1709f1f

Commits on Feb 12, 2024

• MSX binaries update

  dbhart

  committed
  6b146c5

  Copy full SHA for 6b146c5

• Updates to documentation configuration

  dbhart

  committed
  076d202

  Copy full SHA for 076d202

• Merge branch 'USEPA:main' into msx

  dbhart

  authored
  8791ccc

  Copy full SHA for 8791ccc

Commits on Mar 11, 2024

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

  dbhart

  committed
  229f09f

  Copy full SHA for 229f09f

• Merge branch 'USEPA:main' into msx

  dbhart

  authored
  8eadd15

  Copy full SHA for 8eadd15

Commits on Mar 13, 2024

• Fix toolkit problems.

  Show description for 63d782a
  dbhart

  committed
  63d782a

  Copy full SHA for 63d782a

Commits on Apr 7, 2024

• Updates to fix the wn.msx variable assignment

  dbhart

  committed
  f95bbdf

  Copy full SHA for f95bbdf

Commits on Apr 30, 2024

• JSON schema commit

  dbhart

  committed
  f76e997

  Copy full SHA for f76e997

• Merge branch 'USEPA:main' into msx

  dbhart

  authored
  e5db660

  Copy full SHA for e5db660

Commits on May 4, 2024

• Update to MSX examples and bug fix

  dbhart

  committed
  d1df04e

  Copy full SHA for d1df04e

Commits on May 5, 2024

• Update to MSX demo

  dbhart

  committed
  168e59d

  Copy full SHA for 168e59d

Commits on May 7, 2024

• Update to the MSX demo jupyter notebook.

  dbhart

  committed
  5ba02f3

  Copy full SHA for 5ba02f3

• Update to demo

  dbhart

  committed
  4894e82

  Copy full SHA for 4894e82

• Merge branch 'USEPA:main' into msx

  dbhart

  authored
  53cb5be

  Copy full SHA for 53cb5be

Commits on May 20, 2024

• MSX updates

  Show description for 8124da7
  dbhart

  committed
  8124da7

  Copy full SHA for 8124da7

Commits on Jun 11, 2024

• first draft of plot_network function with a GIS backend

  kbonney

  committed
  2fe12ed

  Copy full SHA for 2fe12ed

Commits on Jul 2, 2024

• Merge branch 'USEPA:main' into msx

  dbhart

  authored
  b7e260f

  Copy full SHA for b7e260f

• Reverting

  dbhart

  committed
  366b7d7

  Copy full SHA for 366b7d7

Commits on Jul 15, 2024

• add msx simulation test

  kbonney

  committed
  6c6dc92

  Copy full SHA for 6c6dc92

• Revert documentation config changes

  dbhart

  committed
  2469acb

  Copy full SHA for 2469acb

• Revert conf.py

  dbhart

  committed
  891d33c

  Copy full SHA for 891d33c

• Finish revert erroneous commits

  dbhart

  committed
  fe5ca29

  Copy full SHA for fe5ca29

Commits on Jul 20, 2024

• CrowdStrike mess backup

  dbhart

  committed
  2ec9b81

  Copy full SHA for 2ec9b81

Commits on Aug 26, 2024

• Merge pull request #142 from USEPA/main

  Show description for a203e76
  dbhart

  authored
  a203e76

  Copy full SHA for a203e76

Commits on Sep 30, 2024

• incorporating the rest of the keywords from plot_network in plot_network_gis

  kbonney

  committed
  48ac43e

  Copy full SHA for 48ac43e

• Merge branch 'main' into gis_plotting

  kbonney

  committed
  b1bd4f6

  Copy full SHA for b1bd4f6

Commits on Oct 1, 2024

• Merge pull request #144 from USEPA/main

  Show description for 920c480
  dbhart

  authored
  920c480

  Copy full SHA for 920c480

• Merge pull request #141 from kbonney/msx

  Show description for a5c2ed3
  dbhart

  authored
  a5c2ed3

  Copy full SHA for a5c2ed3

• This addresses comments made regarding the msx model files. Documentation is not pulled in this commit

  dbhart

  committed
  f307ae9

  Copy full SHA for f307ae9

• combining link-like and node-like gis files

  kbonney

  committed
  3baa93a

  Copy full SHA for 3baa93a

• adding tank/reservoir marker shapes and implementating other type options for attributes

  kbonney

  committed
  487511a

  Copy full SHA for 487511a

Commits on Oct 7, 2024

• Update the epanetmsx binary builds from the USEPA official branch

  dbhart

  committed
  6bfe13c

  Copy full SHA for 6bfe13c

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

  dbhart

  committed
  c75d744

  Copy full SHA for c75d744

Commits on Oct 21, 2024

• set geopandas backend to the plot_network function name. update the geopandas backend to handle lists for attributes and add shapes for valves and pumps.

  kbonney

  committed
  9bc07cf

  Copy full SHA for 9bc07cf

• archive networkx plotting function in test suite

  kbonney

  committed
  3bb3c4b

  Copy full SHA for 3bb3c4b

• Merge branch 'USEPA:main' into msx

  dbhart

  authored
  1c3279f

  Copy full SHA for 1c3279f

Commits on Nov 5, 2024

• clean up function and add directed functionality

  kbonney

  committed
  1a7e0a5

  Copy full SHA for 1a7e0a5

• add comparison test for plotting

  kbonney

  committed
  08f9ee9

  Copy full SHA for 08f9ee9

• handle cbar manually to avoid error in earthquake demo

  kbonney

  committed
  1eaaade

  Copy full SHA for 1eaaade

• Merge remote-tracking branch 'usepa/main' into gis_plotting

  kbonney

  committed
  f0c32d4

  Copy full SHA for f0c32d4

• extend test cases

  kbonney

  committed
  80eaf96

  Copy full SHA for 80eaf96

Commits on Nov 18, 2024

• Updates to MSX documentation

  dbhart

  committed
  be18e35

  Copy full SHA for be18e35

Commits on Nov 20, 2024

• Merge remote-tracking branch 'usepa/main' into gis_plotting

  kbonney

  committed
  bacf024

  Copy full SHA for bacf024

• Merge remote-tracking branch 'usepa/main' into gis_plotting

  kbonney

  committed
  0757c2c

  Copy full SHA for 0757c2c

• fix bug caused by node_type no longer provided by GIS geodataframes, fix bugs pointed out by meghna: colorbar scale and spacing, reduce directed arrow size, add option for pumps/valves (default to …

  Show description for d0d59f4
  kbonney

  committed
  d0d59f4

  Copy full SHA for d0d59f4

• add extra test cases, remove unneccesary calls to plt.figure

  kbonney

  committed
  6e3fcf6

  Copy full SHA for 6e3fcf6

• setting compare to false

  kbonney

  committed
  a3b2576

  Copy full SHA for a3b2576

Commits on Nov 26, 2024

• add alpha to colorbars

  kbonney

  committed
  c267ac1

  Copy full SHA for c267ac1

• fix color bug on mpl 3.8, change plot_valve/pumps kwarg name, set aspect to "equal"

  kbonney

  committed
  664e4a5

  Copy full SHA for 664e4a5

• fix test case to adjust for new kwarg names

  kbonney

  committed
  6401716

  Copy full SHA for 6401716

Commits on Dec 2, 2024

• add legend and plot all nodes regardless of node_attribute

  kbonney

  committed
  105d243

  Copy full SHA for 105d243

• add additional tests

  kbonney

  committed
  c8f9fd5

  Copy full SHA for c8f9fd5

Commits on Dec 3, 2024

• remove old plot network code, clean up plot network, add default colorbar label when passing a str for attribute, fix missingkwds markersize

  kbonney

  committed
  0558ff8

  Copy full SHA for 0558ff8

• remove pump/valve direction plotting tests

  kbonney

  committed
  4a8f5a4

  Copy full SHA for 4a8f5a4

• update plot_network to use _format functions instead of _prepare function

  kbonney

  committed
  046006a

  Copy full SHA for 046006a

Commits on Dec 14, 2024

• build: Update binaries with structure condusive to multi-platform Darwin builds

  dbhart

  committed
  caa0af2

  Copy full SHA for caa0af2

• Merge branch 'USEPA:main' into msx

  dbhart

  authored
  171a22d

  Copy full SHA for 171a22d

• chore: Load libraries in a different manner

  dbhart

  committed
  7901c21

  Copy full SHA for 7901c21

• fix: misspelling in library name

  dbhart

  committed
  19a34f4

  Copy full SHA for 19a34f4

• fix: misspelling in library name in regular wntr too

  dbhart

  committed
  42e9d92

  Copy full SHA for 42e9d92

Commits on Dec 15, 2024

• fix: Update DLLs for EPANET

  dbhart

  committed
  a28fa71

  Copy full SHA for a28fa71

• debug: mark threaded test as skip temporarily.

  Show description for 35e46ca
  dbhart

  committed
  35e46ca

  Copy full SHA for 35e46ca

Commits on Dec 16, 2024

• Merge pull request #147 from kbonney/gis_plotting

  Show description for 0978643
  dbhart

  authored
  0978643

  Copy full SHA for 0978643

• fix: found bug with v2.2 threading

  dbhart

  committed
  effb245

  Copy full SHA for effb245

• fix: updated the initial_quality to valid gis name

  dbhart

  committed
  97a378d

  Copy full SHA for 97a378d

• Test build script update

  dbhart

  committed
  9053c5a

  Copy full SHA for 9053c5a

• build: add libomp brew formula

  dbhart

  committed
  0d9ba06

  Copy full SHA for 0d9ba06

• fix: missing comma breaking demos.

  dbhart

  committed
  f53c867

  Copy full SHA for f53c867

• docs: Update msx-library and string outputs in documentation

  dbhart

  committed
  d4041bf

  Copy full SHA for d4041bf

• fix: skip doctest ordered list

  dbhart

  committed
  1aa3184

  Copy full SHA for 1aa3184

• test: Skip v2.0 on ARM processor

  dbhart

  committed
  e79ae7b

  Copy full SHA for e79ae7b

• test: missed one test that needs to be skipped on arm processor

  dbhart

  committed
  1250cbe

  Copy full SHA for 1250cbe

• ci: Remove doctests for arm processor

  dbhart

  committed
  7872c33

  Copy full SHA for 7872c33

• ci: update release to proper macos names

  dbhart

  committed
  f99ad1d

  Copy full SHA for f99ad1d