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

Reverted handling of default pattern

Browse Source 
When creating demands, no pattern is marked with a zero. Then when data is adjusted it gets updated to default.
This commit is contained in:
Michael Tryby
2019-04-23 11:44:02 -04:00
parent 73bc53ad54
commit 5d3eeb91d9
3 changed files with 17 additions and 60 deletions
Download Patch File Download Diff File Expand all files Collapse all files

25
src/input1.c
View File

@@ -331,20 +331,17 @@ void adjustdata(Project *pr)
tank = &net->Tank[i];
if (tank->Kb == MISSING) tank->Kb = qual->Kbulk;
}
// It is expensive to iterate over every demand at every node.
// cheaper to apply default pattern when creating the demand data.
// // Use default pattern if none assigned to a demand
// parser->DefPat = findpattern(net, parser->DefPatID);
// if (parser->DefPat > 0) for (i = 1; i <= net->Nnodes; i++)
// {
// node = &net->Node[i];
// for (demand = node->D; demand != NULL; demand = demand->next)
// {
// if (demand->Pat == 0) demand->Pat = parser->DefPat;
// }
// }
// Use default pattern if none assigned to a demand
parser->DefPat = findpattern(net, parser->DefPatID);
if (parser->DefPat > 0) {
for (i = 1; i <= net->Nnodes; i++) {
for (list_node_t *lnode = first_list((&net->Node[i])->D); done_list(lnode); lnode = next_list(lnode)) {
if (get_pattern_index(lnode) == 0)
set_pattern_index(lnode, parser->DefPat);
}
}
}
// Remove QUALITY as a reporting variable if no WQ analysis
if (qual->Qualflag == NONE) rpt->Field[QUALITY].Enabled = FALSE;