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

1434 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
Elad Salomons
7baf992d69 Merge pull request #646 from Mariosmsk/returnErrcodeNodeNotTank 
Thank you @Mariosmsk
 2021-08-02 06:16:22 +03:00
Elad Salomons
7a07976104 Merge pull request #648 from sahandt/patch-1 
Method parameter types need to match definitions in epanet2.c
 2021-08-01 20:34:10 +03:00
Sahand Tashak
1df2ea80b0 Method parameter types need to match definitions in epanet2.c 2021-07-20 22:58:43 -04:00
mariosmsk
79b2c4c8ee add new errcode 263 "node is not a tank" 2021-06-26 17:11:33 +03:00
mariosmsk
6728a59e63 node is not a tank 2021-06-26 12:01:19 +03:00
Elad Salomons
45c62f6656 Merge pull request #641 from eladsal/zero-rcoeff 
Fix check for roughness coefficient
 2021-06-18 12:39:26 +03:00
Elad Salomons
b1255dead8 Fix check for roughness coefficient 
Fix check for roughness coefficient
 2021-06-15 16:15:54 +03: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 Rossman
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
Elad Salomons
506f0ecb9d Merge pull request #630 from eladsal/comments_bas 
Add comments APIs to VB bas include file
 2021-03-08 13:49:34 +02:00
Elad Salomons
427fb03fe5 Add comments APIs to VB bas include file 2021-02-24 17:51:29 +02: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 Rossman
1e0c65e04e Merge pull request #619 from OpenWaterAnalytics/fix_energy_usage 
Update hydraul.c
 2020-12-18 11:11:46 -05:00
Lew Rossman
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 Rossman
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 Rossman
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 Rossman
ab3eda2158 Merge pull request #614 from Ostoveni/dev 
Header file for C#
 2020-09-30 13:57:08 -04:00
Oscar Vegas Niño
474afda373 Correct comment 
Change "for use with Visual Basic (C#)" to "for use with C#"
 2020-09-30 16:52:00 +02: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
Oscar Vegas Niño
bc0ff50f71 Header file for C# 2020-09-30 15:12:11 +02:00
Elad Salomons
9707075a5a Merge pull request #611 from csweetapple/fix/correct-vmin-calculation 
Thank you @csweetapple
 2020-09-21 16:42:54 +03: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
d11907a2b0 Merge pull request #609 from lxsinske/dev-fix-garbled_Network_has_unconnected_nodes_error 
Fix Unconnected nodes garbled error message
 2020-08-12 07:18:42 +03: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
Sam Hatchett
80b30272cb modifies function declarations with unambiguous "out_" prefixes where output parameters are passed. This is a minor change that does not affect the API or any function implementations, but has great benefits to both readability and SWIG-wrapping. (#605) 
Co-authored-by: Sam Hatchett <sam.hatchett@xyleminc.com>
 2020-07-16 15:23:26 -04:00
Lew Rossman
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
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
Elad Salomons
bdac8d37a7 Merge pull request #604 from Mariosmsk/dev 
Net1.inp have 0 MinorLoss / GUI accepts values zero for MINORLOSS
 2020-06-28 19:55:03 +03:00
mariosmsk
e0745e9dc5 Update epanet.c 2020-06-25 20:22:12 +03:00