jiang/EPANET
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity
696 Commits 1 Branch 0 Tags
cba9dda5cf6dd242d990acf1863d692f07ddf30d
Commit Graph
100 Commits
This Branch
This Branch
All Branches
Author SHA1 Message Date
Michael Tryby cba9dda5cf Fixing build error gcc / Travis 2019-01-30 14:30:44 -05:00
Michael Tryby d62d606b30 Removing *.orig file 2019-01-30 13:36:04 -05:00
Michael Tryby 8dd917dfe5 Adding *.orig to .gitignore 2019-01-30 13:35:24 -05:00
Michael Tryby 725650853a Merge remote-tracking branch 'upstream/dev' into dev-swig-redux 2019-01-30 13:29:48 -05:00
Michael Tryby 8d12664061 Removing EN_API_FLOAT_TYPE 2019-01-28 11:31:31 -05:00
Michael Tryby b339ff22ca Merging dev into dev-swig-redux 2019-01-28 11:23:25 -05:00
Michael Tryby 30c9843965 Merge remote-tracking branch 'upstream/dev' into dev-swig-redux 2019-01-28 10:41:23 -05:00
Michael Tryby fed58fdcbd Updating benchmark version 2018-12-17 12:14:08 -05:00
Michael Tryby 9d83955129 Deleting test_epanet_py 2018-12-10 17:32:13 -05:00
Michael Tryby 186c17bb15 Adding file headers 2018-12-10 17:30:47 -05:00
Michael Tryby 9e3ecbd17f Merge remote-tracking branch 'upstream/dev' into dev-swig-redux 2018-12-10 17:17:11 -05:00
Michael Tryby 51795d86e9 Adding API for simple and rule based controls 2018-12-10 15:53:38 -05:00
Michael Tryby fca9c42411 Fixing arg as return with enum type 2018-12-07 16:23:12 -05:00
Michael Tryby d5de19caa0 Ongoing dev 2018-12-06 17:48:32 -05:00
Michael Tryby c1adfd514d Fleshing out api for swig wrap 2018-12-04 17:54:39 -05:00
Michael Tryby b63f232884 Initial commit interface for python wrap 2018-11-30 15:49:28 -05:00
Michael Tryby 9ed3462dbf Ignoring nrtestsuite/ and tests/data 2018-11-30 12:00:07 -05:00
Michael TrybyandGitHub 98cb6b4d12 Merge pull request #353 from michaeltryby/dev 
epanet toolkit api versioning
 2018-11-30 09:38:04 -05:00
Michael Tryby 76a9dd999c Fixing file header, adding epanet2.c to winbuild 2018-11-30 09:08:38 -05:00
Michael Tryby b0c7714d72 Keeping legacy api in epanet2.h epanet2.c and moving new api to epanet2_2.h epanet.c 2018-11-29 12:51:47 -05:00
Michael Tryby 333e87b026 Fixing tests 2018-11-29 12:20:13 -05:00
Michael Tryby fef02cd0a7 Merging origin dev 2018-11-29 12:02:10 -05:00
Michael Tryby be2ca0a9f6 Implmenting Toolkit API versioning 2018-11-29 11:57:51 -05:00
Michael TrybyandGitHub 4831fd7951 Merge pull request #1 from OpenWaterAnalytics/dev 
Updating my fork
 2018-11-28 19:19:01 -05:00
Michael TrybyandGitHub 9ff0056b7c Merge pull request #350 from LRossman/lrossman-dev 
Code cleanup
 2018-11-28 17:26:37 -05:00
Michael TrybyandGitHub 2988800448 Merge pull request #348 from michaeltryby/dev 
Rolling back errormanager
 2018-11-19 17:05:49 -05:00
Michael Tryby a611832184 Fixing build error 2018-11-19 16:51:39 -05:00
Michael Tryby ad4969ea1b Rolling back errormanager 2018-11-19 16:40:40 -05:00
Michael Tryby 440230ef6d Rolling back errormanager 2018-11-19 16:33:30 -05:00
Michael TrybyandGitHub 25a4d93ef5 Merge pull request #341 from michaeltryby/dev 
Adding test_save_reopen, minor refactoring.
 2018-11-16 16:39:09 -05:00
Michael Tryby b34c2ede81 Fixing build error on Travis 2018-11-16 14:06:29 -05:00
Michael Tryby a4c9973d47 Adding test_save_reopen, minor refactoring. 2018-11-16 13:49:45 -05:00
Michael TrybyandGitHub bdd67a9ae1 Merge pull request #332 from michaeltryby/dev 
Fix test_output check_cdd()
 2018-11-05 12:28:43 -05:00
Michael Tryby bfec6d608b Merging upstream dev 2018-11-05 10:12:24 -05:00
Michael Tryby 5f0ca809d7 Fixing bug in check_cdd 2018-11-05 10:05:30 -05:00
Michael TrybyandGitHub d42f191d45 Merge pull request #297 from LRossman/dev-lrossman 
Fixed water quality mass balance issue (#160)
 2018-10-12 09:13:14 -04:00
Michael Tryby 93760176bf Updateing benchmark 2018-10-12 08:58:17 -04:00
Michael TrybyandGitHub 27863babe7 Merge pull request #299 from michaeltryby/dev 
Saves SUT benchmark as build artifact on Appveyor
 2018-10-11 11:44:20 -04:00
Michael Tryby e943dd7174 Saving SUT benchmarks as artifact 2018-10-11 08:02:15 -04:00
Michael Tryby c0425022ab Saving SUT benchmarks as artifact 2018-10-10 18:00:52 -04:00
Michael TrybyandGitHub 3afb14a6c8 Merge pull request #288 from michaeltryby/dev 
Fixing memory leak
 2018-09-18 16:10:35 -04:00
Michael Tryby b1bb94fa74 Fixing memory leak 2018-09-18 16:02:56 -04:00
Michael TrybyandGitHub 43e5c42d9d Merge pull request #285 from michaeltryby/dev 
Fixes error messages
 2018-09-14 16:29:03 -04:00
Michael Tryby aadfb19a74 Reverting ENepanet from runconcurrent() to EN_runproject() 2018-09-14 15:59:41 -04:00
Michael Tryby 945280e441 Fixing bug in geterrmsg() 2018-09-14 15:51:51 -04:00
Michael TrybyandGitHub 5cdb33110e Merge pull request #282 from LRossman/lrossman-dev 
Fixes zero flow (#164) and D-W eqn. (#199) issues
 2018-09-13 17:03:02 -04:00
Michael Tryby d164293d8d Triggering appveyor build 2018-09-13 16:48:45 -04:00
Michael Tryby 2a86252a10 Updating benchmark 2018-09-13 16:20:52 -04:00
Michael Tryby 7e6ceb4366 Resolving merge conflicts 2018-09-13 10:54:11 -04:00
Michael Tryby bec729a669 Fixing compiler warnings 2018-09-13 10:48:55 -04:00
Michael TrybyandGitHub b7dfc9f898 Merge pull request #276 from michaeltryby/dev 
Add ENgetdemandpattern()
 2018-09-04 15:23:31 -04:00
Michael Tryby c64cc8da19 Merge branch 'dev' of https://github.com/OpenWaterAnalytics/EPANET into dev 2018-09-04 15:18:16 -04:00
Michael Tryby 8059a90192 Add ENsetdemandpattern 2018-09-04 15:16:40 -04:00
Michael TrybyandGitHub f6de130360 Merge pull request #238 from OpenWaterAnalytics/issue-172 
Issue 172
 2018-09-04 15:12:03 -04:00
Michael TrybyandGitHub ec6bb25a11 Merge branch 'dev' into issue-172 2018-09-04 15:00:21 -04:00
Michael TrybyandGitHub 4662296080 Merge pull request #274 from michaeltryby/dev 
Makes GENX opt in
 2018-09-04 14:55:42 -04:00
Michael Tryby 30a694d62e Removing NO_GENX from win_build Makefile.bat 2018-09-04 14:42:24 -04:00
Michael Tryby 78999ea795 Getting runepanet to link on 32bit 2018-09-04 13:13:56 -04:00
Michael Tryby 5f2de4ab5d Merging upstream dev 2018-09-04 11:56:06 -04:00
Michael Tryby b9a1934879 Making epanet exports opt in 2018-09-04 11:53:53 -04:00
Michael TrybyandGitHub bb65170eb1 Merge pull request #267 from LRossman/lrossman-dev 
Made mempool.c threadsafe (#234)
 2018-09-04 10:35:55 -04:00
Michael Tryby a056bbf2c8 Fixing build error on Travis 2018-09-04 10:05:27 -04:00
Michael Tryby 7188642e39 Installing boost thread library 2018-09-04 09:50:08 -04:00
Michael Tryby b7e9988b15 Adding unit test for reentrancy 2018-09-04 09:38:44 -04:00
Michael TrybyandGitHub f7d54810ea Update README.md 
Fixing Travis badge.
 2018-08-31 13:36:03 -04:00
Michael TrybyandGitHub c09761d8b8 Merge pull request #258 from michaeltryby/dev 
Fix Travis build
 2018-08-31 13:30:53 -04:00
Michael Tryby b2aa8de927 Fixing build error on Travis 2018-08-31 13:15:00 -04:00
Michael Tryby 7326ca4b26 Fixing merge conflicts 2018-08-31 13:10:34 -04:00
Michael TrybyandGitHub 8f54341ea6 Merge pull request #257 from OpenWaterAnalytics/revert-252-dev 
Revert "Make memorypool threadsafe "
 2018-08-31 12:59:19 -04:00
Michael TrybyandGitHub d33167161a Revert "Make memorypool threadsafe " 2018-08-31 11:14:16 -04:00
Michael Tryby 84eb306681 Shutting of regression testing. 2018-08-31 10:54:37 -04:00
Michael Tryby b6250e27eb Reverting change to Boost_THREADAPI 2018-08-31 08:41:42 -04:00
Michael Tryby dcf556ef0d Cleaning up unit test build and test header 2018-08-31 08:24:23 -04:00
Michael TrybyandGitHub b537a27965 Merge pull request #252 from michaeltryby/dev 
Make memorypool threadsafe
 2018-08-30 19:24:26 -04:00
michaeltryby 5a007bc1f6 Adding header 2018-08-30 19:12:27 -04:00
Michael Tryby 6527819d00 Forgot to add test 2018-08-30 15:53:01 -04:00
Michael Tryby 3433b9d5eb Add boost threads lib to Travis config 2018-08-30 15:47:44 -04:00
Michael Tryby c4b6756926 Fixing compile error on Travis 2018-08-30 15:39:06 -04:00
Michael Tryby 21f40f0daf Making memorypool.c reentrant and adding test 2018-08-30 15:30:34 -04:00
Michael TrybyandGitHub 5161ad9972 Fix Appveyor badge 
Close #246
 2018-08-29 10:17:36 -04:00
Michael TrybyandGitHub 045742afe5 Merge pull request #244 from michaeltryby/dev 
Fixes python wrapper build
 2018-08-28 14:26:12 -04:00
Michael Tryby bb047c972f Fixing build error on Visual Studio 2010 2018-08-28 13:58:47 -04:00
Michael Tryby 0188b8e976 Fixing compiler warning on Travis build 2018-08-28 12:18:27 -04:00
Michael Tryby bdfe7ec289 Fixing build for python wrapper 2018-08-28 11:23:30 -04:00
Michael Tryby 21ab62cfd4 Merge branch 'dev' of https://github.com/OpenWaterAnalytics/EPANET into dev 2018-08-28 08:50:41 -04:00
Michael TrybyandGitHub 8f6c56e0cd Merge pull request #230 from michaeltryby/copy-dev-swig 
SWIG wrapper development
 2018-08-27 13:46:57 -04:00
Michael Tryby d5aeae893c Updating toolkit function to use errormanager 2018-08-27 12:16:55 -04:00
Michael Tryby 1602e5bf66 Resolving merge conflicts 2018-08-27 09:46:55 -04:00
Michael Tryby f03e954dc8 Merge branch 'dev' of https://github.com/OpenWaterAnalytics/EPANET into copy-dev-swig 2018-08-27 09:40:20 -04:00
Michael Tryby bdc05058ca Resolving merge conflicts 2018-08-27 09:38:46 -04:00
Michael TrybyandGitHub c4b7c90634 Merge pull request #210 from LRossman/contributor-lr 
Pressure Dependent Demands added to address issue 163
 2018-08-24 17:30:38 -04:00
Michael Tryby 93061191c5 Trigging CI build 2018-08-24 17:24:11 -04:00
Michael Tryby 22d0e036c4 Trigging CI build 2018-08-24 17:09:31 -04:00
Michael Tryby f847a3ed6e Merge branch 'contributor-lr' of https://github.com/LRossman/EPANET into contributor-lr 2018-08-24 16:14:54 -04:00
Michael Tryby 66bb150f99 Forgot to add new tests 2018-08-24 16:12:47 -04:00
Michael TrybyandGitHub f495d2c707 Merge branch 'dev' into contributor-lr 2018-08-24 16:09:21 -04:00
Michael Tryby 364e4987d8 Bumping rolling benchmark version 2018-08-24 16:03:53 -04:00
Michael Tryby 40cd25748c Fixing bug EN_getcurvetype 2018-08-23 08:00:30 -04:00
Michael Tryby 670440b55c Fixing function definition for EN_getcurve 2018-08-23 07:56:11 -04:00
Michael Tryby e8acc1b177 Fixing build 2018-08-23 07:48:01 -04:00