jiang/EPANET
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity
1,368 Commits 1 Branch 0 Tags
482f658df4170e327135403f6901d89aa853acfb
Commit Graph
100 Commits
This Branch
This Branch
All Branches
Author SHA1 Message Date
Lew Rossman 482f658df4 Account for mass lost in tank overflow 
This change addresses issue #769.
 2024-03-13 09:22:33 -04:00
Lew RossmanandGitHub ade7027ddb Merge pull request #768 from OpenWaterAnalytics/dev-tank_validation_bug_fix 
Update validate.c
 2024-01-25 12:34:20 -05:00
Lew Rossman 5c90eafdbe Update validate.c 
Fixes bug in checking that tank min/max levels are within volume curve.
 2024-01-25 12:21:09 -05:00
Lew RossmanandGitHub 5fd17af548 Merge pull request #758 from OpenWaterAnalytics/dev-EN_openX 
Add EN_openX function
 2023-10-17 09:20:48 -04:00
Lew Rossman e7f9e26347 Update validate.c 2023-10-05 14:59:10 -04:00
Lew Rossman 653ffac514 Update input3.c 2023-10-05 12:10:08 -04:00
Lew Rossman c0700c83ee Refactored validate.c 2023-10-05 11:37:13 -04:00
Lew RossmanandGitHub 5a03def497 Merge branch 'dev' into dev-EN_openX 2023-10-04 10:09:02 -04:00
Lew Rossman 10d5079d75 Add EN_openX function 
EN_openX allows an EPANET input file to be opened even if it has errors. This required re-arranging code, mainly in input3.c, so that default values are assigned to an object before its input line is parsed.
 2023-10-04 09:53:05 -04:00
Lew RossmanandGitHub 7b640122cd Merge pull request #752 from Mariosmsk/patch-1 
Update ReleaseNotes2_3.md
 2023-09-28 12:16:28 -04:00
Lew RossmanandGitHub ec8609ef5f Merge pull request #755 from lbutler/setcurvetype-support-EN_VALVE_CURVE 
Update EN_setcurvetype to support EN_VALVE_CURVE
 2023-09-28 12:08:24 -04:00
Lew RossmanandGitHub 39ffaebcf9 Merge pull request #754 from lbutler/getclosedlink-remove-recursion 
Remove recursion in getclosedlink
 2023-09-15 11:01:39 -04:00
Lew RossmanandGitHub 630eed4369 Merge pull request #750 from OpenWaterAnalytics/dev-trace_node_fix 
Fix trace node id parser error
 2023-09-11 18:43:04 -04:00
Lew Rossman a2c0ff7889 Fix trace node id parser error 2023-09-11 18:23:49 -04:00
Lew RossmanandGitHub e420380248 Merge pull request #747 from OpenWaterAnalytics/dev-PCV_mod 
Change PCV settings from fraction to percent
 2023-08-17 16:36:39 -04:00
Lew Rossman e81a2804fb Update test_valve.cpp 2023-08-17 16:23:05 -04:00
Lew Rossman c7a4069b79 Update test_valve.cpp 2023-08-17 15:12:31 -04:00
Lew Rossman 6aa2a21327 Change PCV settings from fraction to percent 2023-08-17 14:54:59 -04:00
Lew RossmanandGitHub 4577af9b19 Merge pull request #744 from 0tkl/dev 
Bugfix
 2023-08-10 11:44:22 -04:00
Lew RossmanandGitHub 6b8f9c83ea Merge pull request #743 from OpenWaterAnalytics/dev-status_report 
Allow API to get/set type of status report
 2023-07-27 10:37:40 -04:00
Lew Rossman dc721c5ce6 Update test_analysis.cpp 2023-07-19 09:43:53 -04:00
Lew Rossman 353ba4eb34 Allow API to get/set type of status report 
The existing EN_setstatusreport function only allows one to set the level of status reporting and not retrieve this value. A new EN_STATUS_REPORT constant was added, to be used with EN_setoption and EN_getoption, to provide read/write access to the level of status reporting.
 2023-07-19 09:15:25 -04:00
Lew RossmanandGitHub 2825f96120 Merge pull request #739 from OpenWaterAnalytics/get-emitter-flow 
Added retrieval of emitter flow to the API
 2023-07-17 10:05:27 -04:00
Lew Rossman 3acfb6dae3 Added retrieval of emitter flow to the API 2023-07-06 15:35:30 -04:00
Lew RossmanandGitHub 789d42f248 Merge pull request #732 from OpenWaterAnalytics/dev-controls 
Allow simple controls to set valves OPEN/CLOSED
 2023-06-08 10:37:45 -04:00
Lew Rossman 2b346c5427 Update ReleaseNotes2_3.md 2023-06-08 10:21:35 -04:00
Lew Rossman a9079b023b Allow simple controls to set valves OPEN/CLOSED 2023-05-13 12:29:35 -04:00
Lew RossmanandGitHub 583cca01ca Merge pull request #721 from OpenWaterAnalytics/dev-PDA-coeffs 
Use barrier functions for PDA & emitters
 2023-04-15 11:01:08 -04:00
Lew RossmanandGitHub 44ab8a40e0 Merge pull request #719 from lbutler/add-pressure-unit-selection 
Get and set pressure units in toolkit
 2023-04-01 11:10:49 -04:00
Lew Rossman 9c79a65171 Use barrier functions for PDA & emitters 
Uses continuous barrier functions to constrain PDA demands and emitter flows to allowable values (see J. Hydroinformatics, 24:697, 2022).
 2023-03-29 10:35:14 -04:00
Lew RossmanandGitHub ffe272462f Merge pull request #718 from lbutler/update-building.md 
Update building.md
 2023-03-15 12:07:31 -04:00
Lew RossmanandGitHub 6293b736f5 Merge pull request #717 from lbutler/update-releasenotes2_3.md 
Update ReleaseNote2_3.md
 2023-03-15 11:35:34 -04:00
Lew RossmanandGitHub 278037bab3 Merge pull request #713 from lbutler/add-cms-flow 
Add support for cubic meters per second (CMS)
 2023-02-22 10:04:40 -05:00
Lew RossmanandGitHub 639e0377d6 Merge pull request #710 from lbutler/fix-time-control-input-tokens 
Fixes incorrect hour set with >9 input tokens for simple controls
 2023-02-18 11:45:55 -05:00
Lew RossmanandGitHub 8d8ccafad6 Merge pull request #706 from OpenWaterAnalytics/dev-emitter-backflow 
Add emitter backflow option
 2023-02-08 15:16:05 -05:00
Lew Rossman 61b03b8539 Updating the docs 2023-02-07 22:59:18 -05:00
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