Removed the EN_DEFDEMANDPAT option

See issue #429. Also allowed the EN_HEADLOSSFORM option to be changed if the solver is not active.
This commit is contained in:
Lew Rossman
2019-04-03 10:25:37 -04:00
parent 23b11ab672
commit 83ffc1cfc7
9 changed files with 40 additions and 94 deletions

View File

@@ -7,7 +7,7 @@ Description: saves network data to an EPANET formatted text file
Authors: see AUTHORS
Copyright: see AUTHORS
License: see LICENSE
Last Updated: 04/02/2019
Last Updated: 04/03/2019
******************************************************************************
*/
@@ -633,10 +633,6 @@ int saveinpfile(Project *pr, const char *fname)
fprintf(f, "\n UNITS %s", FlowUnitsTxt[parser->Flowflag]);
fprintf(f, "\n PRESSURE %s", PressUnitsTxt[parser->Pressflag]);
fprintf(f, "\n HEADLOSS %s", FormTxt[hyd->Formflag]);
if (hyd->DefPat >= 1 && hyd->DefPat <= net->Npats)
{
fprintf(f, "\n PATTERN %s", net->Pattern[hyd->DefPat].ID);
}
switch (out->Hydflag)
{
case USE: