JIANG/EPANET
1
0
Fork 0
Code Issues Pull Requests Actions 4 Packages Projects Releases Wiki Activity
498 Commits 1 Branch 0 Tags
7d8d780a8b7016561dda8672f12f876ba03cf05b
Commit Graph

195 Commits

Author SHA1 Message Date
Elad Salomons
7d8d780a8b Merge branch 'dev' into pr86 2018-08-30 17:55:35 +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
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
edf4a09ebe Fix EN_addpattern 
Closes #231. Also adds unit test for the function.
 2018-08-29 15:14:49 +03: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
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
Michael Tryby
d5aeae893c Updating toolkit function to use errormanager 2018-08-27 12:16: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
f495d2c707 Merge branch 'dev' into contributor-lr 2018-08-24 16:09:21 -04: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
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
Michael Tryby
670440b55c Fixing function definition for EN_getcurve 2018-08-23 07:56:11 -04:00
Marios Kyriakou
219e46a467 Revert "remove dublicate definition" 
This reverts commit 1f4c3a0819.
 2018-08-23 14:54:48 +03:00
Marios Kyriakou
1f4c3a0819 remove dublicate definition 
Add include text.h
 2018-08-23 14:53:20 +03:00
Marios Kyriakou
29aa45febb Syntax for the epanet executable 2018-08-22 22:32:30 +03:00
Michael Tryby
75e400cf44 Merging changes from upstream dev 2018-08-22 15:09:33 -04:00
Michael Tryby
f66d4c68d9 Revert "Reorganizing / refactoring api functions for swig wrap" 
This reverts commit 437a7c70e0.
 2018-08-22 14:48:20 -04:00
Michael Tryby
bd4c369f83 Revert "Reorganizing / refactoring api functions for swig wrap" 
This reverts commit 8ff88f86b8.
 2018-08-22 14:46:45 -04:00
Marios Kyriakou
114bc4713c fix addnode 2018-08-22 19:37:27 +03:00
Elad Salomons
761199b08e Added ENgetcurvetype API 
Also update curve type on EN_setheadcurveindex.

Co-Authored-By: milad ghiami <milad-ghiami@users.noreply.github.com>
 2018-08-20 21:10:49 +03:00
Elad Salomons
634651d4e6 Add option to get pump's constant power and speed 
Details in #215
 2018-08-18 21:54:52 +03:00
Elad Salomons
99e7151172 Add option to get link state 
Add EN_STATE to ENgetlinkvalue. Related to #218
 2018-08-17 15:43:53 +03:00
Elad Salomons
4e48c31147 Fix PumpType and CurveType enums 
Also adds a general \default curve type. Fixes #208.
 2018-08-15 07:37:19 +03:00
Lew Rossman
b3e26b9ac8 Resolved conflict in inpfile.c 2018-08-13 10:11:34 -04:00
Lew Rossman
3bd2d4a800 Merge branch 'contributor-lr' of https://github.com/LRossman/EPANET into contributor-lr 2018-08-13 10:09:44 -04:00
Lew Rossman
a73d9235e7 Fixed max. flow change node ID in Status Report 2018-08-13 10:04:24 -04:00
Elad Salomons
d94e1643bf Update Windows build script and VB header file 
Also save HeadErrorLimit and FlowChangeLimit only if they are used.
 2018-08-13 09:19:05 +03:00
Lew Rossman
b5e3986e6b Pressure Dependent Demands added to address issue 163 2018-08-09 10:42:47 -04:00
Michael Tryby
8ff88f86b8 Reorganizing / refactoring api functions for swig wrap 2018-07-19 11:16:49 -04:00
Michael Tryby
437a7c70e0 Reorganizing / refactoring api functions for swig wrap 2018-07-18 18:33:51 -04:00
Michael Tryby
4723336726 Adding errormanager to toolkit api 2018-07-13 11:47:47 -04:00
Michael Tryby
245e2c5060 Adding tests and a fixture 2018-07-05 18:35:41 -04:00
Michael Tryby
ff2c851b1c Merging latest from dev, trying to get import lib generated 2018-07-03 17:38:40 -04:00
Lew Rossman
86ffbcf614 Improved node re-ordering method (Issue #162) 2018-07-02 13:55:41 -04:00
Lew Rossman
55a7179ca6 Merge branch 'contributor-lr' of https://github.com/LRossman/EPANET into contributor-lr 2018-06-21 12:05:59 -04:00
Lew Rossman
f5a1b9e518 Reverted to legacy Darcy-Weisbach method 2018-06-21 12:05:51 -04:00
Elad Salomons
f86df2291a Saving HeadErrorLimit and FlowChangeLimit only if they are used 
To help a bit with backward computability the two new parameters will be saved to the INP file only if values were set for them.
 2018-06-21 10:20:16 +03:00
Lew Rossman
e9303de078 Fixes to implement issue #161 2018-06-19 10:30:02 -04:00