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

Added pump's type constants to header files

Browse Source
This commit is contained in:
Elad Salomons
2015-09-23 15:31:29 +03:00
parent f894ade5ee
commit 322a3cb463
3 changed files with 8 additions and 1 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
include/epanet2.bas
View File

@@ -140,6 +140,10 @@ Global Const EN_SAVE = 1
Global Const EN_INITFLOW = 10 ' Re-initialize flow flag 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 '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 Declare Function ENepanet Lib "epanet2.dll" (ByVal F1 As String, ByVal F2 As String, ByVal F3 As String, ByVal F4 As Any) As Long

3
include/epanet2.h
View File

@@ -188,6 +188,9 @@
#define EN_INITFLOW 10 /* Re-initialize flows flag */ #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 // --- Declare the EPANET toolkit functions
#if defined(__cplusplus) #if defined(__cplusplus)

2
src/epanet.c
View File

@@ -2785,7 +2785,7 @@ int DLLEXPORT ENgetheadcurve(int index, char *id)
int DLLEXPORT ENgetpumptype(int index, int *type) int DLLEXPORT ENgetpumptype(int index, int *type)
/*---------------------------------------------------------------- /*----------------------------------------------------------------
** Input: index = index of pump in list of links ** Input: index = index of pump in list of links
** Output: type = PumpType ** Output: type = Pump type
** Returns: error code ** Returns: error code
** Purpose: retrieves type of a pump for specific link index ** Purpose: retrieves type of a pump for specific link index
** **