jiang/EPANET
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity
1,302 Commits 1 Branch 0 Tags
847fa8213954b50586fc1933e7a7dc8ae23aa611
Commit Graph
100 Commits
This Branch
This Branch
All Branches
Author SHA1 Message Date
Lew Rossman 847fa82139 Add emitter backflow option 
Adds a global hydraulic option to allow backflow or not through emitter elements. To maintain backward compatibility the default is YES.
 2023-02-05 15:16:20 -05:00
Lew RossmanandGitHub 9814564e29 Merge pull request #705 from OpenWaterAnalytics/dev-tank-fix 
Revise status test for full/empty tanks
 2023-02-05 12:29:01 -05:00
Lew Rossman 869e441fe8 Revise status test for full/empty tanks 
Simplifies status check for links connected to full/empty tanks and now includes case where link connects two tanks.
 2023-02-03 11:29:05 -05:00
Lew RossmanandGitHub 4986ec83e7 Merge pull request #704 from OpenWaterAnalytics/dev_string_literals 
Allows string literals as arguments in C++ clients
 2023-02-01 19:10:57 -05:00
Lew Rossman 2f8561632f Allows string literals as arguments in C++ clients 
See issue #651. Also addresses issue #602.
 2023-01-29 12:34:58 -05:00
Lew RossmanandGitHub 245f8f6562 Merge pull request #702 from OpenWaterAnalytics/dev-read-coords 
Ignore errors in coords. read from file
 2023-01-29 12:19:04 -05:00
Lew Rossman f60102105a Ignore errors in coords. read from file 
Ignores errors when reading node & link vertex coordinates from an input file. Also when saving a project to an input file, the [DEMANDS] section only includes non-zero demands.
See issues #603 and #174 .
 2023-01-26 12:50:26 -05:00
Lew RossmanandGitHub 6acce3f701 Merge pull request #699 from OpenWaterAnalytics/dev-pcv-valve 
New positional control valve added
 2022-08-23 08:55:50 -04:00
Lew Rossman 5b3d75cc0d Updated language binding files added. 2022-08-16 13:13:39 -04:00
Lew Rossman 6db17193f5 New positional control valve added 2022-08-16 11:47:44 -04:00
Lew RossmanandGitHub a68595264b Merge pull request #696 from OpenWaterAnalytics/dev-fcv-fix 
Fixes Possible Incorrect Solution for Flow Control Valves
 2022-08-11 10:41:39 -04:00
Lew Rossman 6ccddb811d Update hydstatus.c 2022-08-08 18:37:07 -04:00
Lew Rossman 2d783041a4 Fix for FCV problem 
This update prevents a solution where the computed loss coefficient for a FCV at its flow setting would be less than the user supplied fully opened coefficient.
 2022-08-08 18:08:45 -04:00
Lew RossmanandGitHub bed2fdca21 Merge pull request #694 from OpenWaterAnalytics/dev-prv-psv-fix 
Preserves network connectivity across an active PSV
 2022-08-08 14:31:12 -04:00
Lew Rossman 79b4fa45a1 Update hydcoeffs.c 
Only an Active PSV needs to preserve connectivity.
 2022-08-05 16:59:32 -04:00
Lew Rossman 93389ad1e4 Fix for PRV directly downstream of a PSV 2022-08-03 19:52:01 -04:00
Lew RossmanandGitHub 44ad2488e4 Merge pull request #685 from OpenWaterAnalytics/dev-release_notes_update 
Update ReleaseNotes2_3.md
 2022-06-29 11:30:01 -04:00
Lew Rossman 0b1e5408bf Update ReleaseNotes2_3.md 2022-06-27 13:00:02 -04:00
Lew RossmanandGitHub 4d66af19a5 Merge pull request #669 from OpenWaterAnalytics/dev-pump-fix 
Modify const. HP pump
 2022-04-05 09:15:18 -04:00
Lew Rossman 4bdbe6cd78 Modify const. HP pump 2022-03-30 09:22:01 -04:00
Lew RossmanandGitHub 2beb5fb5b9 Merge pull request #667 from OpenWaterAnalytics/dev-fix-tanktimestep 
Fixes possible integer overflow
 2022-03-30 09:12:15 -04:00
Lew Rossman cecc941d29 Update to force re-check of PR 2022-03-20 09:27:37 -04:00
Lew Rossman dbd3f6387d Fixes possible integer overflow 
Fixes a possible integer overflow when computing time for a tank to fill/empty (issue #666 ). Also fixes issue #642 that failed to set a pump's initial setting to 0 when its initial status was CLOSED.
 2022-03-19 13:25:55 -04:00
Lew RossmanandGitHub c8a3eadfdf Merge pull request #634 from OpenWaterAnalytics/dev-PDA_mod 
Dev pda mod
 2022-03-19 08:53:15 -04:00
Lew Rossman 750dda1fe6 Update ReleaseNotes2_3.md 2022-02-14 15:38:21 -05:00
Lew Rossman 0687aa63e2 Update ReleaseNotes2_3.md 2022-02-14 15:10:18 -05:00
Lew Rossman f865cbbba8 Update ReleaseNotes2_3.md 2022-02-14 13:43:48 -05:00
Lew Rossman a63f553b5f Adds PDA convergence test 2022-02-14 11:19:00 -05:00
Lew Rossman 070901d6bf Update hydsolver.c 2022-02-14 11:03:22 -05:00
Lew RossmanandGitHub d5c9a95c5f Merge pull request #660 from OpenWaterAnalytics/dev-DefaultPatternFix 
Fix for getting/setting/saving default demand pattern option
 2022-01-18 11:01:10 -05:00
Lew Rossman 43092c8647 Update test_node.cpp 2022-01-15 11:37:35 -05:00
Lew Rossman f9189d04b4 Updates to default demand pattern fix 2022-01-15 11:21:24 -05:00
Lew Rossman 14de37d0cb Adjust default pattern index after a pattern is deleted 2022-01-14 09:09:32 -05:00
Lew Rossman afda609223 Adds get/set for default demand pattern to toolkit 2022-01-14 08:50:33 -05:00
Lew Rossman d552d0c92c Removes silent change to WQ option for 0 duration run 2021-09-25 09:32:20 -04:00
Lew Rossman 650d8e8e53 Revert "Update setup.py" 
This reverts commit b77094e694.
 2021-04-21 00:24:27 -04:00
Lew Rossman b77094e694 Update setup.py 2021-04-21 00:09:36 -04:00
Lew Rossman c64cbe1b5f Restoring previous versions of nrtest files that work 2021-04-20 15:59:23 -04:00
Lew Rossman a652175523 Update test-config.sh 
Another attempt to eliminate the Status Report comparison.
 2021-04-20 15:24:09 -04:00
Lew Rossman 5c0a6efb30 Update setup.py 
Trying to eliminate the Status Report comparison.
 2021-04-20 15:04:18 -04:00
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 RossmanandGitHub 175544f3be Merge pull request #624 from OpenWaterAnalytics/dev_tank_fix 
Empty tank draining fix
 2021-04-16 17:23:07 -04:00
Lew Rossman 409a600455 Improved flow checks for full and empty tanks 
Improves  the way link flow into full and out of empty tanks is checked. Also corrects the head loss and gradient calculation for constant horsepower pumps at very low and very high flow rates (this was affecting one of the examples used to test the full/empty tank fix).
 2021-04-16 17:01:54 -04:00
Lew Rossman aaa9b44aaf Removed unreferenced variable in hydstatus.c 2021-01-26 15:47:04 -05:00
Lew Rossman 9d2256433f Fix having flow out of an empty tank 2021-01-26 15:41:01 -05:00
Lew RossmanandGitHub 1e0c65e04e Merge pull request #619 from OpenWaterAnalytics/fix_energy_usage 
Update hydraul.c
 2020-12-18 11:11:46 -05:00
Lew RossmanandGitHub 854abdf5d2 Update hydraul.c 
Fixes a bug that was adding time on-line to a closed pump's energy usage for the time step just prior to when a rule-based control re-opens it.
 2020-12-09 20:26:13 -05: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