jiang/EPANET
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity
1,214 Commits 1 Branch 0 Tags
ac86db1340af8c3d93791d747080c9000b62952f
Commit Graph
100 Commits
This Branch
This Branch
All Branches
Author SHA1 Message Date
Lew Rossman ac86db1340 Adjustment to regression test criteria - 3 2021-04-20 10:25:43 -04:00
Lew Rossman 9e286293ae Adjustment to regression test criteria - 2 2021-04-20 10:13:03 -04:00
Lew Rossman e58d36c6a1 Revert "Update hydcoeffs.c" 
This reverts commit 13416942f8.
 2021-04-20 09:36:01 -04:00
Lew Rossman 13416942f8 Update hydcoeffs.c 2021-04-20 09:30:11 -04:00
Lew Rossman 9224d67a00 Adjustment to regression test criteria 2021-04-20 09:26:34 -04:00
Lew Rossman bec7c0db0f Remove line comments with release number 2021-04-17 10:24:42 -04:00
Lew Rossman 533466b796 PDA changes to improve convergence 2020-11-19 16:23:24 -05:00
Lew RossmanandGitHub 9525d73cf3 Merge pull request #618 from OpenWaterAnalytics/dev-EN_STARTTIME 
Add EN_STARTTIME to EN_settimeparam function
 2020-11-19 16:12:07 -05:00
Lew Rossman 0d31da816a Remove redundant check on EN_STARTTIME 2020-11-08 10:23:03 -05:00
Lew Rossman b6eddc07fa Add EN_STARTTIME to EN_settimeparam function 2020-11-08 10:10:16 -05:00
Lew RossmanandGitHub 9b5a056e3a Merge pull request #617 from OpenWaterAnalytics/dev-fix-valve-settings 
Allow negative EN_SETTING value in EN_setlinkvalue
 2020-11-08 09:44:10 -05:00
Lew Rossman a76cc51ac8 Allow negative EN_SETTING value in EN_setlinkvalue 
Makes EN_setlinkvalue consistent with how an input file is read. This addresses issue #616 .
 2020-11-05 21:54:10 -05:00
Lew RossmanandGitHub ab3eda2158 Merge pull request #614 from Ostoveni/dev 
Header file for C#
 2020-09-30 13:57:08 -04:00
Lew RossmanandGitHub ff00c1a6f1 Merge pull request #613 from OpenWaterAnalytics/fix_energy_usage 
Fixes error in energy usage for tank pumps
 2020-09-30 10:03:29 -04:00
Lew Rossman bca3b99b88 Fixes error in energy usage for tank pumps 2020-09-20 19:37:15 -04:00
Lew RossmanandGitHub 8cf5a175bd Merge pull request #580 from OpenWaterAnalytics/dev_2.3 
Network building enhancements
 2020-07-15 15:15:23 -04:00
Lew Rossman 87d1b2ed79 Update modules.dox 2020-07-15 14:58:58 -04:00
Lew Rossman 951c7ce727 Refactor tank mixing zone volume 
Addresses issue #597.
 2020-07-11 17:12:49 -04:00
Lew Rossman 71a733ed85 Add missing break statement after update from dev 2020-07-10 15:42:34 -04:00
Lew Rossman 67f7d8f76b Merge branch 'dev' into dev_2.3 2020-07-10 14:36:46 -04:00
Lew RossmanandGitHub 37a58a467c Update epanet.c 2020-04-19 09:25:36 -04:00
Lew RossmanandGitHub 99f09f1edb A simpler fix to EN_settankdata 
Changes 1 line instead of 4.
 2020-04-19 09:16:08 -04:00
Lew RossmanandGitHub 241ebe930d Merge pull request #591 from mcneish1/valgrind-issues-dev 
Fix use-after-free in Smatrix, test_pda
 2020-04-14 13:06:47 -04:00
Lew RossmanandGitHub b64e070354 Update project.c 2020-04-13 09:39:58 -04:00
Lew Rossman a9ab376aa7 Revert "Replaced status checking for pumps & FCVs" 
This reverts commit 3ee30ce019.
 2020-02-09 17:25:33 -05:00
Lew Rossman a3537b767a Revert "Changed benchmark results for EN_getstatistic test" 
This reverts commit 7e3d5e1fe0.
 2020-02-09 16:58:37 -05:00
Lew Rossman 7e3d5e1fe0 Changed benchmark results for EN_getstatistic test 2020-02-07 13:49:54 -05:00
Lew Rossman 3ee30ce019 Replaced status checking for pumps & FCVs 
See ReleaseNotes2_3.md.
 2020-02-07 10:44:52 -05:00
Lew Rossman 80f9acfe4d Network building enhancements 2020-02-04 10:01:23 -05:00
Lew RossmanandGitHub 8d9f85737e Merge pull request #568 from OpenWaterAnalytics/lrossman-Pump_Bug_Fix 
Fixes problem with re-opening const. HP pumps
 2019-12-05 16:03:31 -05:00
Lew Rossman d05ea20c9a Fixes problem with re-opening const. HP pumps 
See latest comments in issue #528. Also, the setlinkflow() function was deleted as it was never called anywhere.
 2019-12-05 10:16:12 -05:00
Lew RossmanandGitHub b3a306f69b Merge pull request #567 from OpenWaterAnalytics/lrossman-ReleaseNotesUpdate 
Update ReleaseNotes2_2.md
 2019-12-05 10:03:32 -05:00
Lew Rossman 21defae4c7 Update ReleaseNotes2_2.md 
I added the v2.2 contributing authors to the notes. I checked PR's from 2017 and beyond and these were the only names I could find. Please append any one I might have missed.
 2019-12-04 10:56:01 -05:00
Lew RossmanandGitHub 5288bc88bf Merge pull request #566 from OpenWaterAnalytics/lrossman-doc_correction 
Correction made to doc files
 2019-12-04 09:23:27 -05:00
Lew Rossman e11740ce56 Correction made to doc files 
The output-format.dox file was deprecated and not included in the doxyfile so it was deleted. The description of the format of of the Energy Usage section of the binary output in toolkit-files.dox was corrected.
 2019-12-02 11:26:50 -05:00
Lew RossmanandGitHub f18152482c Merge pull request #565 from OpenWaterAnalytics/lrossman-input3_bug_fix 
Fixes a "copy over" bug in input3.c
 2019-12-02 11:17:13 -05:00
Lew Rossman 3935247e2b Fixes a "copy over" bug in input3.c 
The copying of one input line token over another was causing a compilation error under Clang. With v2.2 this copying is no longer needed so the line of code in question was simply deleted.

This commit also deletes the HTML and Latex output generated by running Doxygen that got added from the previous update to dev since they don't really belong in a source code repo.
 2019-11-29 15:56:33 -05:00
Lew RossmanandGitHub f87865a849 Merge pull request #562 from OpenWaterAnalytics/lrossman-valvecheck_fix 
Bug fix for valvecheck function
 2019-11-19 09:40:11 -05:00
Lew RossmanandGitHub 2033ddfc22 Fixed editing errors made to project.c 2019-11-15 12:55:29 -05:00
Lew RossmanandGitHub 94b6cb28b6 Restored prior update to project.c that got overwritten 2019-11-15 12:50:54 -05:00
Lew Rossman ce2a27f38e Bug fix for valvecheck function 
See issue #561
 2019-11-15 11:53:09 -05:00
Lew RossmanandGitHub 45b28f52be Merge pull request #557 from OpenWaterAnalytics/lrossman-setheadcurveindex 
Adds error check to EN_setheadcurveindex
 2019-11-12 10:41:28 -05:00
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