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

Merge pull request #11 from sdteffen/pumptype

Browse Source 
Added ENgetheadcurve(), ENgetpumptype() and related constants.
This commit is contained in:
Sam Hatchett
2014-01-06 10:11:23 -08:00
parent 55929ff443 5caf7feda3
commit d1b02129dc
2 changed files with 53 additions and 0 deletions
Download Patch File Download Diff File Expand all files Collapse all files

48
src/epanet.c
View File

@@ -2502,6 +2502,54 @@ int DLLEXPORT ENsetqualtype(int qualcode, char *chemname,
return(0);
}
int DLLEXPORT ENgetheadcurve(int index, char *id)
/*----------------------------------------------------------------
** Input: index = index of pump in list of links
** Output: id = head curve ID
** Returns: error code
** Purpose: retrieves ID of a head curve for specific link index
**
** NOTE: 'id' must be able to hold MAXID characters
**----------------------------------------------------------------
*/
{
int i;
strcpy(id,"");
if (!Openflag) return(102);
for (i=1; i<=Npumps; i++)
{
if(Pump[i].Link = index)
{
strcpy(id,Curve[Pump[i].Hcurve].ID);
return(0);
}
}
return(204);
}
int DLLEXPORT ENgetpumptype(int index, int *type)
/*----------------------------------------------------------------
** Input: index = index of pump in list of links
** Output: type = PumpType
** Returns: error code
** Purpose: retrieves type of a pump for specific link index
**
**----------------------------------------------------------------
*/
{
int i;
*type=-1;
if (!Openflag) return(102);
for (i=1; i<=Npumps; i++)
{
if(Pump[i].Link = index)
{
*type = Pump[i].Ptype;
return(0);
}
}
return(204);
}
/*
----------------------------------------------------------------

5
src/toolkit.h
View File

@@ -166,6 +166,9 @@ AUTHOR: L. Rossman
#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)
@@ -230,6 +233,8 @@ extern "C" {
int DLLEXPORT ENgetlinkvalue(int, int, float *);
int DLLEXPORT ENgetcurve(int curveIndex, int *nValues, float **xValues, float **yValues);
int DLLEXPORT ENgetheadcurve(int, char *);
int DLLEXPORT ENgetpumptype(int, int *);
int DLLEXPORT ENgetversion(int *);