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

Merge pull request #821 from OpenWaterAnalytics/dev-fix-tank-mixing

Browse Source 
Corrections to 2-compartment tank mixing
This commit is contained in:
Lew Rossman
2024-12-21 11:17:48 -05:00
committed by GitHub
parent fbd005d604 626b93a10f
commit 3201d8485e
1 changed files with 9 additions and 5 deletions
Download Patch File Download Diff File Expand all files Collapse all files

14
src/qualreact.c
View File

@@ -7,7 +7,7 @@ Description: computes water quality reactions within pipes and tanks
Authors: see AUTHORS
Copyright: see AUTHORS
License: see LICENSE
Last Updated: 03/12/2024
Last Updated: 12/16/2024
******************************************************************************
*/
@@ -566,10 +566,10 @@ void tankmix2(Project *pr, int i, double vin, double win, double vnet)
// Update segment volumes
if (vt > 0.0)
{
mixzone->v = vmz;
if (vnet > 0.0)
{
stagzone->v += vt;
mixzone->v = vmz;
stagzone->v += vt;
// Account for mass lost in overflow from stagnant zone
vsz = (tank->Vmax) - vmz;
@@ -579,14 +579,18 @@ void tankmix2(Project *pr, int i, double vin, double win, double vnet)
stagzone->v = vsz;
}
}
else stagzone->v = MAX(0.0, ((stagzone->v) - vt));
else
{
stagzone->v = MAX(0.0, ((stagzone->v) - vt));
mixzone->v = vmz + vt + vnet;
}
}
else
{
mixzone->v += vnet;
mixzone->v = MIN(mixzone->v, vmz);
mixzone->v = MAX(0.0, mixzone->v);
stagzone->v = 0.0;
if (vmz - mixzone->v > 0.0) stagzone->v = 0.0;
}
// Use quality of mixing zone to represent quality of