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

Update inpfile.c

Browse Source 
Trying to isolate bug
This commit is contained in:
Michael Tryby
2019-04-19 22:35:15 -04:00
parent 8761543395
commit 6a084cc764
1 changed files with 14 additions and 11 deletions
Download Patch File Download Diff File Expand all files Collapse all files

25
src/inpfile.c
View File

@@ -121,8 +121,8 @@ void saveauxdata(Project *pr, FILE *f)
InFile = NULL; InFile = NULL;
} }
void write_demands(Project *pr, FILE *f) {
void write_demands(Project *pr, FILE *f) {
int i, j; int i, j;
Snode *node = NULL; Snode *node = NULL;
@@ -142,24 +142,27 @@ void write_demands(Project *pr, FILE *f) {
node = &net->Node[i]; node = &net->Node[i];
if (node->D) { if (node->D) {
for (lnode = first_list(node->D); done_list(lnode); lnode = next_list(lnode)) { for (lnode = first_list(node->D); done_list(lnode); lnode = next_list(lnode)) {
sprintf(s, " %-31s %14.6f", node->ID, ucf * get_base_demand(lnode)); if (lnode) {
sprintf(s, " %-31s %14.6f", node->ID, ucf * get_base_demand(lnode));
if if
((j = get_pattern_index(lnode)) > 0) sprintf(s1, " %-31s", net->Pattern[j].ID); ((j = get_pattern_index(lnode)) > 0) sprintf(s1, " %-31s", net->Pattern[j].ID);
else else
strcpy(s1, " "); strcpy(s1, " ");
fprintf(f, "\n%s %-31s", s, s1); fprintf(f, "\n%s %-31s", s, s1);
if (temp = get_category_name(lnode)) { if (temp = get_category_name(lnode)) {
fprintf(f, " ;%s", temp); fprintf(f, " ;%s", temp);
free(temp); free(temp);
}
} }
} }
} }
} }
} }
int saveinpfile(Project *pr, const char *fname) int saveinpfile(Project *pr, const char *fname)
/* /*
------------------------------------------------- -------------------------------------------------