JIANG/EPANET
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity
759 Commits 1 Branch 0 Tags
a626ef941c2be6963f5fcaec6ff4f538e7e14f35
Commit Graph

185 Commits

Author SHA1 Message Date
Michael Tryby
d33167161a Revert "Make memorypool threadsafe " 2018-08-31 11:14:16 -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
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
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
Sam Hatchett
8f69f2f975 re-index nodes in controls/rules 
fixes #172 but opens another issue.
 2018-08-27 16:28:27 -04: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
6ab76efc5a Merge pull request #226 from Mariosmsk/dev-epanet 
fix addnode, thanks @Mariosmsk
 2018-08-27 09:21:47 +03:00
Michael Tryby
f495d2c707 Merge branch 'dev' into contributor-lr 2018-08-24 16:09:21 -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
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
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
b3ab8ea2c7 Addresses issue #161 
Adds new options HEADERROR and FLOWCHANGE to provide more rigorous criteria for hydraulic convergence. Also breaks HYDRAUL.C into 3 separate files to improve code readability.
 2018-06-16 11:02:18 -04:00
Lew Rossman
f0c9684871 Changes to pass reg tests 
Revised getTmpName() in EPANET.C
 2018-06-05 10:31:18 -04:00
Lew Rossman
24d6b91607 Changes to get Net1.inp to run 2018-05-22 11:12:14 -04:00
Elad Salomons
80a0acc26b Set default pattern for new junctions 
Also fix an `ENgetqualtype` function call to include the project pointer
 2018-04-18 08:29:22 +03:00
Elad Salomons
a46652f47c Fix bug when adding a junction 2018-04-17 21:46:09 +03:00
Michael Tryby
ddd08e3d5f Conforming to pointer declaration style. 2018-02-02 10:52:32 -05:00
Michael Tryby
38292ad849 Fixed bug that was causing hard crash 2018-02-02 08:16:17 -05:00
Michael Tryby
17cd1c60f8 Switching EN_Project to void* for SWIG wrap. Cleaning up build. 2018-02-01 17:10:36 -05:00
Michael Tryby
62d6c9fade Converting EN_Project to void* EN_ProjectHandle to facilitate wrapping Toolkit API using SWIG. 2018-01-30 18:12:27 -05:00
Michael Tryby
5e3ab5428d Merge remote-tracking branch 'refs/remotes/upstream/dev' into dev-swig 2018-01-24 14:34:49 -05:00
Michael Tryby
691c65878b Initial commit of toolkit SWIG wrapper work 2018-01-12 09:46:32 -05:00
Sam Hatchett
d2503bc035 allows changing model units on-the-fly 
replaces PR #140
and with special thanks to @eladsal
 2018-01-11 15:22:26 -05:00