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: reads and interprets network data from an EPANET input file
Authors: see AUTHORS
Copyright: see AUTHORS
License: see LICENSE
Last Updated: 04/02/2019
Last Updated: 04/03/2019
******************************************************************************
*/
@@ -649,7 +649,7 @@ int getpatterns(Project *pr)
i = tmppattern->i;
// Check if this is the default pattern
if (strcmp(tmppattern->ID, parser->DefPatID) == 0) hyd->DefPat = i;
if (strcmp(tmppattern->ID, parser->DefPatID) == 0) parser->DefPat = i;
// Copy temporary patttern to network's pattern
if (i >= 0 && i <= parser->MaxPats)