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

Fix vmin calculation

Browse Source 
Multiply area by `Hmin - elevation` instead of just `Hmin`.
This commit is contained in:
chrisgs
2020-08-18 16:44:33 +01:00
parent d11907a2b0
commit 35aa9f8e08
1 changed files with 3 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
src/epanet.c
View File

@@ -2411,7 +2411,7 @@ int DLLEXPORT EN_setnodevalue(EN_Project p, int index, int property, double valu
// Since the volume curve no longer applies we assume that the tank's // Since the volume curve no longer applies we assume that the tank's
// shape below Hmin is cylindrical and Vmin equals area times Hmin // shape below Hmin is cylindrical and Vmin equals area times Hmin
Tank[j].Vmin = Tank[j].A * Tank[j].Hmin; Tank[j].Vmin = Tank[j].A * (Tank[j].Hmin - Node[index].El);
} }
// Since tank's area has changed its volumes must be updated // Since tank's area has changed its volumes must be updated
// NOTE: For a non-volume curve tank we can't change the Vmin // NOTE: For a non-volume curve tank we can't change the Vmin
@@ -2444,7 +2444,7 @@ int DLLEXPORT EN_setnodevalue(EN_Project p, int index, int property, double valu
// If the volume supplied by the function is 0 then the tank shape // If the volume supplied by the function is 0 then the tank shape
// below Hmin is assumed to be cylindrical and a new Vmin value is // below Hmin is assumed to be cylindrical and a new Vmin value is
// computed. Otherwise Vmin is set to the supplied value. // computed. Otherwise Vmin is set to the supplied value.
if (value == 0.0) Tank[j].Vmin = Tank[j].A * Tank[j].Hmin; if (value == 0.0) Tank[j].Vmin = Tank[j].A * (Tank[j].Hmin - Node[index].El);
else Tank[j].Vmin = value / Ucf[VOLUME]; else Tank[j].Vmin = value / Ucf[VOLUME];
// Since Vmin changes the other volumes need updating // Since Vmin changes the other volumes need updating
@@ -2672,7 +2672,7 @@ int DLLEXPORT EN_settankdata(EN_Project p, int index, double elev,
if (curveIndex == 0) if (curveIndex == 0)
{ {
if (minvol > 0.0) Tank[j].Vmin = minvol / Ucf[VOLUME]; if (minvol > 0.0) Tank[j].Vmin = minvol / Ucf[VOLUME];
else Tank[j].Vmin = Tank[j].A * Tank[j].Hmin; else Tank[j].Vmin = Tank[j].A * (Tank[j].Hmin - elev / Ucf[ELEV]);
} }
else Tank[j].Vmin = tankvolume(p, j, Tank[j].Hmin); else Tank[j].Vmin = tankvolume(p, j, Tank[j].Hmin);
Tank[j].V0 = tankvolume(p, j, Tank[j].H0); Tank[j].V0 = tankvolume(p, j, Tank[j].H0);