jiang/EPANET
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity
1,455 Commits 1 Branch 0 Tags
bd97f660977b32e183284155606c3705a501c745
Commit Graph
100 Commits
This Branch
This Branch
All Branches
Author SHA1 Message Date
Lew Rossman bd97f66097 Update docs for version 2.3 2025-03-28 09:16:38 -04:00
Lew RossmanandGitHub 3da4b1d861 Merge pull request #840 from OpenWaterAnalytics/dev-demand_deficit_fix 
Limit demand deficit to be >= 0
 2025-03-19 19:00:03 -04:00
Lew Rossman fff984d6be Limit demand deficit to be >= 0 2025-03-19 18:37:34 -04:00
Lew RossmanandGitHub 06284bb218 Merge pull request #834 from OpenWaterAnalytics/dev-curvetype 
Include curve type in input file
 2025-03-12 18:30:09 -04:00
Lew Rossman 6468ba9545 Include curve type in input file 2025-03-11 11:54:12 -04:00
Lew RossmanandGitHub 79473542ae Merge pull request #831 from OpenWaterAnalytics/dev-tags 
Adds EN_gettag and EN_settag functions to the Toolkit
 2025-02-24 17:03:25 -05:00
Lew Rossman f37e4934c6 Fix copy/paste error in project.c 2025-02-19 10:32:49 -05:00
Lew Rossman 0f7fb48d73 Update input2.c 2025-02-19 10:18:52 -05:00
Lew Rossman bb543a08dc Unit test for get/set tags 2025-02-19 09:58:19 -05:00
Lew Rossman 7a1673994c Set/Get node & link tags added 2025-02-19 09:49:09 -05:00
Lew RossmanandGitHub c8db9c1655 Merge pull request #829 from OpenWaterAnalytics/dev-trace_node_fix 
Fix Trace Node bug when new junction added
 2025-02-18 08:55:38 -05:00
Lew Rossman 054ebf36b5 Adjust Trace Node index when node deleted 2025-02-17 09:23:35 -05:00
Lew Rossman a5bce31b13 Fix Trace Node bug when new junction added 2025-02-17 08:44:28 -05:00
Lew RossmanandGitHub 03cbb89e05 Merge pull request #827 from OpenWaterAnalytics/dev-disabled-controls 
Add read/write of disabled controls to input file
 2025-02-17 08:12:44 -05:00
Lew Rossman 70d5483361 Add read/write of disabled controls to input file 2025-02-11 15:38:30 -05:00
Lew RossmanandGitHub e5c5e16c63 Merge pull request #826 from OpenWaterAnalytics/dev-hydfile-fix 
Close scratch hydraulics file between runs
 2025-02-11 12:05:03 -05:00
Lew Rossman 65594132ce Close scratch hydraulics file between runs 2025-02-08 10:11:13 -05:00
Lew RossmanandGitHub 3201d8485e Merge pull request #821 from OpenWaterAnalytics/dev-fix-tank-mixing 
Corrections to 2-compartment tank mixing
 2024-12-21 11:17:48 -05:00
Lew Rossman 626b93a10f Corrections to 2-compartment tank mixing 
Fixes volume remaining in mixing zone when there is net outflow from a 2-compartment tank.
 2024-12-16 23:30:32 -05:00
Lew RossmanandGitHub fbd005d604 Merge pull request #812 from Mariosmsk/add-EN_loadpatternfile 
Add the `EN_loadpatternfile` function to load pattern data from a `.pat` file into INP
 2024-08-06 08:39:55 -04:00
Lew RossmanandGitHub 2f4ae4c5b1 Merge pull request #811 from LRossman/dev-leakage 
Code cleanup
 2024-07-29 09:26:31 -04:00
Lew Rossman cbf543f1b5 Code cleanup 2024-07-19 11:04:19 -04:00
Lew RossmanandGitHub 3574bdfe87 Merge pull request #808 from LRossman/dev-leakage 
Add leakage into EPANET/dev
 2024-07-12 11:36:32 -04:00
Lew RossmanandGitHub 5894b67d81 Merge pull request #5 from LRossman/leakage 
Adding Pipe Leakage Modeling
 2024-07-08 08:49:59 -04:00
Lew Rossman 6089b93a51 Fix refactoring error in hydcoeffs.c 2024-07-02 20:19:45 -04:00
Lew RossmanandGitHub 5b2b88cee4 Merge branch 'dev-leakage' into leakage 2024-06-26 18:08:02 -04:00
Lew Rossman 68b73a14f1 Fixes for PDA 2024-06-26 17:50:24 -04:00
Lew Rossman 30a3fcb4b9 debug test_pda.cpp 2024-06-26 11:47:35 -04:00
Lew Rossman 037ca41af6 Adding Pipe Leakage Modeling 2024-06-26 11:34:19 -04:00
Lew Rossman b0796f346a Adding leakage model 2024-06-26 11:15:01 -04:00
Lew RossmanandGitHub 59f7295739 Merge pull request #802 from YuChunTsao/add-INP-section-column-headings 
feat: Add column headings for sections in INP file
 2024-06-18 13:23:36 -04:00
Lew RossmanandGitHub d055157558 Merge pull request #801 from OpenWaterAnalytics/API_fixes 
Fix two legacy API functions
 2024-06-18 07:46:25 -04:00
Lew Rossman 6ac4156fd0 Update report.c 
Change a "printf" statement to "sprintf".
 2024-06-14 09:49:28 -04:00
Lew Rossman 62f0bc6db7 Fix two legacy API functions 2024-06-13 07:49:14 -04:00
Lew RossmanandGitHub 109a93f7d5 Merge pull request #798 from zannads/dev-netadjlist_fix 
Fix Issue 789- PR 791
 2024-06-05 15:47:04 -04:00
Lew RossmanandGitHub c131c4cd1d Merge pull request #786 from Vitens/dev 
add ENgetnodesvalues and ENgetlinksvalues methods
 2024-06-03 11:24:11 -04:00
Lew RossmanandGitHub 8b6be71956 Merge pull request #788 from OpenWaterAnalytics/dev-rename_emitter_backflow_keyword 
Changes EMITTER BACKFLOW keyword
 2024-05-29 08:25:19 -04:00
Lew RossmanandGitHub 7b334875f8 Merge pull request #797 from lbutler/big-fix-emitter-coefficient 
Fix emitter-related NaN errors from EN_setnodevalue API
 2024-05-29 08:23:56 -04:00
Lew RossmanandGitHub 375823851a Merge pull request #791 from zannads/dev-netadjlist_fix 
Fix Issue #789 - free network Adjlist
 2024-05-29 08:22:48 -04:00
Lew RossmanandGitHub 9958ef6d44 Merge pull request #792 from zannads/dev-npipes_fix 
Fix Issue #790 - incorrect number of pipes
 2024-05-29 08:15:43 -04:00
Lew Rossman 7e66114863 Changes EMITTER BACKFLOW keyword 
This change avoids a conflict between the EMITTER EXPONENT and EMITTER BACKFLOW keywords when running a v2.3 input file in the v2.2 EPANET GUI.
 2024-05-11 12:37:52 -04:00
Lew RossmanandGitHub 7d360480d0 Merge pull request #777 from OpenWaterAnalytics/dev-tank_validation_fix 
Update validate.c
 2024-03-21 12:39:11 -04:00
Lew Rossman c24f334208 Update validate.c 
Fixes false negative when checking if a tank's min/max levels fall within its volume curve (see issue #767 ).
 2024-03-19 14:38:47 -04:00
Lew RossmanandGitHub 6b72b0a21c Merge pull request #776 from Mariosmsk/add-workflow-for-macos-build 
Create macos.yml workflow.
 2024-03-19 14:30:10 -04:00
Lew RossmanandGitHub 31395615d1 Merge pull request #775 from Mariosmsk/update-workflows-rm-warnings 
Update workflows to use Node.js 20 due to deprecation of Node.js 16
 2024-03-19 14:29:36 -04:00
Lew RossmanandGitHub 19327c0a51 Merge pull request #774 from Mariosmsk/patch-2 
Delete tests/outfile/data/enP1kAlM
 2024-03-19 14:29:11 -04:00
Lew RossmanandGitHub 2f4e4e5139 Merge pull request #771 from OpenWaterAnalytics/dev-tank_overflow_fix 
Account for mass lost in tank overflow
 2024-03-18 13:37:07 -04:00
Lew RossmanandGitHub 029b441dd4 Merge pull request #759 from Mariosmsk/update-workflows 
update workflows to include the header files in the artifact
 2024-03-14 08:25:28 -04:00
Lew RossmanandGitHub 6d6f244a5f Merge pull request #766 from lbutler/update-readme-jan-2024 
Update release notes and remove depreciated constants
 2024-03-13 09:51:56 -04:00
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