JIANG/EPANET
1
0
Fork 0
Code Issues Pull Requests Actions 4 Packages Projects Releases Wiki Activity

Commit Graph

  • 678a2c2b45 Introducing default arguments Michael Tryby 2019-02-12 13:13:35 -05:00
  • d33afdd079 Applying default arguments Michael Tryby 2019-02-12 11:26:12 -05:00
  • 03de01460e Merge remote-tracking branch 'upstream/dev' into dev Michael Tryby 2019-02-11 16:54:21 -05:00
  • 56d1fe2f35 Merge pull request #390 from michaeltryby/dev Michael Tryby 2019-02-11 16:22:15 -05:00
  • 219e3ab0ce Merge pull request #389 from LRossman/lrossman-dev1 Lew Rossman 2019-02-11 16:18:22 -05:00
  • 02756af9c5 Merge remote-tracking branch 'upstream/dev' into dev Michael Tryby 2019-02-11 15:58:54 -05:00
  • f4ea0a671e Running all tests Michael Tryby 2019-02-11 15:51:40 -05:00
  • 38f1e77759 Merge remote-tracking branch 'origin/dev' into dev Michael Tryby 2019-02-11 15:44:56 -05:00
  • 3e8e1c6009 Updating Travis to run coverage for reg tests Michael Tryby 2019-02-11 15:44:26 -05:00
  • 799874d3c8 Adding options and usage to run-nrtest.sh Michael Tryby 2019-02-11 15:43:53 -05:00
  • 3eb9a68783 Fixes win_build and VS/cmake build problems Lew Rossman 2019-02-11 14:30:15 -05:00
  • d6d244d4d2 Merge pull request #386 from LRossman/lrossman-dev Lew Rossman 2019-02-10 22:55:54 -05:00
  • 339e37b724 Merge pull request #387 from michaeltryby/dev Michael Tryby 2019-02-09 17:07:14 -05:00
  • 6ec7a705de Updating codecov badge Michael Tryby 2019-02-09 17:06:33 -05:00
  • 996e26158c Updates documentation with newly added functions Lew Rossman 2019-02-08 19:06:42 -05:00
  • 60f1e5eda8 Rolling back coveralls going with codecov Michael Tryby 2019-02-08 16:52:07 -05:00
  • f8a397b536 Trying codecov Michael Tryby 2019-02-08 16:30:40 -05:00
  • 847da683a1 Messing with excludes Michael Tryby 2019-02-08 15:29:01 -05:00
  • 2c86a8febb Fixes the win_build Makefile.bat file Lew Rossman 2019-02-08 15:27:52 -05:00
  • 09cbe57518 Messing with excludes Michael Tryby 2019-02-08 15:19:04 -05:00
  • c6642a2485 Merge pull request #2 from michaeltryby/dev-coverage Michael Tryby 2019-02-08 15:12:17 -05:00
  • 26266c342c excluding project dirs from coverage Michael Tryby 2019-02-08 15:00:19 -05:00
  • 1531b29ec5 Configuring coveralls Michael Tryby 2019-02-08 14:37:41 -05:00
  • eae80cb624 Configuring Travis for coverage Michael Tryby 2019-02-08 14:31:16 -05:00
  • 4af84f5ce7 Adding encrypted coveralls repo token Michael Tryby 2019-02-08 14:14:59 -05:00
  • cc7f9f13f5 Setting up Travis working for coverage Michael Tryby 2019-02-08 13:18:06 -05:00
  • bacbac3e83 Merge remote-tracking branch 'upstream/dev' into dev Michael Tryby 2019-02-08 13:03:07 -05:00
  • 36b78f28d3 New function clearreport added (see issue #383) Lew Rossman 2019-02-08 12:07:56 -05:00
  • 140c95214e Merge pull request #385 from eladsal/dev-title Elad Salomons 2019-02-07 22:13:40 +02:00
  • 8a7277eab0 Adding build option for coverage Michael Tryby 2019-02-07 11:34:18 -05:00
  • ab62d3bb61 Add new function to get and set title strings Elad Salomons 2019-02-06 11:45:48 +02:00
  • a845f6a586 Merge remote-tracking branch 'upstream/dev' into dev Michael Tryby 2019-02-05 14:42:19 -05:00
  • 3c5ce9a342 Merge pull request #384 from michaeltryby/dev Michael Tryby 2019-02-05 10:54:52 -05:00
  • 6a0151b9c7 Adding support for custom epanet_py build target Michael Tryby 2019-02-04 14:28:32 -05:00
  • a16cc7cae1 Merge branch 'dev' into feature-64bit Michael Tryby 2019-02-01 11:45:34 -05:00
  • 7c89abebaa Merge remote-tracking branch 'upstream/dev' into dev Michael Tryby 2019-02-01 11:41:19 -05:00
  • 8275a62480 Merge pull request #380 from michaeltryby/dev-swig-redux Michael Tryby 2019-01-31 15:30:38 -05:00
  • cba9dda5cf Fixing build error gcc / Travis Michael Tryby 2019-01-30 14:30:44 -05:00
  • d62d606b30 Removing *.orig file Michael Tryby 2019-01-30 13:36:04 -05:00
  • 8dd917dfe5 Adding *.orig to .gitignore Michael Tryby 2019-01-30 13:35:24 -05:00
  • 725650853a Merge remote-tracking branch 'upstream/dev' into dev-swig-redux Michael Tryby 2019-01-30 13:29:48 -05:00
  • bdbd23edba Merge pull request #377 from Mariosmsk/patch-1 Elad Salomons 2019-01-30 19:47:32 +02:00
  • ba8926e4c4 Merge pull request #378 from LRossman/lrossman-dev Lew Rossman 2019-01-29 19:17:41 -05:00
  • 5adc02bc99 call ENnextH before ENnextQ Marios S. Kyriakou 2019-01-29 18:50:17 +02:00
  • 67947e5ea8 Minor edits to documentation Lew Rossman 2019-01-29 09:46:14 -05:00
  • 8d12664061 Removing EN_API_FLOAT_TYPE Michael Tryby 2019-01-28 11:31:31 -05:00
  • b339ff22ca Merging dev into dev-swig-redux Michael Tryby 2019-01-28 11:23:25 -05:00
  • 30c9843965 Merge remote-tracking branch 'upstream/dev' into dev-swig-redux Michael Tryby 2019-01-28 10:41:23 -05:00
  • 7fc2a3b314 Merge remote-tracking branch 'upstream/dev' into dev Michael Tryby 2019-01-28 10:26:44 -05:00
  • d5e467fe47 Update ReleaseNotes2_1.md Marios S. Kyriakou 2019-01-28 17:25:21 +02:00
  • c877730f6e added the ENopenQ; in example code Marios S. Kyriakou 2019-01-28 17:24:07 +02:00
  • 3b6b0d9f40 Merge pull request #374 from LRossman/lrossman-dev Lew Rossman 2019-01-25 15:38:25 -05:00
  • 821d13497f Replaced the Doxygen files in the doc folder (issue #373) Lew Rossman 2019-01-24 10:51:37 -05:00
  • 2626ab9982 Merge pull request #372 from LRossman/lrossman-dev Lew Rossman 2019-01-22 10:50:07 -05:00
  • 0cfa45e52e New updates to address compiler warnings (issue #370) Lew Rossman 2019-01-19 16:56:19 -05:00
  • 414db4d7e2 Merge pull request #369 from LRossman/lrossman-dev Lew Rossman 2019-01-16 09:20:34 -05:00
  • f673aa2f20 Modifications made to EN_getlinkvalue & EN_setlinkvalue in EPANET.C Lew Rossman 2019-01-11 12:52:09 -05:00
  • 23e542a492 Mark VB reserved words in variable names Elad Salomons 2019-01-10 08:39:49 +02:00
  • dd376692ad Floating pt. args in thread-safe API changed to doubles (Issue #365) Lew Rossman 2019-01-09 15:14:10 -05:00
  • 15bc01253b Merge pull request #368 from LRossman/lrossman-dev Lew Rossman 2019-01-04 12:20:52 -05:00
  • baa7ba9357 Update ReleaseNotes2_2.md Lew Rossman 2019-01-02 11:04:34 -05:00
  • 628fffc718 Added additional network building features (#367) Lew Rossman 2019-01-02 10:33:58 -05:00
  • 9464465fa7 Merge pull request #363 from LRossman/lrossman-dev Lew Rossman 2018-12-21 10:40:17 -05:00
  • 3ce0361c1d Network validity checks added to openhyd() Lew Rossman 2018-12-20 08:36:05 -05:00
  • a66f5a2c92 Checks addded to prevent changing network structure when solver active (#361) Lew Rossman 2018-12-18 15:35:06 -05:00
  • 311871b577 Merge pull request #360 from LRossman/lrossman-dev Lew Rossman 2018-12-17 13:13:08 -05:00
  • fed58fdcbd Updating benchmark version Michael Tryby 2018-12-17 12:14:08 -05:00
  • f1175b1f92 Error reporting fixes and re-formatting (issue #358) Lew Rossman 2018-12-15 15:13:19 -05:00
  • 9d83955129 Deleting test_epanet_py Michael Tryby 2018-12-10 17:32:13 -05:00
  • 186c17bb15 Adding file headers Michael Tryby 2018-12-10 17:30:47 -05:00
  • 9e3ecbd17f Merge remote-tracking branch 'upstream/dev' into dev-swig-redux Michael Tryby 2018-12-10 17:17:11 -05:00
  • 51795d86e9 Adding API for simple and rule based controls Michael Tryby 2018-12-10 15:53:38 -05:00
  • fca9c42411 Fixing arg as return with enum type Michael Tryby 2018-12-07 16:23:12 -05:00
  • 4e3b96e61c Merge pull request #356 from LRossman/lrossman-dev Lew Rossman 2018-12-07 16:15:54 -05:00
  • 6783b68e4f Set main() to return 100, not errmsg, if run has fatal error Lew Rossman 2018-12-07 11:41:37 -05:00
  • e2ee4564a8 Return 0 from main.c if run has warnings Lew Rossman 2018-12-07 09:46:15 -05:00
  • d5de19caa0 Ongoing dev Michael Tryby 2018-12-06 17:48:32 -05:00
  • fa80bec8bb Included error number as part of error message (issue #357) Lew Rossman 2018-12-06 11:40:59 -05:00
  • 0930a64142 Re-write of main.c Lew Rossman 2018-12-06 11:11:41 -05:00
  • 5f2cd402ef Merge pull request #354 from LRossman/lrossman-dev Lew Rossman 2018-12-06 10:56:08 -05:00
  • c1adfd514d Fleshing out api for swig wrap Michael Tryby 2018-12-04 17:54:39 -05:00
  • 107483bee8 Avoid possible divide by zero in hydcoeffs.c Lew Rossman 2018-12-04 09:50:01 -05:00
  • b63f232884 Initial commit interface for python wrap Michael Tryby 2018-11-30 15:49:28 -05:00
  • 9ed3462dbf Ignoring nrtestsuite/ and tests/data Michael Tryby 2018-11-30 12:00:07 -05:00
  • 98cb6b4d12 Merge pull request #353 from michaeltryby/dev Michael Tryby 2018-11-30 09:38:04 -05:00
  • 76a9dd999c Fixing file header, adding epanet2.c to winbuild Michael Tryby 2018-11-30 09:08:38 -05:00
  • b0c7714d72 Keeping legacy api in epanet2.h epanet2.c and moving new api to epanet2_2.h epanet.c Michael Tryby 2018-11-29 12:51:47 -05:00
  • 333e87b026 Fixing tests Michael Tryby 2018-11-29 12:20:13 -05:00
  • fef02cd0a7 Merging origin dev Michael Tryby 2018-11-29 12:02:10 -05:00
  • be2ca0a9f6 Implmenting Toolkit API versioning Michael Tryby 2018-11-29 11:57:51 -05:00
  • 4831fd7951 Merge pull request #1 from OpenWaterAnalytics/dev Michael Tryby 2018-11-28 19:19:01 -05:00
  • 9ff0056b7c Merge pull request #350 from LRossman/lrossman-dev Michael Tryby 2018-11-28 17:26:37 -05:00
  • 20bc6358ff Restored previous parallel link detection method to smatrix.c Lew Rossman 2018-11-28 10:01:29 -05:00
  • d3a50dc490 Fixed refactoring bug in EN_setlinkid Lew Rossman 2018-11-27 19:25:01 -05:00
  • b7a7cdc5ee Another update to test_setid.cpp Lew Rossman 2018-11-27 16:45:13 -05:00
  • 7c21b9c740 Update test_setid.cpp Lew Rossman 2018-11-27 16:10:39 -05:00
  • 24d90a530d Replaced EN_ProjectHandle with EN_Project in unit tests Lew Rossman 2018-11-27 15:16:12 -05:00
  • 9a540cc0f4 Code cleanup Lew Rossman 2018-11-27 14:22:06 -05:00
  • 2988800448 Merge pull request #348 from michaeltryby/dev Michael Tryby 2018-11-19 17:05:49 -05:00
  • a611832184 Fixing build error Michael Tryby 2018-11-19 16:51:39 -05:00