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

Revert "Fixes zero flow issue (#164) and DW eqn. (#199)"

Browse Source 
This reverts commit 6b808c03ab.
This commit is contained in:
Lew Rossman
2018-09-11 11:04:47 -04:00
parent 6b808c03ab
commit 836d9c3668
3 changed files with 220 additions and 268 deletions
Download Patch File Download Diff File Expand all files Collapse all files

22
src/hydsolver.c
View File

@@ -494,34 +494,30 @@ void newemitterflows(EN_Project *pr, Hydbalance *hbal, double *qsum,
**----------------------------------------------------------------
*/
{
int i;
double hloss, hgrad, dh, dq;
double dq;
int k;
EN_Network *net = &pr->network;
hydraulics_t *hyd = &pr->hydraulics;
// Examine each network junction
for (i = 1; i <= net->Njuncs; i++)
for (k = 1; k <= net->Njuncs; k++)
{
// Skip junction if it does not have an emitter
if (net->Node[i].Ke == 0.0) continue;
if (net->Node[k].Ke == 0.0) continue;
// Find emitter head loss and gradient
emitheadloss(pr, i, &hloss, &hgrad);
// Find emitter flow change
dh = hyd->NodeHead[i] - net->Node[i].El;
dq = (hloss - dh) / hgrad;
hyd->EmitterFlows[i] -= dq;
// Find emitter flow change (see hydcoeffs.c)
dq = emitflowchange(pr, k);
hyd->EmitterFlows[k] -= dq;
// Update system flow summation
*qsum += ABS(hyd->EmitterFlows[i]);
*qsum += ABS(hyd->EmitterFlows[k]);
*dqsum += ABS(dq);
// Update identity of element with max. flow change
if (ABS(dq) > hbal->maxflowchange)
{
hbal->maxflowchange = ABS(dq);
hbal->maxflownode = i;
hbal->maxflownode = k;
hbal->maxflowlink = -1;
}
}