JIANG/EPANET
1
0
Fork 0
Code Issues Pull Requests Actions 4 Packages Projects Releases Wiki Activity
1,361 Commits 1 Branch 0 Tags
5a03def497a2174bd1eaf8e98e325bfe43690b63
Commit Graph

1361 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
Lew Rossman
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 Rossman
7b640122cd Merge pull request #752 from Mariosmsk/patch-1 
Update ReleaseNotes2_3.md
 2023-09-28 12:16:28 -04:00
Lew Rossman
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
Marios S. Kyriakou
667a15fcbd Merge branch 'dev' into patch-1 2023-09-25 09:25:34 +03:00
Marios S. Kyriakou
984e6b7fb1 Update ReleaseNotes2_3.md 
Thanks @lbutler for the suggestions. Feel free to make changes!
 2023-09-25 09:23:50 +03:00
Elad Salomons
f8402c1f13 Merge pull request #753 from eladsal/update_header_files_751 
Updated header files following #751
 2023-09-16 08:13:27 +03:00
Luke Butler
05c0528862 Update EN_setcurvetype to support EN_VALVE_CURVE 2023-09-15 11:53:02 -04:00
Lew Rossman
39ffaebcf9 Merge pull request #754 from lbutler/getclosedlink-remove-recursion 
Remove recursion in getclosedlink
 2023-09-15 11:01:39 -04:00
Luke Butler
cfc06321a6 Remove recursion in getclosedlink 
The function getclosedlink in report.c uses recursion to find closed links when reporting on disconnections.

In very large networks, it’s possible for the recursion to exhaust the memory on the call stack which then causes EPANET to crash.

If a loop is used instead of recursion, EPANET will not crash with very large disconnections
 2023-09-14 16:00:34 -04:00
Elad Salomons
8a84668f63 Updated header files following #751 
Updated header files following #751
 2023-09-14 13:35:05 +03:00
Marios S. Kyriakou
d1cad76a5b Update ReleaseNotes2_3.md 
add EN_VALVE_CURVE, EN_PCV_CURVE. Some typo fixes.
 2023-09-13 23:33:15 +03:00
Sam Hatchett
c84c6baee2 Merge pull request #751 from OpenWaterAnalytics/682-request-additional-api-functions-for-enablingdisabling-rules-and-controls-nondestructively 
adds api support for enabling/disabling controls and rules
 2023-09-13 14:54:16 -04:00
Sam Hatchett
0754d08721 Update ReleaseNotes2_3.md 2023-09-13 14:30:57 -04:00
Sam Hatchett
8b28307ecd clarifying documentation 2023-09-13 09:18:08 -04:00
Sam Hatchett
d0ab568a5d using int/bool convention instead of new enum type 2023-09-13 09:14:57 -04:00
Sam Hatchett
06a43cdb4e adds api support for enabling/disabling controls and rules 2023-09-12 14:51:44 -04:00
Lew Rossman
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 Rossman
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 Rossman
4577af9b19 Merge pull request #744 from 0tkl/dev 
Bugfix
 2023-08-10 11:44:22 -04:00
0tkl
2f63e513f0 fix potential memory leaks 
Co-authored-by: Lew Rossman <LRossman@cinci.rr.com>
 2023-08-10 12:32:28 +08:00
0tkl
b860f9b16f add a default value to controlIndex 2023-08-09 15:38:41 +08:00
0tkl
434cd68a23 fix potential deref of a null pointer 2023-08-05 01:20:09 +08:00
0tkl
4ca66cc7fe handle error codes in tests 2023-08-02 17:44:20 +08:00
Lew Rossman
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 Rossman
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 Rossman
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
Jim Uber
1ff1e8fdfc Merge pull request #729 from jamesuber/adjustpumpparams-bugfix 
Adjustpumpparams bugfix
 2023-05-04 16:50:15 -04:00
james uber
f709c199bc correct error in adjustpumpparams() where a curveindex was being used instead of the pump index 2023-04-22 17:40:25 -04:00
james uber
7ae9c28e1a setlinkvalue missing a break statement 2023-04-15 12:57:01 -04:00
Lew Rossman
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 Rossman
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
Luke Butler
9cde32080a added function updateruleunits 2023-03-30 16:22:58 -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
Luke Butler
56c569b56f Update epanet2_enums.h 
Fixed option and spacing
 2023-03-16 19:53:25 -04:00
Luke Butler
6bc1efaf1c Check pressure units in metric are not set to PSI 2023-03-16 16:21:55 -04:00
Luke Butler
4beebbd470 Add EN_PRESS_UNITS to EN_getoption & EN_setoption 2023-03-16 16:13:49 -04:00
Lew Rossman
ffe272462f Merge pull request #718 from lbutler/update-building.md 
Update building.md
 2023-03-15 12:07:31 -04:00
Lew Rossman
6293b736f5 Merge pull request #717 from lbutler/update-releasenotes2_3.md 
Update ReleaseNote2_3.md
 2023-03-15 11:35:34 -04:00
Luke Butler
40cd9acaf1 Update BUILDING.md to mention windows tutorial 2023-03-15 11:33:01 -04:00
Luke Butler
0e4c400355 Update ReleaseNote2_3.md 
Commits between V2.2 and 2023-03-15 were reviewed and missed items in the release notes were added.

Fixes #716
 2023-03-15 11:13:47 -04:00