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

231 Commits

Author SHA1 Message Date
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
Lew Rossman
d5194ffb81 Merge branch 'contributor-lr' of https://github.com/LRossman/EPANET into contributor-lr 2018-06-16 11:12:59 -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
Michael Tryby
d374e7bf1a Changing MAXFNAME from 260 back to 259 2018-06-15 10:41:52 -04:00
Lew Rossman
a73b2d7508 #defined MAXFNAME as 260 instead of L_tmpnam_s 2018-06-09 12:07:44 -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
4d1cd779ca Changed version # in binary output file 
Kept version number at 20012 in binary output file so that the existing EPANET GUI can use this EPANET DLL.
 2018-05-24 09:35:49 -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
Elad Salomons
b85aff9fc9 Change how demand categories linked-list is constructed (appending instead of prepending) 
Fix #150
This wasn't changed but one should note that the default pattern is used and saved if none assigned to a demand
 2018-04-09 15:01:27 +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