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

Update hydcoeffs.c

Browse Source 
Only an Active PSV needs to preserve connectivity.
This commit is contained in:
Lew Rossman
2022-08-05 16:59:32 -04:00
parent 93389ad1e4
commit 79b4fa45a1
1 changed files with 2 additions and 22 deletions
Download Patch File Download Diff File Expand all files Collapse all files

24
src/hydcoeffs.c
View File

@@ -62,7 +62,6 @@ static void tcvcoeff(Project *pr, int k);
static void prvcoeff(Project *pr, int k, int n1, int n2); static void prvcoeff(Project *pr, int k, int n1, int n2);
static void psvcoeff(Project *pr, int k, int n1, int n2); static void psvcoeff(Project *pr, int k, int n1, int n2);
static void fcvcoeff(Project *pr, int k, int n1, int n2); static void fcvcoeff(Project *pr, int k, int n1, int n2);
static void valveconnectcoeffs(Project *pr, int k, int n1, int n2);
void resistcoeff(Project *pr, int k) void resistcoeff(Project *pr, int k)
@@ -318,11 +317,9 @@ void valvecoeffs(Project *pr)
{ {
case PRV: case PRV:
prvcoeff(pr, k, n1, n2); prvcoeff(pr, k, n1, n2);
valveconnectcoeffs(pr, k, n1, n2);
break; break;
case PSV: case PSV:
psvcoeff(pr, k, n1, n2); psvcoeff(pr, k, n1, n2);
valveconnectcoeffs(pr, k, n1, n2);
break; break;
case FCV: case FCV:
fcvcoeff(pr, k, n1, n2); fcvcoeff(pr, k, n1, n2);
@@ -332,25 +329,6 @@ void valvecoeffs(Project *pr)
} }
} }
void valveconnectcoeffs(Project *pr, int k, int n1, int n2)
/*
**--------------------------------------------------------------
** Input: k = valve's link index
** n1 = upstream node of valve
** n2 = downstream node of valve
** Output: none
** Purpose: insures that the off-diagonals in the rows for a
** PRV/PSV are non-zero to preserve connectivity.
**--------------------------------------------------------------
*/
{
Smatrix *sm = &pr->hydraul.smatrix;
double p = 1.0 / CBIG;
sm->Aij[sm->Ndx[k]] -= p;
sm->Aii[sm->Row[n1]] += p;
sm->Aii[sm->Row[n2]] += p;
}
void emittercoeffs(Project *pr) void emittercoeffs(Project *pr)
/* /*
@@ -1057,6 +1035,8 @@ void psvcoeff(Project *pr, int k, int n1, int n2)
{ {
sm->F[j] += hyd->Xflow[n1]; sm->F[j] += hyd->Xflow[n1];
} }
sm->Aij[sm->Ndx[k]] -= 1.0 / CBIG; // Preserve connectivity
sm->Aii[j] += 1.0 / CBIG;
return; return;
} }