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

Merge pull request #594 from eladsal/dev

Browse Source 
Fix EN_settankdata for elevation with SI units
This commit is contained in:
Elad Salomons
2020-04-19 19:17:14 +03:00
committed by GitHub
parent b259f87782 37342c70b1
commit 6af72fd6d1
1 changed files with 5 additions and 5 deletions
Download Patch File Download Diff File Expand all files Collapse all files

10
src/epanet.c
View File

@@ -2628,8 +2628,8 @@ int DLLEXPORT EN_settankdata(EN_Project p, int index, double elev,
Network *net = &p->network; Network *net = &p->network;
int i, j, n, curveIndex = 0; int i, j, n, curveIndex = 0;
double area, elevation = elev;
double *Ucf = p->Ucf; double *Ucf = p->Ucf;
double area;
Stank *Tank = net->Tank; Stank *Tank = net->Tank;
Scurve *curve; Scurve *curve;
@@ -2666,11 +2666,11 @@ int DLLEXPORT EN_settankdata(EN_Project p, int index, double elev,
else area = PI * diam * diam / 4.0; else area = PI * diam * diam / 4.0;
// Assign parameters to tank object // Assign parameters to tank object
net->Node[Tank[j].Node].El = elevation; net->Node[Tank[j].Node].El = elev / Ucf[ELEV];
Tank[j].A = area / Ucf[ELEV] / Ucf[ELEV]; Tank[j].A = area / Ucf[ELEV] / Ucf[ELEV];
Tank[j].H0 = elevation + initlvl / Ucf[ELEV]; Tank[j].H0 = (elev + initlvl) / Ucf[ELEV];
Tank[j].Hmin = elevation + minlvl / Ucf[ELEV]; Tank[j].Hmin = (elev + minlvl) / Ucf[ELEV];
Tank[j].Hmax = elevation + maxlvl / Ucf[ELEV]; Tank[j].Hmax = (elev + maxlvl) / Ucf[ELEV];
Tank[j].Vcurve = curveIndex; Tank[j].Vcurve = curveIndex;
if (curveIndex == 0) if (curveIndex == 0)
{ {