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

Fixed max. flow change node ID in Status Report

Browse Source
This commit is contained in:
Lew Rossman
2018-08-13 10:04:24 -04:00
parent b5e3986e6b
commit a73d9235e7
3 changed files with 18 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files

8
src/hydsolver.c
View File

@@ -650,15 +650,21 @@ void reporthydbal(EN_Project *pr, Hydbalance *hbal)
double qchange = hbal->maxflowchange * pr->Ucf[FLOW];
double herror = hbal->maxheaderror * pr->Ucf[HEAD];
int qlink = hbal->maxflowlink;
int qnode = hbal->maxflownode;
int hlink = hbal->maxheadlink;
if (qlink >= 1)
{
sprintf(pr->Msg, FMT66, qchange, pr->network.Link[qlink].ID);
writeline(pr, pr->Msg);
}
else if (qnode >= 1)
{
sprintf(pr->Msg, FMT67, qchange, pr->network.Node[qnode].ID);
writeline(pr, pr->Msg);
}
if (hlink >= 1)
{
sprintf(pr->Msg, FMT67, herror, pr->network.Link[hlink].ID);
sprintf(pr->Msg, FMT68, herror, pr->network.Link[hlink].ID);
writeline(pr, pr->Msg);
}
}

11
src/inpfile.c
View File

@@ -618,9 +618,16 @@ int saveinpfile(EN_Project *pr, char *fname)
fprintf(f, "\n CHECKFREQ %-d", hyd->CheckFreq);
fprintf(f, "\n MAXCHECK %-d", hyd->MaxCheck);
fprintf(f, "\n DAMPLIMIT %-.8f", hyd->DampLimit);
fprintf(f, "\n HEADERROR %-.8f", hyd->HeadErrorLimit * pr->Ucf[HEAD]);
fprintf(f, "\n FLOWCHANGE %-.8f", hyd->FlowChangeLimit * pr->Ucf[FLOW]);
// New v.2.2 options - only add if not at default values
if (hyd->HeadErrorLimit > 0.0)
{
fprintf(f, "\n HEADERROR %-.8f", hyd->HeadErrorLimit * pr->Ucf[HEAD]);
}
if (hyd->FlowChangeLimit > 0.0)
{
fprintf(f, "\n FLOWCHANGE %-.8f", hyd->FlowChangeLimit * pr->Ucf[FLOW]);
}
if (hyd->DemandModel == PDA)
{
fprintf(f, "\n DEMAND MODEL PDA");

3
src/text.h
View File

@@ -430,7 +430,8 @@ AUTHOR: L. Rossman
/*** End of update ***/
#define FMT66 " maximum flow change = %.4f for Link %s"
#define FMT67 " maximum head error = %.4f for Link %s\n"
#define FMT67 " maximum flow change = %.4f for Node %s"
#define FMT68 " maximum head error = %.4f for Link %s\n"
/* -------------------- Energy Report Table ------------------- */
#define FMT71 "Energy Usage:"