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

Merge branch 'dev' into 683-request-better-logging-functionality

Browse Source
This commit is contained in:
Sam Hatchett
2023-01-19 09:01:43 -05:00
committed by GitHub
parent b139684164 bf6fcc42b4
commit 30c511ca78
26 changed files with 437 additions and 42 deletions
Download Patch File Download Diff File Expand all files Collapse all files

9
src/types.h
View File

@@ -7,7 +7,7 @@
Authors: see AUTHORS
Copyright: see AUTHORS
License: see LICENSE
Last Updated: 07/11/2020
Last Updated: 08/13/2022
******************************************************************************
*/
@@ -145,7 +145,8 @@ typedef enum {
PBV, // pressure breaker valve
FCV, // flow control valve
TCV, // throttle control valve
GPV // general purpose valve
GPV, // general purpose valve
PCV // positional control valve
} LinkType;
typedef enum {
@@ -166,7 +167,8 @@ typedef enum {
PUMP_CURVE, // pump curve
EFFIC_CURVE, // efficiency curve
HLOSS_CURVE, // head loss curve
GENERIC_CURVE // generic curve
GENERIC_CURVE, // generic curve
VALVE_CURVE // positional valve loss curve
} CurveType;
typedef enum {
@@ -455,6 +457,7 @@ typedef struct // Pump Object
typedef struct // Valve Object
{
int Link; // link index of valve
int Curve; // positional loss coeff. curve
} Svalve;
typedef struct // Control Statement