From 322a3cb46382bfe7172e2574003c6c277fcd2a43 Mon Sep 17 00:00:00 2001 From: Elad Salomons Date: Wed, 23 Sep 2015 15:31:29 +0300 Subject: [PATCH] Added pump's type constants to header files --- include/epanet2.bas | 4 ++++ include/epanet2.h | 3 +++ src/epanet.c | 2 +- 3 files changed, 8 insertions(+), 1 deletion(-) diff --git a/include/epanet2.bas b/include/epanet2.bas index 86e8c38..9ceeb2b 100644 --- a/include/epanet2.bas +++ b/include/epanet2.bas @@ -140,6 +140,10 @@ Global Const EN_SAVE = 1 Global Const EN_INITFLOW = 10 ' Re-initialize flow flag +Global Const EN_CONST_HP = 0 ' constant horsepower +Global Const EN_POWER_FUNC = 1 ' power function +Global Const EN_CUSTOM = 2 ' user-defined custom curve + 'These are the external functions that comprise the DLL Declare Function ENepanet Lib "epanet2.dll" (ByVal F1 As String, ByVal F2 As String, ByVal F3 As String, ByVal F4 As Any) As Long diff --git a/include/epanet2.h b/include/epanet2.h index 606bf1b..7bab95e 100755 --- a/include/epanet2.h +++ b/include/epanet2.h @@ -188,6 +188,9 @@ #define EN_INITFLOW 10 /* Re-initialize flows flag */ +#define EN_CONST_HP 0 /* constant horsepower */ +#define EN_POWER_FUNC 1 /* power function */ +#define EN_CUSTOM 2 /* user-defined custom curve */ // --- Declare the EPANET toolkit functions #if defined(__cplusplus) diff --git a/src/epanet.c b/src/epanet.c index c350434..571bdc5 100755 --- a/src/epanet.c +++ b/src/epanet.c @@ -2785,7 +2785,7 @@ int DLLEXPORT ENgetheadcurve(int index, char *id) int DLLEXPORT ENgetpumptype(int index, int *type) /*---------------------------------------------------------------- ** Input: index = index of pump in list of links -** Output: type = PumpType +** Output: type = Pump type ** Returns: error code ** Purpose: retrieves type of a pump for specific link index **