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

676 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
Marios S. Kyriakou
c877730f6e added the ENopenQ; in example code 
for the hydraulic and water quality analysis steps
 2019-01-28 17:24:07 +02:00
Lew Rossman
3b6b0d9f40 Merge pull request #374 from LRossman/lrossman-dev 
Replaced the Doxygen files in the doc folder (issue #373)
 2019-01-25 15:38:25 -05:00
Lew Rossman
821d13497f Replaced the Doxygen files in the doc folder (issue #373) 2019-01-24 10:51:37 -05:00
Lew Rossman
2626ab9982 Merge pull request #372 from LRossman/lrossman-dev 
New updates to address compiler warnings (issue #370)
 2019-01-22 10:50:07 -05:00
Lew Rossman
0cfa45e52e New updates to address compiler warnings (issue #370) 
In addition to addressing compiler warnings, argument names in the API function prototypes were made more consistent and descriptive. Also additional Doxygen comments were added in preparation for producing a more thorough documentation of the API.
 2019-01-19 16:56:19 -05:00
Lew Rossman
414db4d7e2 Merge pull request #369 from LRossman/lrossman-dev 
Floating pt. args in thread-safe API changed to doubles (Issue #365)
 2019-01-16 09:20:34 -05:00
Lew Rossman
f673aa2f20 Modifications made to EN_getlinkvalue & EN_setlinkvalue in EPANET.C 
1. EN__PUMP_ECOST added to EN_getlinkvalue.
2. Order of cases in switch statement of both EN_getlinkvalue and EN_setlinkvalue changed to match the order of EN_LinkProperty enumeration.
 2019-01-11 12:52:09 -05:00
Elad Salomons
23e542a492 Mark VB reserved words in variable names 
I have marked the VB reserved words with an ending "_". Sorry the IDE messed the nice spacing...
 2019-01-10 08:39:49 +02:00
Lew Rossman
dd376692ad Floating pt. args in thread-safe API changed to doubles (Issue #365) 2019-01-09 15:14:10 -05:00
Lew Rossman
15bc01253b Merge pull request #368 from LRossman/lrossman-dev 
Added additional network building features (#367)
 2019-01-04 12:20:52 -05:00
Lew Rossman
baa7ba9357 Update ReleaseNotes2_2.md 2019-01-02 11:04:34 -05:00
Lew Rossman
628fffc718 Added additional network building features (#367) 2019-01-02 10:33:58 -05:00
Lew Rossman
9464465fa7 Merge pull request #363 from LRossman/lrossman-dev 
Checks addded to prevent changing network structure when solver active (#361)
 2018-12-21 10:40:17 -05:00
Lew Rossman
3ce0361c1d Network validity checks added to openhyd() 
Checks on illegal valve connections made whenever API creates a new link, changes its end nodes, or changes its type.
 2018-12-20 08:36:05 -05:00
Lew Rossman
a66f5a2c92 Checks addded to prevent changing network structure when solver active (#361) 2018-12-18 15:35:06 -05:00
Lew Rossman
311871b577 Merge pull request #360 from LRossman/lrossman-dev 
Error reporting fixes and re-formatting (issue #358)
 2018-12-17 13:13:08 -05:00
Michael Tryby
fed58fdcbd Updating benchmark version 2018-12-17 12:14:08 -05:00
Lew Rossman
f1175b1f92 Error reporting fixes and re-formatting (issue #358) 2018-12-15 15:13:19 -05:00
Lew Rossman
4e3b96e61c Merge pull request #356 from LRossman/lrossman-dev 
Re-write of main.c (issue #355)
 2018-12-07 16:15:54 -05:00
Lew Rossman
6783b68e4f Set main() to return 100, not errmsg, if run has fatal error 2018-12-07 11:41:37 -05:00
Lew Rossman
e2ee4564a8 Return 0 from main.c if run has warnings 2018-12-07 09:46:15 -05:00
Lew Rossman
fa80bec8bb Included error number as part of error message (issue #357) 2018-12-06 11:40:59 -05:00
Lew Rossman
0930a64142 Re-write of main.c 2018-12-06 11:11:41 -05:00
Lew Rossman
5f2cd402ef Merge pull request #354 from LRossman/lrossman-dev 
Avoid possible divide by zero in hydcoeffs.c
 2018-12-06 10:56:08 -05:00
Lew Rossman
107483bee8 Avoid possible divide by zero in hydcoeffs.c 2018-12-04 09:50:01 -05:00
Michael Tryby
9ed3462dbf Ignoring nrtestsuite/ and tests/data 2018-11-30 12:00:07 -05:00
Michael Tryby
98cb6b4d12 Merge pull request #353 from michaeltryby/dev 
epanet toolkit api versioning
 2018-11-30 09:38:04 -05:00
Michael Tryby
76a9dd999c Fixing file header, adding epanet2.c to winbuild 2018-11-30 09:08:38 -05:00
Michael Tryby
b0c7714d72 Keeping legacy api in epanet2.h epanet2.c and moving new api to epanet2_2.h epanet.c 2018-11-29 12:51:47 -05:00
Michael Tryby
333e87b026 Fixing tests 2018-11-29 12:20:13 -05:00
Michael Tryby
fef02cd0a7 Merging origin dev 2018-11-29 12:02:10 -05:00
Michael Tryby
be2ca0a9f6 Implmenting Toolkit API versioning 2018-11-29 11:57:51 -05:00
Michael Tryby
4831fd7951 Merge pull request #1 from OpenWaterAnalytics/dev 
Updating my fork
 2018-11-28 19:19:01 -05:00
Michael Tryby
9ff0056b7c Merge pull request #350 from LRossman/lrossman-dev 
Code cleanup
 2018-11-28 17:26:37 -05:00
Lew Rossman
20bc6358ff Restored previous parallel link detection method to smatrix.c 2018-11-28 10:01:29 -05:00
Lew Rossman
d3a50dc490 Fixed refactoring bug in EN_setlinkid 2018-11-27 19:25:01 -05:00
Lew Rossman
b7a7cdc5ee Another update to test_setid.cpp 2018-11-27 16:45:13 -05:00
Lew Rossman
7c21b9c740 Update test_setid.cpp 2018-11-27 16:10:39 -05:00
Lew Rossman
24d90a530d Replaced EN_ProjectHandle with EN_Project in unit tests 2018-11-27 15:16:12 -05:00
Lew Rossman
9a540cc0f4 Code cleanup 
1. Added a standard header to each code module and removed obsolete comments.
2. Re-named several of the sub-structs in the project struct and re-arranged some of their contents.
3. Re-named _defaultModel to _defaultProject.
4. Removed the need to call EN_createproject and EN_deleteproject when working with the default project.
5. Made X & Y coords. part of Snode properties instead of a separate struct.
6. Moved the non-API functions in epanet.c into a new module named project.c.
7. Re-factored the quality module so that it uses the same nodal adjacency lists as the hydraulics solver.
8. Re-factored the sparse matrix module (smatrix.c) to be more memory efficient.
9. Restricted line lengths to < 90 columns.
10. Grouped the placement of functions in EPANET2.H and EPANET.C by category.
 2018-11-27 14:22:06 -05:00
Michael Tryby
2988800448 Merge pull request #348 from michaeltryby/dev 
Rolling back errormanager
 2018-11-19 17:05:49 -05:00
Michael Tryby
a611832184 Fixing build error 2018-11-19 16:51:39 -05:00
Michael Tryby
ad4969ea1b Rolling back errormanager 2018-11-19 16:40:40 -05:00
Michael Tryby
440230ef6d Rolling back errormanager 2018-11-19 16:33:30 -05:00
Michael Tryby
25a4d93ef5 Merge pull request #341 from michaeltryby/dev 
Adding test_save_reopen, minor refactoring.
 2018-11-16 16:39:09 -05:00
Michael Tryby
b34c2ede81 Fixing build error on Travis 2018-11-16 14:06:29 -05:00
Michael Tryby
a4c9973d47 Adding test_save_reopen, minor refactoring. 2018-11-16 13:49:45 -05:00
Elad Salomons
db3f2f1818 Merge pull request #337 from Mariosmsk/update_realeasenotes_2_2 
update api functions/extensions. Thank you @Mariosmsk
 2018-11-10 07:47:20 +02:00
Marios Kyriakou
9444646385 update api functions/extensions 2018-11-09 17:15:53 +02:00
Lew Rossman
123a0c3788 Merge pull request #335 from LRossman/lrossman-dev 
Fixes #172 (adjust controls when node/link is deleted) & EN_addrule added
 2018-11-09 09:48:28 -05:00