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

Resolved conflict in inpfile.c

Browse Source
This commit is contained in:
Lew Rossman
2018-08-13 10:11:34 -04:00
parent 3bd2d4a800
commit b3e26b9ac8
1 changed files with 0 additions and 13 deletions
Download Patch File Download Diff File Expand all files Collapse all files

13
src/inpfile.c
View File

@@ -618,25 +618,12 @@ int saveinpfile(EN_Project *pr, char *fname)
fprintf(f, "\n CHECKFREQ %-d", hyd->CheckFreq); fprintf(f, "\n CHECKFREQ %-d", hyd->CheckFreq);
fprintf(f, "\n MAXCHECK %-d", hyd->MaxCheck); fprintf(f, "\n MAXCHECK %-d", hyd->MaxCheck);
fprintf(f, "\n DAMPLIMIT %-.8f", hyd->DampLimit); fprintf(f, "\n DAMPLIMIT %-.8f", hyd->DampLimit);
<<<<<<< HEAD
=======
if (hyd->HeadErrorLimit > 0.0) { if (hyd->HeadErrorLimit > 0.0) {
fprintf(f, "\n HEADERROR %-.8f", hyd->HeadErrorLimit * pr->Ucf[HEAD]); fprintf(f, "\n HEADERROR %-.8f", hyd->HeadErrorLimit * pr->Ucf[HEAD]);
} }
if (hyd->FlowChangeLimit > 0.0) { if (hyd->FlowChangeLimit > 0.0) {
fprintf(f, "\n FLOWCHANGE %-.8f", hyd->FlowChangeLimit * pr->Ucf[FLOW]); fprintf(f, "\n FLOWCHANGE %-.8f", hyd->FlowChangeLimit * pr->Ucf[FLOW]);
} }
>>>>>>> 5d6d0ca93336194ba194dc8959339d795684890e
// 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) if (hyd->DemandModel == PDA)
{ {
fprintf(f, "\n DEMAND MODEL PDA"); fprintf(f, "\n DEMAND MODEL PDA");