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

483 Commits

Author SHA1 Message Date
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 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
bec7c0db0f Remove line comments with release number 2021-04-17 10:24:42 -04:00
Lew Rossman
533466b796 PDA changes to improve convergence 2020-11-19 16:23:24 -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 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 Rossman
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
chrisgs
35aa9f8e08 Fix vmin calculation 
Multiply area by `Hmin - elevation` instead of just `Hmin`.
 2020-08-18 16:58:08 +01:00
Elad Salomons
ec11556d88 Change error number 2331 to 234 2020-08-10 11:20:51 +03:00
Alex Sinske
32732dbdd5 This solves the garbled error message and optionally adds an improved specific error message, which existed in EPANET 2.1 when a network has unconnected nodes. Another similar case in was code found and corrected with the same pattern, but could not be tested. 2020-08-05 18:43:17 +02: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
mariosmsk
e0745e9dc5 Update epanet.c 2020-06-25 20:22:12 +03:00
mariosmsk
532f89d14b Net1.inp have 0 MinorLoss / GUI accepts values zero for MINORLOSS. Similar to the parameter Power of pumps 2020-06-25 20:11:27 +03:00
james uber
949022ed49 API access to incontrols() for information about node/link controls participation 
allowing access to incontrols() for getting information about whether a node or link participates in a simple or rule-based control.
 2020-05-22 11:45:52 -04:00
Elad Salomons
37342c70b1 Another option for EN_settankdata fix 2020-04-19 18:05:08 +03:00
Lew Rossman
37a58a467c Update epanet.c 2020-04-19 09:25:36 -04:00
Lew Rossman
99f09f1edb A simpler fix to EN_settankdata 
Changes 1 line instead of 4.
 2020-04-19 09:16:08 -04:00
Elad Salomons
3f515e7ad4 Fix EN_settankdata for elevation with SI units 
Fix #593
 2020-04-19 09:42:43 +03:00
Lew Rossman
b64e070354 Update project.c 2020-04-13 09:39:58 -04:00
Corey McNeish
ee5e910454 Alloc, free persistent parts of Hydraul in allocdata, rather than in allocmatrix 2020-04-11 11:33:37 -07:00
Corey McNeish
f358e39728 Make node degree list local to factorize 2020-04-11 11:33:28 -07:00
chrisgs
364ad08bcc Limit EN_STARTTIME parameter value to SECperDAY 
Limit `EN_STARTTIME` parameter value to a maximum of `SECperDAY`, and
return an error code if this is exceeded.
 2020-03-23 22:14:02 +00:00
chrisgs
21e1e4c019 Allow start time to be set with EN_settimeparam 
Add additional case for `EN_STARTTIME` to the `EN_settimeparam`
function.
 2020-03-21 17:13:40 +00:00
Lew Rossman
a9ab376aa7 Revert "Replaced status checking for pumps & FCVs" 
This reverts commit 3ee30ce019.
 2020-02-09 17:25:33 -05:00
mariosmsk
25f9a6f6d1 fix EN_INITSETTING 
Co-Authored-By: Lew Rossman <lrossman@outlook.com>
Co-Authored-By: Elad Salomons <selad@optiwater.com>

#583
 2020-02-09 22:05:40 +02: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
Sam Hatchett
c0fe89ceb5 possessive vs contraction 2019-12-07 21:16:58 -05:00
Sam Hatchett
0ca1a0b7a7 cleanup of readme links and unused files 2019-12-07 20:49:21 -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 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 Rossman
2033ddfc22 Fixed editing errors made to project.c 2019-11-15 12:55:29 -05:00
Lew Rossman
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
Sam Hatchett
88e09ba8df fixes a crashing issue in freedata (#559) 
The freedata function used cached values for sizes of certain arrays found in the parser struct. However, now that the network is mutable, those values can become invalid. Relying instead on the actual array lengths prevents freeing unallocated memory, or ignoring cleanup on newly created elements.
 2019-11-15 09:57:32 -05:00
Lew Rossman
6c54bb3a59 Adds error check to EN_setheadcurveindex 
See issue #556 .
 2019-11-09 09:36:10 -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 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 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 Rossman
b640a8685c Adds EN_getresultindex function to the API 
See issue #546 . Also fixes a small bug in project.c.
 2019-10-26 11:25:09 -04:00
Lew Rossman
344700a136 Fixes problems with EN_addnode() (#543) 
See issue #542 . Also modifies unit test test_node to check that fixup works.
 2019-10-16 15:07:14 -04:00
Sam Hatchett
5f7fd55a36 Return error if node/link name is too long (#535) 
* co-authored with @ehsan-shafiee

* removes errant slashes

* Throws correct error for ID name too long

* Revert "Throws correct error for ID name too long"

This reverts commit 57b4873f5882cb9fd983f7e1e5a703b9e442cd74.

* fixes #534 by bubbling error codes up from add node/link internal functions

* fixes tests on Mac at least

* fixes improper success code

* Error 252 (not 250) returned for ID name too long.

From errors.dat: DAT(252,"invalid ID name")
 2019-10-09 10:47:45 -04:00
Lew Rossman
1501204f5f Refactor of hydcoeffs.c 
Simplifies and unifies how limit on head gradient at low flow is handled.
 2019-10-04 10:01:41 -04:00