JIANG/EPANET
1
0
Fork 0
Code Issues Pull Requests Actions 4 Packages Projects Releases Wiki Activity
1,434 Commits 1 Branch 0 Tags
b16dacb87e348b8ebe2ee3547bd4ce04373b2fc6
Commit Graph

307 Commits

Author SHA1 Message Date
Lew Rossman
39fcfa2162 Fixed bug setting pump curve params (#314) and in setting demand categories 
-Split off calc. of a pump's curve coeffs. from getpumpparams to updatepumpparams.
- Fixed problem with initializing node demand category when default demand pattern set before node is created.
- Increased MAXLINE to 1024 to accomodate increase in MAXMSG.
- Replaced EN_geterror calls in input2.c with geterrmsg (it's bad form to call API functions in the body of the library)
 2018-10-25 09:39:28 -04:00
Lew Rossman
69388024fb Fixed bug in EN_deletelink (#312) 2018-10-23 16:00:14 -04:00
Lew Rossman
f7346cef5f Modified re-factored version of hash.c 2018-10-19 10:36:39 -04:00
Lew Rossman
60a79de4a9 Fixed bug in hash.c 
A bug in the delete function in hash.c was preventing the unit test of the new set ID API functions from running properly. In fixing this bug the entire hash table code was refactored to make it look more like the mempool service routines. Also the need to copy the string passed into the table's insert function was eliminated.
 2018-10-18 10:03:09 -04:00
Lew Rossman
76419e0b4c Added EN_setnodeid and EN_setlinkid (Issue #306) 2018-10-17 09:05:16 -04:00
Lew Rossman
1c3044c948 Fix #211 for EN_setreport 2018-10-14 11:05:15 -04:00
Lew Rossman
7c021cf533 Fixed water quality mass balance issue (#160) 2018-10-09 12:53:20 -04:00
Elad Salomons
4848f692f6 Merge pull request #296 from eladsal/dev-dem-cat 
Add demand names get\set APIs
Close #294
 2018-10-01 10:47:40 +03:00
Elad Salomons
c1c80da667 Add APIs to get\set demand categories names 2018-09-26 11:15:37 +03:00
Marios Kyriakou
982ff903e3 add option EN_HEADLOSSFORM in function ENgetoption 2018-09-23 19:41:27 +03:00
Elad Salomons
dad11cce8d Add option to get\set default demand pattern 
also updates the net builder test
 2018-09-15 14:22:20 +03: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 Tryby
bec729a669 Fixing compiler warnings 2018-09-13 10:48:55 -04:00
Elad Salomons
40a53718cc Fix EN_setnodevalue for EN_MINLEVEL 
Vmin was not updated correctly
 2018-09-06 12:01:09 +03:00
Elad Salomons
756e8be735 Merge pull request #265 from eladsal/dev-control 
Add EN_addcontrol function
 2018-09-05 07:42:02 +03:00
Michael Tryby
ec6bb25a11 Merge branch 'dev' into issue-172 2018-09-04 15:00:21 -04:00
Elad Salomons
0f296db492 Initialize node and link comments in add functions 2018-09-04 21:15:57 +03:00
Michael Tryby
b7e9988b15 Adding unit test for reentrancy 2018-09-04 09:38:44 -04:00
Elad Salomons
fcbb47251e Fix old function calls 2018-09-04 08:26:22 +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
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