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

Merge remote-tracking branch 'refs/remotes/upstream/dev' into dev-swig

Browse Source
This commit is contained in:
Michael Tryby
2018-01-24 14:34:49 -05:00
parent 691c65878b dcd1c6dd10
commit 5e3ab5428d
12 changed files with 435 additions and 195 deletions
Download Patch File Download Diff File Expand all files Collapse all files

8
include/epanet2.h
View File

@@ -514,6 +514,13 @@ extern "C" {
*/
int DLLEXPORT ENgetflowunits(int *code);
/**
@brief Sets the flow units
@param code Code of flow units to use
@return Error code
*/
int DLLEXPORT ENsetflowunits(int code);
/**
@brief Retrieves the index of the time pattern with specified ID
@param id String ID of the time pattern
@@ -1162,6 +1169,7 @@ extern "C" {
int DLLEXPORT EN_getoption(EN_Project *p, EN_Option opt, EN_API_FLOAT_TYPE *value);
int DLLEXPORT EN_gettimeparam(EN_Project *p, int code, long *value);
int DLLEXPORT EN_getflowunits(EN_Project *p, int *code);
int DLLEXPORT EN_setflowunits(EN_Project *p, int code);
int DLLEXPORT EN_getpatternindex(EN_Project *p, char *id, int *index);
int DLLEXPORT EN_getpatternid(EN_Project *p, int index, char *id);
int DLLEXPORT EN_getpatternlen(EN_Project *p, int index, int *len);