jiang/EPANET
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity
1,132 Commits 1 Branch 0 Tags
bacedc87c94d25439ff404ca7f3cf8039e38370e
Commit Graph
100 Commits
This Branch
This Branch
All Branches
Author SHA1 Message Date
Lew Rossman bacedc87c9 Update epanet2.pas 2019-11-12 10:04:45 -05:00
Lew Rossman 6c54bb3a59 Adds error check to EN_setheadcurveindex 
See issue #556 .
 2019-11-09 09:36:10 -05:00
Lew RossmanandGitHub d15ac77bf4 Merge pull request #555 from OpenWaterAnalytics/lrossman-EN_getrule 
EN_getrule bug fix and EN_MISSING addition
 2019-11-08 09:55:59 -05:00
Lew Rossman 88d343dfb6 Updating the docs 2019-11-06 11:34:43 -05:00
Lew Rossman 9998466d20 Bug fix for EN_getrule 
Fixes possible seg fault condition in EN_getrule. Also defines EN_MISSING as an API constant since it can be assigned internally to several variables that are retrievable by the API.
 2019-11-05 10:09:21 -05:00
Lew RossmanandGitHub 7400fad7be Merge pull request #551 from OpenWaterAnalytics/lrossman-EN_setcurve 
Bug fix for EN_setcurve
 2019-11-05 09:59:28 -05:00
Lew Rossman 3bd4039d95 Bug fix for EN_setcurve 
Adjusts params of any pump that uses the curve whose data is modified by EN_setcurve or EN_setcurvevalue (issue #550 ).
 2019-11-02 11:17:25 -04:00
Lew RossmanandGitHub 271d855b94 Merge pull request #549 from OpenWaterAnalytics/lrossman-vertices 
Adds link vertex get/set functions to the API
 2019-10-31 10:17:26 -04:00
Lew Rossman 55e2879e2d Updates the docs 2019-10-30 15:11:20 -04:00
Lew Rossman 1709b12f6a Fixes to EN_addlink and EN_deletelink 2019-10-29 20:09:56 -04:00
Lew Rossman 7aadc83ddf Adds link vertex get/set functions to the API 2019-10-29 16:33:40 -04:00
Lew RossmanandGitHub d5becaf1a0 Merge pull request #547 from OpenWaterAnalytics/lrossman-ENgetresultindex 
Adds EN_getresultindex function to the API
 2019-10-29 16:09:47 -04:00
Lew Rossman b640a8685c Adds EN_getresultindex function to the API 
See issue #546 . Also fixes a small bug in project.c.
 2019-10-26 11:25:09 -04:00
Lew RossmanandSam Hatchett 344700a136 Fixes problems with EN_addnode() (#543) 
See issue #542 . Also modifies unit test test_node to check that fixup works.
 2019-10-16 15:07:14 -04:00
Lew RossmanandGitHub 5601973d67 Merge pull request #537 from OpenWaterAnalytics/lrossman-hydcoeffs_refactor 
Refactor of hydcoeffs.c
 2019-10-08 10:17:52 -04:00
Lew Rossman 6e80fd8d99 Update ReleaseNotes2_2.md 2019-10-07 14:27:47 -04:00
Lew Rossman 1501204f5f Refactor of hydcoeffs.c 
Simplifies and unifies how limit on head gradient at low flow is handled.
 2019-10-04 10:01:41 -04:00
Lew RossmanandGitHub ad139a4f08 Merge pull request #536 from OpenWaterAnalytics/lrossman-pump_bug_fix 
Fixes bugs in pump and demand head loss gradients
 2019-10-04 09:34:43 -04:00
Lew Rossman 38278f7d46 Fixed use of strncpy in xstrcpy() 2019-09-30 15:51:17 -04:00
Lew Rossman 3300ef00cb getTmpName() and xstrcpy() made safer 2019-09-30 14:05:38 -04:00
Lew Rossman f2ef979d95 Removed dependence on unistd.h in project.c 
Travis CI failed because system could not find unistd.h.
 2019-09-26 11:18:39 -04:00
Lew Rossman da1253f4ea Fixes bugs in pump and demand head loss gradients 2019-09-26 11:01:01 -04:00
Lew RossmanandGitHub 9572acd377 Merge pull request #527 from Mariosmsk/fix_delete_link_comment 
fix in EN_deleteLink
 2019-08-12 09:48:57 -04:00
Lew RossmanandGitHub 0f3005e5ae Merge pull request #525 from OpenWaterAnalytics/lrossman_ENsetlinkvalue_bug_fix 
Fixes EN_setlinkvalue bug
 2019-08-06 20:13:04 -04:00
Lew Rossman 803bad0bf0 Fixes EN_setlinkvalue bug 2019-08-05 14:08:18 -04:00
Lew RossmanandGitHub 153fa3dce4 Merge pull request #523 from OpenWaterAnalytics/lrossman-build_script_updates 
Build script updates
 2019-08-01 10:22:41 -04:00
Lew Rossman f5acb1623c Build script updates 2019-07-31 09:24:29 -04:00
Lew Rossman 20ae172b81 Update BUILDING.md 2019-07-26 19:06:59 -04:00
Lew RossmanandGitHub 9c51160682 Merge pull request #519 from OpenWaterAnalytics/lrossman/doc_updates 
Updates to the docs
 2019-07-26 11:49:18 -04:00
Lew Rossman d66f023770 Updates to the docs 2019-07-26 11:15:53 -04:00
Lew RossmanandGitHub 53ff8e7d74 Merge pull request #518 from OpenWaterAnalytics/rossman/CmakeLists_changes 
Add -MT switch for CMake Windows build
 2019-07-26 11:08:18 -04:00
Lew Rossman 3716d33213 Add -MT switch for CMake Windows build 2019-07-24 19:02:00 -04:00
Lew RossmanandGitHub 560105c700 Merge pull request #516 from Mariosmsk/fix_rule_actions 
Fix EN_getElseaction and EN_setelseaction
 2019-07-24 17:55:55 -04:00
Lew RossmanandGitHub a184a3a39a Merge pull request #515 from OpenWaterAnalytics/dev-PDA_fixes 
Fixes Overflow and PDA tests not being run
 2019-07-22 17:59:42 -04:00
Lew Rossman 0760648aef Fixes Overflow and PDA tests not being run 2019-07-22 17:42:29 -04:00
Lew Rossman 051519dca0 Another minor change to force another CI test 2019-07-22 12:22:48 -04:00
Lew Rossman a22a3cffe0 Minor update to force new CI test 2019-07-22 11:25:12 -04:00
Lew Rossman a89f339525 PDA fixes 2019-07-22 09:50:41 -04:00
Lew RossmanandGitHub 006db4a0da Merge pull request #508 from OpenWaterAnalytics/win_build_script_fix 
Update Makefile.bat
 2019-06-29 10:08:37 -04:00
Lew Rossman a052e87106 Update Makefile.bat 2019-06-26 11:47:48 -04:00
Lew RossmanandGitHub 57403b885e Merge pull request #505 from OpenWaterAnalytics/feature-tankoverflow 
Adds tank overflow feature
 2019-06-21 11:44:25 -04:00
Lew Rossman 85e2f2c187 Identifies overflowing tank in Status Report 2019-06-20 15:00:18 -04:00
Lew Rossman d17a7df956 Update input3.c 2019-06-19 11:00:23 -04:00
Lew Rossman 2bec884e3c Updating docs for tank overflow feature 2019-06-17 09:54:26 -04:00
Lew Rossman 9669742ab3 Adds tank overflow feature 2019-06-17 09:16:04 -04:00
Lew RossmanandGitHub fe92a99554 Merge pull request #503 from OpenWaterAnalytics/lrossman-dev-doc 
Numerous updates to project documentation
 2019-05-31 12:54:00 -04:00
Lew Rossman 2bbbf736b0 Numerous updates to project documentation 2019-05-30 13:28:32 -04:00
Lew RossmanandGitHub 39f66b84a1 Merge pull request #501 from OpenWaterAnalytics/lrossman-dev-doc 
Change  properties for new pipe created with EN_addlink (issue #500)
 2019-05-29 11:19:14 -04:00
Lew Rossman 6a5aa372f8 Change default properties for new pipe created with EN_addlink (issue #500) 2019-05-28 11:17:44 -04:00
Lew RossmanandGitHub 17b4ffb2bd Merge pull request #499 from OpenWaterAnalytics/lrossman-dev-doc 
Fixes problem with findpattern() function (issue #498)
 2019-05-24 12:25:23 -04:00
Lew Rossman 40c39fd3c6 Fixes problem with findpattern() function (issue #498) 2019-05-24 10:33:36 -04:00
Lew RossmanandGitHub f75a946921 Merge pull request #496 from OpenWaterAnalytics/lrossman-dev-doc 
Update BUILDING.md
 2019-05-16 19:04:01 -04:00
Lew Rossman e4e6d49f52 Update BUILDING.md 2019-05-16 18:50:53 -04:00
Lew Rossman 0e48056da5 Update BUILDING.md 2019-05-16 13:07:33 -04:00
Lew Rossman c37cd1ee52 Update BUILDING.md 2019-05-16 00:55:53 -04:00
Lew RossmanandGitHub 720b5daad5 Merge pull request #493 from OpenWaterAnalytics/lrossman-dev 
Lrossman dev
 2019-05-15 08:48:55 -04:00
Lew Rossman ed1acd7386 Update run\CMakeLists.txt 2019-05-14 13:17:17 -04:00
Lew Rossman efb189ac39 Fix refactor of types.h 2019-05-14 00:00:03 -04:00
Lew Rossman c9b836973e Removes _DEBUG directives from all source files 
This commit removes the #ifdef _DEBUG statements at the top of all source code files per issue #482. It also updates the doc files to stress that the speedup observed for hydraulic analysis with the MMD node re-ordering method only applies to single period runs.
 2019-05-13 23:49:19 -04:00
Lew RossmanandGitHub 46e2297921 Merge pull request #489 from OpenWaterAnalytics/lrossman-dev 
Minor format change to status report
 2019-05-13 11:30:39 -04:00
Lew Rossman f8cf7e0eb3 Restored CI testing of status reports 2019-05-13 11:05:58 -04:00
Lew Rossman dae0fc03d1 Removing status reports from CI testing 2019-05-12 20:02:07 -04:00
Lew Rossman 0930a33321 Minor format change to status report 2019-05-12 19:20:16 -04:00
Lew RossmanandGitHub d71776d152 Merge pull request #481 from OpenWaterAnalytics/lrossman-dev 
Refactors the API's demand editing functions
 2019-05-11 08:48:42 -04:00
Lew Rossman 1c9ee7788b Documentation edits 2019-05-09 13:53:57 -04:00
Lew Rossman 21ff7c009e Updates to doc files 2019-05-09 13:08:24 -04:00
Lew Rossman 253d74d907 Update test_demand.cpp 2019-05-09 10:40:58 -04:00
Lew Rossman 365ab00dcb Refactors the API's demand editing functions 2019-05-09 10:26:40 -04:00
Lew RossmanandGitHub 6ace84384b Merge pull request #472 from makusuko/fix-rules-label 
Fix NULL pointer error if rules label is missing
 2019-05-08 09:47:37 -04:00
Lew Rossman 97be7944f4 Fix problems with setting tank parameters (issue #464 ) 2019-04-25 08:22:44 -04:00
Lew RossmanandGitHub 1524adeb4d Merge pull request #463 from OpenWaterAnalytics/lrossman-dev 
Refactored xstrcpy function
 2019-04-20 21:38:01 -04:00
Lew Rossman d985a69248 Refactored xstrcpy function 2019-04-20 11:54:33 -04:00
Lew RossmanandGitHub ebb271c1db Merge pull request #461 from OpenWaterAnalytics/lrossman-dev 
Return object index from EN_addnode and EN_addlink (issue #432)
 2019-04-19 11:03:09 -04:00
Lew Rossman a4ac34d5d6 Updated criteria for valid object ID name 2019-04-18 17:12:56 -04:00
Lew Rossman 6b0e421a39 Update test_node.cpp 2019-04-18 07:39:39 -04:00
Lew Rossman cc22eefeae Fixed compilation errors 2019-04-18 07:11:17 -04:00
Lew Rossman 1583bea154 Return object index from EN_addnode and EN_addlink (issue #432) 
Adds an output argument to EN_addnode and EN_addlink that returns the index of the newly added object.
Also refactors the validity check on object ID names.
 2019-04-18 07:00:07 -04:00
Lew Rossman b8443230c6 Bug fix for 2Comp and LIFO tank mixing models (issue #448) 2019-04-08 11:16:23 -04:00
Lew RossmanandGitHub 1f67c8c5c9 Merge pull request #450 from OpenWaterAnalytics/lrossman-dev 
Eliminates use of temporary linked lists to process Patterns & Curves…
 2019-04-08 11:08:34 -04:00
Lew Rossman b2a8b55bc6 Update input2.c 2019-04-05 16:28:55 -04:00
Lew Rossman edcd4b69c7 Eliminates use of temporary linked lists to process Patterns & Curves (issue #449) 2019-04-05 13:02:39 -04:00
Lew RossmanandGitHub b87c102de5 Merge pull request #447 from OpenWaterAnalytics/lrossman-dev 
Add more analysis options to the API (issue #425)
 2019-04-04 10:23:01 -04:00
Lew Rossman 1632508545 Fixed epanet2_enums.h 2019-04-03 21:23:46 -04:00
Lew Rossman 3e733f5a2a Add more analysis options to the API (issue #425) 2019-04-03 21:17:28 -04:00
Lew Rossman fa4952a265 Fixed failure to update test_analysis.cpp 2019-04-03 10:56:24 -04:00
Lew Rossman af825005d4 Fixed failure to update test_net_builder.cpp 2019-04-03 10:43:19 -04:00
Lew Rossman 83ffc1cfc7 Removed the EN_DEFDEMANDPAT option 
See issue #429. Also allowed the EN_HEADLOSSFORM option to be changed if the solver is not active.
 2019-04-03 10:25:37 -04:00
Lew RossmanandGitHub 513b545ff6 Merge pull request #442 from OpenWaterAnalytics/lrossman-dev17 
Fixes bug in EN_getcurve
 2019-04-03 09:34:32 -04:00
Lew Rossman 23b11ab672 Add test of EN_setcurve & EN_getcurve to test_curve.cpp 2019-04-03 01:15:57 -04:00
Lew Rossman ca0ea0e17c Fixes bug in EN_getcurve 2019-04-03 00:58:40 -04:00
Lew RossmanandGitHub 8b35866b69 Merge pull request #441 from OpenWaterAnalytics/lrossman-dev17 
Bug fixes
 2019-04-02 22:36:08 -04:00
Lew Rossman 6a4b95f4d5 Bug fixes 2019-04-02 22:21:05 -04:00
Lew RossmanandGitHub 34705d442d Merge pull request #423 from OpenWaterAnalytics/lrossman-dev15 
Replace fixed-sized comment strings with dynamic strings
 2019-03-20 09:13:15 -04:00
Lew Rossman 18f65eb8b0 Replace fixed-sized comment strings with dynamic strings 2019-03-17 19:54:51 -04:00
Lew RossmanandGitHub 9399ef4b54 Merge pull request #414 from LRossman/lrossman-dev14 
Fixes writing auxiliary data to a saved input file (#411)
 2019-03-13 10:28:55 -04:00
Lew Rossman 03f41d567d Set InFile to NULL after closing it 2019-03-09 10:52:59 -05:00
Lew Rossman e5ec4eecab Fixes writing auxiliary data for deleted elements to a saved input file (#411) 2019-03-08 16:41:12 -05:00
Lew RossmanandGitHub d2386707d6 Merge pull request #410 from makusuko/dev 
Fix re-entrancy problems / crashes caused by the use of static variables in functions
 2019-03-08 13:09:33 -05:00
Lew RossmanandGitHub cd3826570f Merge pull request #408 from LRossman/lrossman-13 
Give external apps access to binary output file (#407)
 2019-03-06 13:48:58 -05:00
Lew Rossman 12c64b69cd Refactored EN_close function to use newly added closeoutfile function 2019-03-06 13:23:55 -05:00