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

Update epanet.c

Browse Source 
Trying to isolate bug
This commit is contained in:
michaeltryby
2019-04-22 11:07:01 -04:00
parent b80b4ed09c
commit 97f70e445d
1 changed files with 14 additions and 18 deletions
Download Patch File Download Diff File Expand all files Collapse all files

32
src/epanet.c
View File

@@ -2851,7 +2851,7 @@ int DLLEXPORT EN_getdemandname(EN_Project p, int nodeIndex, int demandIndex,
{ {
//Pdemand d; //Pdemand d;
//int n = 1; //int n = 1;
char *temp = NULL; char *temp = NULL;
strcpy(demandName, ""); strcpy(demandName, "");
@@ -2860,23 +2860,19 @@ int DLLEXPORT EN_getdemandname(EN_Project p, int nodeIndex, int demandIndex,
if (nodeIndex <= 0 || nodeIndex > p->network.Njuncs) return 203; if (nodeIndex <= 0 || nodeIndex > p->network.Njuncs) return 203;
// Locate demand category record and retrieve its name // Locate demand category record and retrieve its name
list_t *dlist = p->network.Node[nodeIndex].D; list_t *dlist = p->network.Node[nodeIndex].D;
list_node_t *lnode = get_nth_list(dlist, demandIndex); if (dlist) {
if (!lnode) list_node_t *lnode = get_nth_list(dlist, demandIndex);
return 253; if (!lnode)
else return 253;
temp = get_category_name(lnode); else
temp = get_category_name(lnode);
//for (d = p->network.Node[nodeIndex].D;
// n < demandIndex && d->next != NULL; d = d->next) n++;
//if (n != demandIndex) return 253;
if (temp) {
strcpy(demandName, temp);
//else demandName[0] = '\0';
free(temp);
}
if (temp) {
strcpy(demandName, temp);
free(temp);
}
}
return 0; return 0;
} }
@@ -2938,7 +2934,7 @@ int DLLEXPORT EN_getdemandpattern(EN_Project p, int nodeIndex, int demandIndex,
// Check for valid arguments // Check for valid arguments
if (!p->Openflag) return 102; if (!p->Openflag) return 102;
if (nodeIndex <= 0 || nodeIndex > p->network.Nnodes) return 203; if (nodeIndex <= 0 || nodeIndex > p->network.Nnodes) return 203;
// Locate demand category record and assign demandName to it // Locate demand category record and assign demandName to it
list_t *dlist = p->network.Node[nodeIndex].D; list_t *dlist = p->network.Node[nodeIndex].D;
list_node_t *lnode = get_nth_list(dlist, demandIndex); list_node_t *lnode = get_nth_list(dlist, demandIndex);