JIANG/EPANET
1
0
Fork 0
Code Issues Pull Requests Actions 4 Packages Projects Releases Wiki Activity
1,338 Commits 1 Branch 0 Tags
4577af9b1919d03ed0f8b8d0d2a1f7ba817cd58e
Commit Graph

1338 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
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
Luke Butler
f530f95835 Update BUILDING.md to include testing information 2023-03-09 14:34:39 -05:00
Lew Rossman
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
Luke Butler
8e68b77f61 Updated outfile to support cubic meters/sec 2023-02-20 10:24:11 -05:00
Luke Butler
09290da2cc Redefinition during test 2023-02-20 10:05:51 -05:00
Luke Butler
843f1f4e37 Added support for cubic meters per second (CMS) 2023-02-20 09:43:42 -05:00
Lew Rossman
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
Luke Butler
3856a6310d Fixes incorrect hour set with >9 input tokens 
If you create a simple control with nine or more input tokens, the logic skips over assigning the hour variable and EPANET will activate the control at hour zero.
 2023-02-15 14:46:39 -05:00
Lew Rossman
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 Rossman
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 Rossman
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 Rossman
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
Sam Hatchett
7dab25e867 Merge pull request #688 from OpenWaterAnalytics/681-request-additional-api-function-for-getting-finer-grained-time-step-information 
adds an API function to get information about upcoming events
 2023-01-20 09:47:17 -05:00
Sam Hatchett
57ae3eeab8 Update ReleaseNotes2_3.md 2023-01-19 14:16:50 -05:00
Elad Salomons
e2df3e87ac Adding support for VB 
Also supporting C89 compiler.
 2023-01-19 20:45:30 +02:00
Sam Hatchett
2705f8adc1 Merge branch 'dev' into 681-request-additional-api-function-for-getting-finer-grained-time-step-information 2023-01-19 11:52:18 -05:00
Sam Hatchett
736f5ebdd4 updates function signatures to use int-casted enum 2023-01-19 09:50:50 -05:00
Sam Hatchett
3a0cc012b5 Merge pull request #689 from OpenWaterAnalytics/683-request-better-logging-functionality 
adds client callback API function
 2023-01-19 09:02:02 -05:00
Sam Hatchett
30c511ca78 Merge branch 'dev' into 683-request-better-logging-functionality 2023-01-19 09:01:43 -05:00