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

Update hydsolver.c

Browse Source
This commit is contained in:
Lew Rossman
2022-02-14 11:03:22 -05:00
parent 650d8e8e53
commit 070901d6bf
1 changed files with 21 additions and 9 deletions
Download Patch File Download Diff File Expand all files Collapse all files

30
src/hydsolver.c
View File

@@ -555,8 +555,8 @@ void newdemandflows(Project *pr, Hydbalance *hbal, double *qsum, double *dqsum)
dq *= hyd->RelaxFactor; dq *= hyd->RelaxFactor;
// Prevent a flow change greater than full demand // Prevent a flow change greater than full demand
if (fabs(dq) > hyd->NodeDemand[i]) if (fabs(dq) > 0.4 * hyd->NodeDemand[i])
dq = 0.5 * SGN(dq) * hyd->NodeDemand[i]; dq = 0.4 * SGN(dq) * hyd->NodeDemand[i];
hyd->DemandFlow[i] -= dq; hyd->DemandFlow[i] -= dq;
// Update system flow summation // Update system flow summation
@@ -658,9 +658,11 @@ int pdaconverged(Project *pr)
{ {
Hydraul *hyd = &pr->hydraul; Hydraul *hyd = &pr->hydraul;
const double TOL = 0.001; const double QTOL = 0.0001; // 0.0001 cfs ~= 0.005 gpm ~= 0.2 lpm)
int i, converged = 1; int i, converged = 1;
double totalDemand = 0.0, totalReduction = 0.0; double totalDemand = 0.0, totalReduction = 0.0;
double dp = hyd->Preq - hyd->Pmin;
double p, q, r;
hyd->DeficientNodes = 0; hyd->DeficientNodes = 0;
hyd->DemandReduction = 0.0; hyd->DemandReduction = 0.0;
@@ -670,15 +672,25 @@ int pdaconverged(Project *pr)
{ {
// Skip nodes whose required demand is non-positive // Skip nodes whose required demand is non-positive
if (hyd->NodeDemand[i] <= 0.0) continue; if (hyd->NodeDemand[i] <= 0.0) continue;
// Evaluate demand equation at current pressure solution
p = hyd->NodeHead[i] - pr->network.Node[i].El;
if (p <= hyd->Pmin)
q = 0.0;
else if (p >= hyd->Preq)
q = hyd->NodeDemand[i];
else
{
r = (p - hyd->Pmin) / dp;
q = hyd->NodeDemand[i] * pow(r, hyd->Pexp);
}
// Check for negative demand flow or positive demand flow at negative pressure // Check if demand has not converged
if (hyd->DemandFlow[i] < -TOL) converged = 0; if (fabs(q - hyd->DemandFlow[i]) > QTOL)
if (hyd->DemandFlow[i] > TOL && converged = 0;
hyd->NodeHead[i] - pr->network.Node[i].El - hyd->Pmin < -TOL)
converged = 0;
// Accumulate total required demand and demand deficit // Accumulate total required demand and demand deficit
if (hyd->DemandFlow[i] + 0.0001 < hyd->NodeDemand[i]) if (hyd->DemandFlow[i] + QTOL < hyd->NodeDemand[i])
{ {
hyd->DeficientNodes++; hyd->DeficientNodes++;
totalDemand += hyd->NodeDemand[i]; totalDemand += hyd->NodeDemand[i];