Commit Graph

676 Commits

Author SHA1 Message Date
Lew Rossman
fdca2bef42 Edits made to 2.2 Release Notes 2018-09-03 10:34:03 -04:00
Lew Rossman
6e73b6a4f5 Made mempool.c threadsafe (#234) 2018-09-03 10:29:41 -04:00
Elad Salomons
7957864d62 Another fix for unit test 2018-09-03 14:10:09 +03:00
Elad Salomons
c78aa9df99 Fix for unit test 2018-09-03 13:52:37 +03:00
Elad Salomons
1b23f91f72 Unit test for EN_addcontrol 2018-09-03 13:48:18 +03:00
Elad Salomons
d09548992f Add EN_addcontrol function 2018-09-03 12:35:39 +03:00
Elad Salomons
5d241e2fbd Create headers for EN_addcontrol 2018-09-03 08:18:42 +03:00
Elad Salomons
0b9dd8d29a Minor fix for VB header file
type is a reserved keyword in VB
2018-09-03 07:44:37 +03:00
Michael Tryby
f7d54810ea Update README.md
Fixing Travis badge.
2018-08-31 13:36:03 -04:00
Michael Tryby
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 Tryby
8f54341ea6 Merge pull request #257 from OpenWaterAnalytics/revert-252-dev
Revert "Make memorypool threadsafe "
2018-08-31 12:59:19 -04:00
Michael Tryby
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
Elad Salomons
25db9cfe8f Merge pull request #242 from Mariosmsk/pr86
add ENsetdemandpattern. Closes #241
2018-08-31 06:51:39 +03:00
Michael Tryby
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
Elad Salomons
74d68a884c Fix typo 2018-08-30 18:05:39 +03:00
Elad Salomons
7d8d780a8b Merge branch 'dev' into pr86 2018-08-30 17:55:35 +03:00
Marios Kyriakou
8991d6baf9 add test for the function EN_setdemandpattern 2018-08-30 17:21:02 +03:00
Marios Kyriakou
d41f362ab5 Fix crash with wrong parameters
ENgetbasedemand, ENsetbasedemand, ENgetdemandpattern, ENsetdemandpattern

Co-Authored-By: Elad Salomons <selad@optiwater.com>
2018-08-30 12:52:23 +03:00
Elad Salomons
7d374338a7 Merge pull request #250 from eladsal/dev-232
Add legacy ENinit API and set status for new links in EN_addlink
2018-08-30 12:47:27 +03:00
Elad Salomons
cff7ca7433 Merge pull request #248 from OpenWaterAnalytics/dev-231
Fix EN_addpattern and add test for the function
2018-08-30 12:46:56 +03:00
Marios Kyriakou
803f86959d Revert "Fix crash with wrong parameters"
This reverts commit c0b91fa9e3.
2018-08-30 12:45:21 +03:00
Marios Kyriakou
c0b91fa9e3 Fix crash with wrong parameters
ENgetbasedemand, ENsetbasedemand, ENgetdemandpattern, ENsetdemandpattern
2018-08-30 12:32:00 +03:00
Elad Salomons
dbdafd6352 Set status for new links in EN_addlink
Status is OPEN for pumps\pipes\CV and ACTIVE for valves. Closes #173
2018-08-29 22:31:28 +03:00
Elad Salomons
bcd6877935 Add legacy ENinit API
Closes #232
2018-08-29 22:26:32 +03:00
Elad Salomons
f3d680dc54 Fix test_addpattern test
Thanks @mariosmsk

Co-Authored-By: Marios S. Kyriakou <mariosmsk@gmail.com>
2018-08-29 18:12:25 +03:00
Michael Tryby
5161ad9972 Fix Appveyor badge
Close #246
2018-08-29 10:17:36 -04:00
Elad Salomons
edf4a09ebe Fix EN_addpattern
Closes #231. Also adds unit test for the function.
2018-08-29 15:14:49 +03:00
Michael Tryby
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
Marios Kyriakou
476604bf6f add ENsetdemandpattern function in epanet2.def 2018-08-28 12:07:25 +03:00
Marios Kyriakou
8ca56d7c9d remove space 2018-08-28 00:25:31 +03:00
Marios Kyriakou
70f51d9567 add ENsetdemandpattern 2018-08-28 00:19:56 +03:00
Sam Hatchett
b6c9808905 Merge branch 'dev' of https://github.com/OpenWaterAnalytics/EPANET into issue-173 2018-08-27 16:31:31 -04:00
Sam Hatchett
8f69f2f975 re-index nodes in controls/rules
fixes #172 but opens another issue.
2018-08-27 16:28:27 -04:00
Elad Salomons
da8522b553 Merge pull request #236 from Mariosmsk/issue235
add hydstatus.c in win_build file to fix #235
2018-08-27 23:18:29 +03:00
Marios Kyriakou
05d52c8022 add hydstatus.c in win_build file 2018-08-27 23:04:13 +03:00
Sam Hatchett
6316f6757d re-adds header/dat files to IDE cmake output 2018-08-27 16:02:00 -04:00