JIANG/EPANET
1
0
Fork 0
Code Issues Pull Requests Actions 4 Packages Projects Releases Wiki Activity

Changed benchmark results for EN_getstatistic test

Browse Source
This commit is contained in:
Lew Rossman
2020-02-07 13:49:54 -05:00
parent 3ee30ce019
commit 7e3d5e1fe0
2 changed files with 6 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

1
ReleaseNotes2_3.md
View File

@@ -11,6 +11,7 @@ This document describes the changes and updates that have been made in version 2
- For `EN_CUSTOM` type pump curves the maximum head value is now extrapolated to the y-axis intercept instead of being based on the first curve data point. Similarly, the maximum flow value is extrapolated to the x-axis intercept. - For `EN_CUSTOM` type pump curves the maximum head value is now extrapolated to the y-axis intercept instead of being based on the first curve data point. Similarly, the maximum flow value is extrapolated to the x-axis intercept.
- Status checking for a pump not able to deliver enough head has been replaced by adding a penalty term to the pump's operating curve that prevents it from having negative flow (i.e., from crossing the y-axis). - Status checking for a pump not able to deliver enough head has been replaced by adding a penalty term to the pump's operating curve that prevents it from having negative flow (i.e., from crossing the y-axis).
- Status checking for Flow Control Valves has been eliminated by using a continuous head v. flow function. If the current flow is below the valve setting then the normal open head loss relation is used; otherwise a linear penalty function is applied to any flow in excess of the setting. Warnings are no longer issued when the valve operates fully opened at flows below the setting. - Status checking for Flow Control Valves has been eliminated by using a continuous head v. flow function. If the current flow is below the valve setting then the normal open head loss relation is used; otherwise a linear penalty function is applied to any flow in excess of the setting. Warnings are no longer issued when the valve operates fully opened at flows below the setting.
- The maximum link head loss error convergence criterion is now evaluated using the most recently computed link flows instead of flows from the previous iteration.

7
tests/test_report.cpp
View File

@@ -25,8 +25,11 @@ BOOST_FIXTURE_TEST_CASE(test_rprt_anlysstats, FixtureOpenClose)
std::vector<double> test(5); std::vector<double> test(5);
double *array = test.data(); double *array = test.data();
std::vector<double> ref = {3.0, 7.0799498320679432e-06, 1.6680242187483429e-08, std::vector<double> ref =
0.0089173150106518495, 0.99999998187144024}; // {3.0, 7.0799498320679432e-06, 1.6680242187483429e-08, // v2.2
// 0.0089173150106518495, 0.99999998187144024};
{3.0, 8.3792202148e-6, 2.63983750e-8, // v2.3_dev
0.0112012133155924, 0.9999999807954413};
error = EN_solveH(ph); error = EN_solveH(ph);
BOOST_REQUIRE(error == 0); BOOST_REQUIRE(error == 0);