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

Work in progress

Browse Source 
Working on demand lists
This commit is contained in:
Michael Tryby
2019-04-19 18:01:06 -04:00
parent 55a28de9e0
commit 7537be1ec9
7 changed files with 254 additions and 78 deletions
Download Patch File Download Diff File Expand all files Collapse all files

15
src/input3.c
View File

@@ -124,22 +124,11 @@ int juncdata(Project *pr)
// create demand data only if a demand has been specified
if (y != 0.0) {
demand_data_t *demand_data;
demand_list = create_list(get_demand_data_size(), delete_demand_data);
if (demand_list == NULL) return 101;
// apply the default demand pattern and append the data
if (p == 0) p = findpattern(net, parser->DefPatID);
demand_data = create_demand_data(y, p, NULL);
if (demand_data == NULL) return 101;
append_list(demand_list, &demand_data);
demand_list = create_demand_list(y, p, NULL);
if (!demand_list) return 101;
}
//demand->Base = y;
//demand->Pat = p;
//demand->Name = NULL;
//demand->next = NULL;
node->D = demand_list;
hyd->NodeDemand[njuncs] = y;