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 |
|
Michael Tryby
|
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 |
|
Elad Salomons
|
13011ae71c
|
Merge pull request #229 from Mariosmsk/dev-issue228
Syntax for the epanet executable, thanks @Mariosmsk
|
2018-08-27 09:32:49 +03:00 |
|
Elad Salomons
|
6ab76efc5a
|
Merge pull request #226 from Mariosmsk/dev-epanet
fix addnode, thanks @Mariosmsk
|
2018-08-27 09:21:47 +03:00 |
|
Marios Kyriakou
|
f4a57a969e
|
delete comment strings
|
2018-08-25 13:15:33 +03:00 |
|
Michael Tryby
|
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 Tryby
|
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 |
|
Elad Salomons
|
a2fdd86a4d
|
Updating windows build script
|
2018-08-23 23:20:16 +03:00 |
|
Marios Kyriakou
|
6d99867af6
|
update
comment FMT01, FMT03, FMT09, FMT10, FMT11 in text.h
|
2018-08-23 16:59:02 +03:00 |
|
Marios Kyriakou
|
0e6cc51d81
|
Revert "remove dublicate definition"
This reverts commit 8808a01641.
|
2018-08-23 16:47:52 +03:00 |
|
Marios Kyriakou
|
4025d197b2
|
Revert "replace <text.h> to "text.h""
This reverts commit 842b7e64d1.
|
2018-08-23 16:47:31 +03:00 |
|
Marios Kyriakou
|
842b7e64d1
|
replace <text.h> to "text.h"
|
2018-08-23 16:26:13 +03:00 |
|
Michael Tryby
|
40cd25748c
|
Fixing bug EN_getcurvetype
|
2018-08-23 08:00:30 -04:00 |
|
Marios Kyriakou
|
8808a01641
|
remove dublicate definition
Add include text.h
|
2018-08-23 14:58:26 +03:00 |
|