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

14
src/project.c
View File

@@ -409,13 +409,7 @@ void freedata(Project *pr)
list_t *demand = pr->network.Node[j].D;
if(demand)
delete_list(demand);
/*while (demand != NULL)
{
nextdemand = demand->next;
free(demand->Name);
free(demand);
demand = nextdemand;
}*/
// Free memory used for WQ source data
free(pr->network.Node[j].S);
free(pr->network.Node[j].Comment);
@@ -797,8 +791,8 @@ void adjustpattern(int *pat, int index)
}
void _adjustpattern(list_node_t *lnode, int del_idx)
{
void adjust_demand_pattern(list_node_t *lnode, int del_idx)
{
int pat_idx = get_pattern_index(lnode);
if (pat_idx == del_idx) set_pattern_index(lnode, 0);
@@ -825,7 +819,7 @@ void adjustpatterns(Network *network, int index)
list_t *dlist = network->Node[j].D;
if (dlist) {
for (list_node_t *lnode = first_list(dlist); done_list(lnode); lnode = next_list(lnode))
_adjustpattern(lnode, index);
adjust_demand_pattern(lnode, index);
}
// Adjust WQ source patterns
source = network->Node[j].S;