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

Merge branch 'dev' into dev

Browse Source
This commit is contained in:
Abel Heinsbroek
2024-05-31 21:36:57 +02:00
committed by GitHub
parent 9637f5c092 8b6be71956
commit 93a0b3671b
7 changed files with 22 additions and 11 deletions
Download Patch File Download Diff File Expand all files Collapse all files

7
src/epanet.c
View File

@@ -2449,6 +2449,7 @@ int DLLEXPORT EN_setnodevalue(EN_Project p, int index, int property, double valu
if (value < 0.0) return 209;
if (value > 0.0) value = pow((Ucf[FLOW] / value), hyd->Qexp) / Ucf[PRESSURE];
Node[index].Ke = value;
if (hyd->EmitterFlow[index] == 0.0) hyd->EmitterFlow[index] = 1.0;
break;
case EN_INITQUAL:
@@ -3428,6 +3429,12 @@ int DLLEXPORT EN_deletelink(EN_Project p, int index, int actionCode)
if (net->Valve[i].Link > index) net->Valve[i].Link -= 1;
}
// Reduce the number of pipes count by one if it is a pipe.
if (linkType == PIPE)
{
net->Npipes--;
}
// Delete any pump associated with the deleted link
if (linkType == PUMP)
{