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

16
src/inpfile.c
View File

@@ -421,7 +421,8 @@ int saveinpfile(char *fname)
} }
} }
/*moved after control section */ /* Write [RULES] section */
fprintf(f, "\n\n[RULES]"); fprintf(f, "\n\n[RULES]");
for (i=1; i<=Nrules; i++) for (i=1; i<=Nrules; i++)
{ {
@@ -429,8 +430,6 @@ int saveinpfile(char *fname)
errcode = writeRuleinInp(f, i); errcode = writeRuleinInp(f, i);
fprintf(f, "\n"); fprintf(f, "\n");
} }
//fprintf(f, "\n\n");
/* end move after control section */
/* Write [QUALITY] section */ /* Write [QUALITY] section */
/* (Skip nodes with default quality of 0) */ /* (Skip nodes with default quality of 0) */
@@ -635,17 +634,6 @@ int saveinpfile(char *fname)
} }
fprintf(f, "\n\n"); fprintf(f, "\n\n");
/*moved after control section
fprintf(f, "\n\n[RULES]");
for (i=1; i<=Nrules; i++)
{
fprintf(f, "\nRULE %s",Rule[i].label);
errcode = writeRuleinInp(f, i);
fprintf(f, "\n");
}
fprintf(f, "\n\n");
end move after control section */
/* Write [COORDINATES] section */ /* Write [COORDINATES] section */
if (Coordflag == TRUE) if (Coordflag == TRUE)

12
src/rules.c
View File

@@ -527,8 +527,6 @@ int newaction()
if (Tlast == NULL) Rule[Nrules].Tchain = a; if (Tlast == NULL) Rule[Nrules].Tchain = a;
else Tlast->next = a; else Tlast->next = a;
Tlast = a; Tlast = a;
//a->next = Rule[Nrules].Tchain;
//Rule[Nrules].Tchain = a;
} }
else else
{ {
@@ -536,8 +534,6 @@ int newaction()
if (Flast == NULL) Rule[Nrules].Fchain = a; if (Flast == NULL) Rule[Nrules].Fchain = a;
else Flast->next = a; else Flast->next = a;
Flast = a; Flast = a;
//a->next = Rule[Nrules].Fchain;
//Rule[Nrules].Fchain = a;
} }
return(0); return(0);
} }
@@ -963,8 +959,6 @@ int writeRuleinInp(FILE *f, int RuleIdx){
fprintf(f, "\nIF "); fprintf(f, "\nIF ");
if ((strncmp(Object[p->object], "NODE", 4)==0) || (strncmp(Object[p->object], "Junc", 4)==0) || (strncmp(Object[p->object], "Reser", 5)==0) || (strncmp(Object[p->object], "Tank", 4)==0) ) if ((strncmp(Object[p->object], "NODE", 4)==0) || (strncmp(Object[p->object], "Junc", 4)==0) || (strncmp(Object[p->object], "Reser", 5)==0) || (strncmp(Object[p->object], "Tank", 4)==0) )
{ {
//if (p->index <= Njuncs) fprintf(f,"JUNC %s %s %s %s", Node[p->index].ID, Varword[p->variable], Operator[p->relop], Value[p->status]);
//else if (Tank[p->index-Njuncs].A == 0.0) fprintf(f,"RESERV %s %s %s %s", Node[p->index].ID, Varword[p->variable], Operator[p->relop], Value[p->status]);
if (p->index <= Njuncs) fprintf(f,"JUNCTION %s %s %s %s", Node[p->index].ID, Varword[p->variable], Operator[p->relop], Value[p->status]); if (p->index <= Njuncs) fprintf(f,"JUNCTION %s %s %s %s", Node[p->index].ID, Varword[p->variable], Operator[p->relop], Value[p->status]);
else if (Tank[p->index-Njuncs].A == 0.0) fprintf(f,"RESERVOIR %s %s %s %s", Node[p->index].ID, Varword[p->variable], Operator[p->relop], Value[p->status]); else if (Tank[p->index-Njuncs].A == 0.0) fprintf(f,"RESERVOIR %s %s %s %s", Node[p->index].ID, Varword[p->variable], Operator[p->relop], Value[p->status]);
else fprintf(f,"TANK %s %s %s %s", Node[p->index].ID, Varword[p->variable], Operator[p->relop], Value[p->status]); else fprintf(f,"TANK %s %s %s %s", Node[p->index].ID, Varword[p->variable], Operator[p->relop], Value[p->status]);
@@ -1004,8 +998,6 @@ int writeRuleinInp(FILE *f, int RuleIdx){
fprintf(f, "\nIF "); fprintf(f, "\nIF ");
if ((strncmp(Object[p->object], "NODE", 4)==0) || (strncmp(Object[p->object], "Junc", 4)==0) || (strncmp(Object[p->object], "Reser", 5)==0) || (strncmp(Object[p->object], "Tank", 4)==0)) if ((strncmp(Object[p->object], "NODE", 4)==0) || (strncmp(Object[p->object], "Junc", 4)==0) || (strncmp(Object[p->object], "Reser", 5)==0) || (strncmp(Object[p->object], "Tank", 4)==0))
{ {
//if (p->index <= Njuncs) fprintf(f,"JUNC %s %s %s %.4lf", Node[p->index].ID, Varword[p->variable], Operator[p->relop], p->value);
//else if (Tank[p->index-Njuncs].A == 0.0) fprintf(f,"RESERV %s %s %s %.4lf", Node[p->index].ID, Varword[p->variable], Operator[p->relop], p->value);
if (p->index <= Njuncs) fprintf(f,"JUNCTION %s %s %s %.4lf", Node[p->index].ID, Varword[p->variable], Operator[p->relop], p->value); if (p->index <= Njuncs) fprintf(f,"JUNCTION %s %s %s %.4lf", Node[p->index].ID, Varword[p->variable], Operator[p->relop], p->value);
else if (Tank[p->index-Njuncs].A == 0.0) fprintf(f,"RESERVOIR %s %s %s %.4lf", Node[p->index].ID, Varword[p->variable], Operator[p->relop], p->value); else if (Tank[p->index-Njuncs].A == 0.0) fprintf(f,"RESERVOIR %s %s %s %.4lf", Node[p->index].ID, Varword[p->variable], Operator[p->relop], p->value);
else fprintf(f,"TANK %s %s %s %.4lf", Node[p->index].ID, Varword[p->variable], Operator[p->relop], p->value); else fprintf(f,"TANK %s %s %s %.4lf", Node[p->index].ID, Varword[p->variable], Operator[p->relop], p->value);
@@ -1029,8 +1021,6 @@ int writeRuleinInp(FILE *f, int RuleIdx){
fprintf(f, "\n%s ", Ruleword[p->logop]); fprintf(f, "\n%s ", Ruleword[p->logop]);
if ((strncmp(Object[p->object], "NODE", 4)==0) || (strncmp(Object[p->object], "Junc", 4)==0) || (strncmp(Object[p->object], "Reser", 5)==0) || (strncmp(Object[p->object], "Tank", 4)==0)) if ((strncmp(Object[p->object], "NODE", 4)==0) || (strncmp(Object[p->object], "Junc", 4)==0) || (strncmp(Object[p->object], "Reser", 5)==0) || (strncmp(Object[p->object], "Tank", 4)==0))
{ {
//if (p->index <= Njuncs) fprintf(f,"JUNC %s %s %s %s", Node[p->index].ID, Varword[p->variable], Operator[p->relop], Value[p->status]);
//else if (Tank[p->index-Njuncs].A == 0.0) fprintf(f,"RESERV %s %s %s %s", Node[p->index].ID, Varword[p->variable], Operator[p->relop], Value[p->status]);
if (p->index <= Njuncs) fprintf(f,"JUNCTION %s %s %s %s", Node[p->index].ID, Varword[p->variable], Operator[p->relop], Value[p->status]); if (p->index <= Njuncs) fprintf(f,"JUNCTION %s %s %s %s", Node[p->index].ID, Varword[p->variable], Operator[p->relop], Value[p->status]);
else if (Tank[p->index-Njuncs].A == 0.0) fprintf(f,"RESERVOIR %s %s %s %s", Node[p->index].ID, Varword[p->variable], Operator[p->relop], Value[p->status]); else if (Tank[p->index-Njuncs].A == 0.0) fprintf(f,"RESERVOIR %s %s %s %s", Node[p->index].ID, Varword[p->variable], Operator[p->relop], Value[p->status]);
else fprintf(f,"TANK %s %s %s %s", Node[p->index].ID, Varword[p->variable], Operator[p->relop], Value[p->status]); else fprintf(f,"TANK %s %s %s %s", Node[p->index].ID, Varword[p->variable], Operator[p->relop], Value[p->status]);
@@ -1069,8 +1059,6 @@ int writeRuleinInp(FILE *f, int RuleIdx){
{ {
fprintf(f, "\n%s ", Ruleword[p->logop]); fprintf(f, "\n%s ", Ruleword[p->logop]);
if ((strncmp(Object[p->object], "NODE", 4)==0) || (strncmp(Object[p->object], "Junc", 4)==0) || (strncmp(Object[p->object], "Reser", 5)==0) || (strncmp(Object[p->object], "Tank", 4)==0)) { if ((strncmp(Object[p->object], "NODE", 4)==0) || (strncmp(Object[p->object], "Junc", 4)==0) || (strncmp(Object[p->object], "Reser", 5)==0) || (strncmp(Object[p->object], "Tank", 4)==0)) {
//if (p->index <= Njuncs) fprintf(f,"JUNC %s %s %s %.4lf", Node[p->index].ID, Varword[p->variable], Operator[p->relop], p->value);
//else if (Tank[p->index-Njuncs].A == 0.0) fprintf(f,"RESERV %s %s %s %.4lf", Node[p->index].ID, Varword[p->variable], Operator[p->relop], p->value);
if (p->index <= Njuncs) fprintf(f,"JUNCTION %s %s %s %.4lf", Node[p->index].ID, Varword[p->variable], Operator[p->relop], p->value); if (p->index <= Njuncs) fprintf(f,"JUNCTION %s %s %s %.4lf", Node[p->index].ID, Varword[p->variable], Operator[p->relop], p->value);
else if (Tank[p->index-Njuncs].A == 0.0) fprintf(f,"RESERVOIR %s %s %s %.4lf", Node[p->index].ID, Varword[p->variable], Operator[p->relop], p->value); else if (Tank[p->index-Njuncs].A == 0.0) fprintf(f,"RESERVOIR %s %s %s %.4lf", Node[p->index].ID, Varword[p->variable], Operator[p->relop], p->value);
else fprintf(f,"TANK %s %s %s %.4lf", Node[p->index].ID, Varword[p->variable], Operator[p->relop], p->value); else fprintf(f,"TANK %s %s %s %.4lf", Node[p->index].ID, Varword[p->variable], Operator[p->relop], p->value);

8
src/text.h
View File

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

4
src/types.h
View File

@@ -506,7 +506,7 @@ struct ActItem *ActList; /* Linked list of action items */
int RuleState; /* State of rule interpreter */ int RuleState; /* State of rule interpreter */
long Time1; /* Start of rule evaluation time interval (sec) */ long Time1; /* Start of rule evaluation time interval (sec) */
struct Premise *Plast; /* Previous premise clause */ struct Premise *Plast; /* Previous premise clause */
struct Action *Tlast; /*Previous true action */ struct Action *Tlast; /* Previous true action */
struct Action *Flast; /*Previous false action */ struct Action *Flast; /* Previous false action */
#endif #endif