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

Identifies overflowing tank in Status Report

Browse Source
This commit is contained in:
Lew Rossman
2019-06-20 15:00:18 -04:00
parent d17a7df956
commit 85e2f2c187
4 changed files with 15 additions and 7 deletions
Download Patch File Download Diff File Expand all files Collapse all files

5
src/enumstxt.h
View File

@@ -7,7 +7,7 @@
Authors: see AUTHORS Authors: see AUTHORS
Copyright: see AUTHORS Copyright: see AUTHORS
License: see LICENSE License: see LICENSE
Last Updated: 11/27/2018 Last Updated: 06/20/2019
****************************************************************************** ******************************************************************************
*/ */
@@ -38,7 +38,8 @@ char *StatTxt[] = {t_XHEAD,
t_XFCV, t_XFCV,
t_XPRESSURE, t_XPRESSURE,
t_FILLING, t_FILLING,
t_EMPTYING}; t_EMPTYING,
t_OVERFLOWING};
char *FormTxt[] = {w_HW, char *FormTxt[] = {w_HW,
w_DW, w_DW,

9
src/report.c
View File

@@ -7,7 +7,7 @@
Authors: see AUTHORS Authors: see AUTHORS
Copyright: see AUTHORS Copyright: see AUTHORS
License: see LICENSE License: see LICENSE
Last Updated: 05/15/2019 Last Updated: 06/20/2019
****************************************************************************** ******************************************************************************
*/ */
@@ -370,8 +370,13 @@ void writehydstat(Project *pr, int iter, double relerr)
n = net->Tank[i].Node; n = net->Tank[i].Node;
NodeDemand = hyd->NodeDemand; NodeDemand = hyd->NodeDemand;
if (ABS(NodeDemand[n]) < 0.001) newstat = CLOSED; if (ABS(NodeDemand[n]) < 0.001) newstat = CLOSED;
else if (NodeDemand[n] > 0.0) newstat = FILLING;
else if (NodeDemand[n] < 0.0) newstat = EMPTYING; else if (NodeDemand[n] < 0.0) newstat = EMPTYING;
else if (NodeDemand[n] > 0.0)
{
if (Tank[i].A > 0.0 && ABS(hyd->NodeHead[n] - Tank[i].Hmax) < 0.001)
newstat = OVERFLOWING;
else newstat = FILLING;
}
else newstat = hyd->OldStatus[net->Nlinks + i]; else newstat = hyd->OldStatus[net->Nlinks + i];
if (newstat != hyd->OldStatus[net->Nlinks + i]) if (newstat != hyd->OldStatus[net->Nlinks + i])
{ {

3
src/text.h
View File

@@ -7,7 +7,7 @@
Authors: see AUTHORS Authors: see AUTHORS
Copyright: see AUTHORS Copyright: see AUTHORS
License: see LICENSE License: see LICENSE
Last Updated: 11/27/2018 Last Updated: 06/20/2019
****************************************************************************** ******************************************************************************
*/ */
@@ -282,6 +282,7 @@
#define t_XPRESSURE "open but cannot deliver pressure" #define t_XPRESSURE "open but cannot deliver pressure"
#define t_FILLING "filling" #define t_FILLING "filling"
#define t_EMPTYING "emptying" #define t_EMPTYING "emptying"
#define t_OVERFLOWING "overflowing"
#define t_ELEV "Elevation" #define t_ELEV "Elevation"
#define t_DEMAND "Demand" #define t_DEMAND "Demand"

5
src/types.h
View File

@@ -7,7 +7,7 @@
Authors: see AUTHORS Authors: see AUTHORS
Copyright: see AUTHORS Copyright: see AUTHORS
License: see LICENSE License: see LICENSE
Last Updated: 05/15/2019 Last Updated: 06/20/2019
****************************************************************************** ******************************************************************************
*/ */
@@ -200,7 +200,8 @@ typedef enum {
XFCV, // FCV cannot supply flow XFCV, // FCV cannot supply flow
XPRESSURE, // valve cannot supply pressure XPRESSURE, // valve cannot supply pressure
FILLING, // tank filling FILLING, // tank filling
EMPTYING // tank emptying EMPTYING, // tank emptying
OVERFLOWING // tank overflowing
} StatusType; } StatusType;
typedef enum { typedef enum {