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

Merging changes from upstream dev

Browse Source
This commit is contained in:
Michael Tryby
2018-08-22 15:09:33 -04:00
parent fafad2a070 761199b08e
commit 75e400cf44
21 changed files with 1978 additions and 470 deletions
Download Patch File Download Diff File Expand all files Collapse all files

7
src/types.h
View File

@@ -102,7 +102,7 @@ typedef int INT4;
---------------------------------------------------------------------
*/
#define MEMCHECK(x) (((x) == NULL) ? 101 : 0 )
#define FREE(x) (free((x)))
#define FREE(x) if ((x)) free((x))
/*
---------------------------------------------------------------------
@@ -153,8 +153,9 @@ typedef enum {
V_CURVE, /* volume curve */
P_CURVE, /* pump curve */
E_CURVE, /* efficiency curve */
H_CURVE
} CurveType; /* head loss curve */
H_CURVE, /* head loss curve */
G_CURVE /* General\default curve */
} CurveType;
typedef enum {
CONST_HP, /* constant horsepower */