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

ChangingRuleBased_v2

Browse Source 
The code has the following modifications:
- RULE section is written just after controls
- SYST is now written SYSTEM (also PRESSURE, DEMAND, POWER, SETTING,
FILLTIME and DRAINTIME have been changed)
- some description to the function writeRuleinInp has been added
- Actions are now written in the correct order
This commit is contained in:
AngelaMarchi
2016-11-08 18:37:54 +10:30
parent 4e349cd3c1
commit 83dd6c7b7c
4 changed files with 79 additions and 28 deletions
Download Patch File Download Diff File Expand all files Collapse all files

21
src/text.h
View File

@@ -27,7 +27,8 @@ AUTHOR: L. Rossman
#define w_AGE "AGE"
#define w_TRACE "TRACE"
#define w_SYSTEM "SYST"
//#define w_SYSTEM "SYST"
#define w_SYSTEM "SYSTEM"
#define w_JUNC "Junc"
#define w_RESERV "Reser"
#define w_TANK "Tank"
@@ -94,9 +95,11 @@ AUTHOR: L. Rossman
#define w_METERS "METERS"
#define w_ELEV "ELEV"
#define w_DEMAND "DEMA"
//#define w_DEMAND "DEMA"
#define w_DEMAND "DEMAND"
#define w_HEAD "HEAD"
#define w_PRESSURE "PRES"
//#define w_PRESSURE "PRES"
#define w_PRESSURE "PRESSURE"
#define w_QUALITY "QUAL"
#define w_DIAM "DIAM"
@@ -104,12 +107,16 @@ AUTHOR: L. Rossman
#define w_ROUGHNESS "ROUG"
#define w_VELOCITY "VELO"
#define w_HEADLOSS "HEADL"
#define w_SETTING "SETT"
#define w_POWER "POWE"
//#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_DRAINTIME "DRAI"
//#define w_FILLTIME "FILL"
#define w_FILLTIME "FILLTIME"
//#define w_DRAINTIME "DRAI"
#define w_DRAINTIME "DRAINTIME"
#define w_GRADE "GRADE"
#define w_LEVEL "LEVEL"