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

Cleaning up build on gcc

Browse Source
This commit is contained in:
Michael Tryby
2019-04-19 21:34:25 -04:00
parent e9650d2d6d
commit 405822cdf6
2 changed files with 12 additions and 8 deletions
Download Patch File Download Diff File Expand all files Collapse all files

14
src/inpfile.c
View File

@@ -332,8 +332,8 @@ int saveinpfile(Project *pr, const char *fname)
fprintf(f, s_DEMANDS);
ucf = pr->Ucf[DEMAND];
list_t *dlist;
list_node_t *lnode;
list_t *dlist = NULL;
list_node_t *lnode = NULL;
char *temp = NULL;
for (i = 1; i <= net->Njuncs; i++)
@@ -341,11 +341,15 @@ int saveinpfile(Project *pr, const char *fname)
node = &net->Node[i];
if (dlist = node->D) {
for (lnode = first_list(dlist); done_list(lnode); lnode = next_list(lnode)) {
sprintf(s, " %-31s %14.6f", node->ID, ucf * get_base_demand(lnode));
if ((j = get_pattern_index(lnode)) > 0) sprintf(s1, " %-31s", net->Pattern[j].ID);
else strcpy(s1, " ");
if
((j = get_pattern_index(lnode)) > 0) sprintf(s1, " %-31s", net->Pattern[j].ID);
else
strcpy(s1, " ");
fprintf(f, "\n%s %-31s", s, s1);
if (temp = get_category_name(lnode)) {
fprintf(f, " ;%s", temp);
free(temp);