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

Merge pull request #611 from csweetapple/fix/correct-vmin-calculation

Browse Source 
Thank you @csweetapple
This commit is contained in:
Elad Salomons
2020-09-21 16:42:54 +03:00
committed by GitHub
parent d11907a2b0 35aa9f8e08
commit 9707075a5a
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
// 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
// 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
// below Hmin is assumed to be cylindrical and a new Vmin value is
// 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];
// 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 (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);
Tank[j].V0 = tankvolume(p, j, Tank[j].H0);