jiang/EPANET
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity
1,090 Commits 1 Branch 0 Tags
4e2e6c952adb83b147664577ca87047e4b4b98eb
Commit Graph
100 Commits
This Branch
This Branch
All Branches
Author SHA1 Message Date
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
Lew Rossman 6e13d7e3aa Refactoring how the binary output is closed 
This change implements the fix suggested by @gonccalo.
 2019-03-06 11:14:03 -05:00
Lew Rossman 3ebb1831d7 Another attempt to fix closing/opening of output project 2019-03-06 10:44:03 -05:00
Lew Rossman 8765dfa3ab Initialize all file pointers to NULL in initpointers 2019-03-05 20:50:34 -05:00
Lew Rossman 324487ba86 Opening & closing output file in writeresults 2019-03-05 19:40:30 -05:00
Lew Rossman 09d6c7ea5d Reverting some previous changes 2019-03-05 19:07:55 -05:00
Lew Rossman f2c0718819 Refactored closing/opening of output file 2019-03-05 16:15:33 -05:00
Lew Rossman 8052ed0b6f Walking back closing/opening output file 2019-03-05 15:20:37 -05:00
Lew Rossman 692955e3d2 Give external apps access to binary output file (#407) 2019-03-05 09:23:49 -05:00
Lew RossmanandGitHub b0a0014f19 Merge pull request #406 from LRossman/lrossman-dev4 
Change ENgetcoords & ENsetcoords args. to doubles
 2019-03-05 09:04:38 -05:00
Lew Rossman 65a6c846b6 Change ENgetcoords & ENsetcoords args. to doubles 2019-03-02 12:26:49 -05:00
Lew RossmanandGitHub 382572e8bc Merge pull request #395 from LRossman/lrossman-dev2 
Adds new pattern, curve and reporting functions to API
 2019-02-22 15:15:59 -05:00
Lew Rossman fcbbbf9b2e Adds new pattern, curve and reporting functions to API 2019-02-20 12:43:32 -05:00
Lew RossmanandGitHub 219e3ab0ce Merge pull request #389 from LRossman/lrossman-dev1 
Fixes win_build and VS/cmake build problems
 2019-02-11 16:18:22 -05:00
Lew Rossman 3eb9a68783 Fixes win_build and VS/cmake build problems 2019-02-11 14:30:15 -05:00
Lew RossmanandGitHub d6d244d4d2 Merge pull request #386 from LRossman/lrossman-dev 
New function clearreport added (see issue #383)
 2019-02-10 22:55:54 -05:00
Lew Rossman 996e26158c Updates documentation with newly added functions 2019-02-08 19:06:42 -05:00
Lew Rossman 2c86a8febb Fixes the win_build Makefile.bat file 2019-02-08 15:27:52 -05:00
Lew Rossman 36b78f28d3 New function clearreport added (see issue #383) 
The newly added `gettitle` and `settitle` functions were moved from the Reporting Functions section to the Project (formerly System) Functions section of epanet2.c and epanet.c.
 2019-02-08 12:07:56 -05:00
Lew RossmanandGitHub ba8926e4c4 Merge pull request #378 from LRossman/lrossman-dev 
Minor edits to documentation
 2019-01-29 19:17:41 -05:00
Lew Rossman 67947e5ea8 Minor edits to documentation 2019-01-29 09:46:14 -05:00
Lew RossmanandGitHub 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 RossmanandGitHub 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 RossmanandGitHub 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
Lew Rossman dd376692ad Floating pt. args in thread-safe API changed to doubles (Issue #365) 2019-01-09 15:14:10 -05:00
Lew RossmanandGitHub 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 RossmanandGitHub 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