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

Fixes EN_setlinkvalue bug

Browse Source
This commit is contained in:
Lew Rossman
2019-08-05 14:08:18 -04:00
parent 153fa3dce4
commit 803bad0bf0
1 changed files with 5 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files

9
src/epanet.c
View File

@@ -3890,7 +3890,7 @@ int DLLEXPORT EN_setlinkvalue(EN_Project p, int index, int property, double valu
if (Link[index].Type == PUMP) if (Link[index].Type == PUMP)
{ {
patIndex = ROUND(value); patIndex = ROUND(value);
if (patIndex <= 0 || patIndex > net->Npats) return 205; if (patIndex < 0 || patIndex > net->Npats) return 205;
pumpIndex = findpump(&p->network, index); pumpIndex = findpump(&p->network, index);
net->Pump[pumpIndex].Upat = patIndex; net->Pump[pumpIndex].Upat = patIndex;
} }
@@ -3923,7 +3923,7 @@ int DLLEXPORT EN_setlinkvalue(EN_Project p, int index, int property, double valu
if (Link[index].Type == PUMP) if (Link[index].Type == PUMP)
{ {
curveIndex = ROUND(value); curveIndex = ROUND(value);
if (curveIndex <= 0 || curveIndex > net->Ncurves) return 205; if (curveIndex < 0 || curveIndex > net->Ncurves) return 205;
pumpIndex = findpump(&p->network, index); pumpIndex = findpump(&p->network, index);
net->Pump[pumpIndex].Ecurve = curveIndex; net->Pump[pumpIndex].Ecurve = curveIndex;
} }
@@ -3942,7 +3942,7 @@ int DLLEXPORT EN_setlinkvalue(EN_Project p, int index, int property, double valu
if (Link[index].Type == PUMP) if (Link[index].Type == PUMP)
{ {
patIndex = ROUND(value); patIndex = ROUND(value);
if (patIndex <= 0 || patIndex > net->Npats) return 205; if (patIndex < 0 || patIndex > net->Npats) return 205;
pumpIndex = findpump(&p->network, index); pumpIndex = findpump(&p->network, index);
net->Pump[pumpIndex].Epat = patIndex; net->Pump[pumpIndex].Epat = patIndex;
} }
@@ -4068,13 +4068,14 @@ int DLLEXPORT EN_setheadcurveindex(EN_Project p, int linkIndex, int curveIndex)
if (!p->Openflag) return 102; if (!p->Openflag) return 102;
if (linkIndex < 1 || linkIndex > net->Nlinks) return 204; if (linkIndex < 1 || linkIndex > net->Nlinks) return 204;
if (PUMP != net->Link[linkIndex].Type) return 0; if (PUMP != net->Link[linkIndex].Type) return 0;
if (curveIndex <= 0 || curveIndex > net->Ncurves) return 206; if (curveIndex < 0 || curveIndex > net->Ncurves) return 206;
// Assign the new curve to the pump // Assign the new curve to the pump
pumpIndex = findpump(net, linkIndex); pumpIndex = findpump(net, linkIndex);
pump = &p->network.Pump[pumpIndex]; pump = &p->network.Pump[pumpIndex];
pump->Ptype = NOCURVE; pump->Ptype = NOCURVE;
pump->Hcurve = curveIndex; pump->Hcurve = curveIndex;
if (curveIndex == 0) return 0;
// Update the pump curve's parameters and convert their units // Update the pump curve's parameters and convert their units
updatepumpparams(p, pumpIndex); updatepumpparams(p, pumpIndex);