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

678 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
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
Elad Salomons
36972c2a60 Fix for VB header file 2018-11-08 10:09:35 +02:00
Elad Salomons
d10649c0e7 Minor fix to the DEF file 2018-11-08 09:45:10 +02:00
Elad Salomons
ca927702fa Small fix for DEF file 2018-11-08 09:36:33 +02:00
Lew Rossman
6397a01363 Merge branch 'dev' into lrossman-dev 2018-11-07 23:19:16 -05:00
Lew Rossman
7443cea9d4 Fixes #172 (adjust controls when node/link is deleted) & EN_addrule added 
- Deleting controls with node/link deletion made conditional.
- New EN_addrule function added along with a test file.
- Rule structures re-named & rules.c heavily modified.
- Issue with exceeding limit on number of temporary file names fixed.
- VB declaration and DEF files updated.
 2018-11-07 23:09:47 -05:00
Michael Tryby
bdd67a9ae1 Merge pull request #332 from michaeltryby/dev 
Fix test_output check_cdd()
 2018-11-05 12:28:43 -05:00
Michael Tryby
bfec6d608b Merging upstream dev 2018-11-05 10:12:24 -05:00
Michael Tryby
5f0ca809d7 Fixing bug in check_cdd 2018-11-05 10:05:30 -05:00
Elad Salomons
18fb352527 Merge pull request #327 from eladsal/dev-link-nodes 
Add ENsetlinknodes to DEF file and add a function check
 2018-10-31 18:23:03 +02:00
Lew Rossman
de6d22ab41 Merge pull request #329 from LRossman/lrossman-dev 
Fixes bug #172 (adjust controls & rules when node/link added or deleted)
 2018-10-31 11:47:33 -04:00
Lew Rossman
ee335ab077 Fixes bug #172 (adjust controls & rules when node/link added or deleted) 
- Also adds new API function EN_deletecontrol
- Updates and re-arranges entries in the VBA and VB.Net headers
 2018-10-31 11:32:01 -04:00
Lew Rossman
3ac243d0c8 Merge pull request #328 from LRossman/lrossman-dev 
Deleted include\epanet_export.h
 2018-10-29 12:04:41 -04:00
Lew Rossman
5ddb54ab90 Deleted include\epanet_export.h 
It gets generated through the cmake build process.
 2018-10-29 11:44:25 -04:00
Elad Salomons
4394c53f9b Add ENsetlinknodes to DEF file and add a function check 2018-10-29 17:20:45 +02:00
Lew Rossman
1234c7e685 Merge pull request #326 from LRossman/lrossman-dev 
Restored epanet_export.h to \include folder
 2018-10-29 09:12:12 -04:00
Lew Rossman
a86ba29cb6 Restored epanet_export.h to \include folder 2018-10-29 09:06:08 -04:00
Elad Salomons
e32046ccc8 Merge pull request #319 from Mariosmsk/Update-ReleaseNotes2_2.md 
Update ReleaseNotes2_2.md
 2018-10-29 06:07:04 +02:00
Elad Salomons
8e258c2db2 Merge branch 'dev' into Update-ReleaseNotes2_2.md 2018-10-29 05:58:55 +02:00
Lew Rossman
5cb9d06151 Merge pull request #325 from LRossman/lrossman-dev 
Deleted previous, commented-out version of EN_setlinktype
 2018-10-28 20:25:10 -04:00
Lew Rossman
c2b16a6466 Deleted previous, commented-out version of EN_setlinktype 2018-10-28 20:07:54 -04:00
Lew Rossman
291789ca04 Merge pull request #324 from LRossman/lrossman-dev 
Rewrite of EN_setlinktype function (#305)
 2018-10-28 17:09:41 -04:00
Lew Rossman
8514929622 Rewrite of EN_setlinktype function (#305) 
- Complete rewrite of EN_setlinktype with link index argument passed by reference
- New unit test of EN_setlinktype added
- New function EN_setlinknodes added
 2018-10-28 16:58:43 -04:00
Lew Rossman
7d021d8b82 Merge pull request #322 from LRossman/lrossman-dev 
Removed 'writecon' function (#300)
 2018-10-27 12:04:38 -04:00
Lew Rossman
27cc088c4a Reverted back to old main() 
Trying to see why new version of main causes some CI reg tests to fail.
 2018-10-27 11:31:06 -04:00
Lew Rossman
320dec3ff7 Replaced main() for runnable version of the library 2018-10-27 11:00:00 -04:00
Lew Rossman
9d0b738e77 Removed writecon function and all calls to it 2018-10-27 09:36:21 -04:00
Lew Rossman
8286918b94 Removed unused runconcurrent() function 2018-10-27 09:05:30 -04:00
Lew Rossman
e9161adbe6 Defined EN_MAXID & EN_MAXMSG limits in API header 2018-10-27 08:48:41 -04:00
Lew Rossman
09e46bc459 Merge pull request #320 from LRossman/lrossman-dev 
Fixed bug setting pump curve params (#314) and in setting demand categories
 2018-10-25 12:22:04 -04:00
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
Marios Kyriakou
27c21e499e Update ReleaseNotes2_2.md 
1. Update description of new API functions.
2. Update API extensions
 2018-10-25 13:55:03 +03:00
Lew Rossman
2ed36c06a1 Merge pull request #315 from LRossman/lrossman-dev 
Fixed bug in EN_deletelink (#312)
 2018-10-24 09:02:54 -04:00
Lew Rossman
69388024fb Fixed bug in EN_deletelink (#312) 2018-10-23 16:00:14 -04:00
Lew Rossman
3f90e44eda Merge pull request #303 from LRossman/dev-lrossman 
Fix #211 for EN_setreport
 2018-10-23 09:21:02 -04:00
Lew Rossman
f7346cef5f Modified re-factored version of hash.c 2018-10-19 10:36:39 -04:00
Lew Rossman
0041772aa0 Corrected test_setid unit test code 2018-10-18 10:16:47 -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
b3e84e0c42 Added unit test for ENsetnodeid and ENsetlinkid functions 2018-10-17 10:17:00 -04:00
Lew Rossman
76419e0b4c Added EN_setnodeid and EN_setlinkid (Issue #306) 2018-10-17 09:05:16 -04:00
Lew Rossman
1fce14efb8 Increased size of MAXMSG to 255 (#189) 2018-10-15 11:34:25 -04:00
Lew Rossman
1c3044c948 Fix #211 for EN_setreport 2018-10-14 11:05:15 -04:00
Michael Tryby
d42f191d45 Merge pull request #297 from LRossman/dev-lrossman 
Fixed water quality mass balance issue (#160)
 2018-10-12 09:13:14 -04:00
Michael Tryby
93760176bf Updateing benchmark 2018-10-12 08:58:17 -04:00
Michael Tryby
27863babe7 Merge pull request #299 from michaeltryby/dev 
Saves SUT benchmark as build artifact on Appveyor
 2018-10-11 11:44:20 -04:00
Michael Tryby
e943dd7174 Saving SUT benchmarks as artifact 2018-10-11 08:02:15 -04:00
Michael Tryby
c0425022ab Saving SUT benchmarks as artifact 2018-10-10 18:00:52 -04:00
Lew Rossman
570f96b264 Update src/qualroute.c 2018-10-09 15:55:19 -04:00
Lew Rossman
7c021cf533 Fixed water quality mass balance issue (#160) 2018-10-09 12:53:20 -04:00