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

Fix duplicate w_POWER definition

Browse Source 
Fix duplicate w_POWER definition and some house keeping. Tested the new
commit by @AngelaMarchi from #87, all results are the same as version
2.1.
This commit is contained in:
Elad Salomons
2016-11-09 16:37:57 +02:00
parent bca5409952
commit e1da9bc9d7
4 changed files with 5 additions and 35 deletions
Download Patch File Download Diff File Expand all files Collapse all files

8
src/text.h
View File

@@ -95,10 +95,8 @@ AUTHOR: L. Rossman
#define w_METERS "METERS"
#define w_ELEV "ELEV"
//#define w_DEMAND "DEMA"
#define w_DEMAND "DEMAND"
#define w_HEAD "HEAD"
//#define w_PRESSURE "PRES"
#define w_PRESSURE "PRESSURE"
#define w_QUALITY "QUAL"
@@ -107,15 +105,11 @@ AUTHOR: L. Rossman
#define w_ROUGHNESS "ROUG"
#define w_VELOCITY "VELO"
#define w_HEADLOSS "HEADL"
//#define w_SETTING "SETT"
#define w_SETTING "SETTING"
//#define w_POWER "POWE"
#define w_POWER "POWER"
#define w_VOLUME "VOLU"
#define w_CLOCKTIME "CLOCKTIME"
//#define w_FILLTIME "FILL"
#define w_FILLTIME "FILLTIME"
//#define w_DRAINTIME "DRAI"
#define w_DRAINTIME "DRAINTIME"
#define w_GRADE "GRADE"
#define w_LEVEL "LEVEL"
@@ -166,7 +160,7 @@ AUTHOR: L. Rossman
#define w_EFFIC "EFFI"
#define w_HEAD "HEAD"
#define w_POWER "POWE"
#define w_POWER "POWER"
#define w_SPEED "SPEE"
#define w_MIXED "MIXED"