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

Merge branch 'contributor-lr' of https://github.com/LRossman/EPANET into contributor-lr

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

9
src/inpfile.c
View File

@@ -618,6 +618,15 @@ 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);
<<<<<<< HEAD
=======
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]);
}
>>>>>>> 5d6d0ca93336194ba194dc8959339d795684890e
// New v.2.2 options - only add if not at default values
if (hyd->HeadErrorLimit > 0.0)