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

GCC Bug

Browse Source
This commit is contained in:
Michael Tryby
2019-04-19 22:56:08 -04:00
parent 6a084cc764
commit f05746cea2
2 changed files with 11 additions and 13 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
src/demand.c
View File

@@ -24,7 +24,7 @@
#include "demand.h" #include "demand.h"
typedef struct demand_data_s typedef struct demand_data_s
{ {
double base_demand; double base_demand;
int pattern_index; int pattern_index;
@@ -60,7 +60,7 @@ demand_data_t *create_demand_data(double base_demand, int pattern_index, const c
if (category_name) if (category_name)
demand_data->category_name = strdup(category_name); demand_data->category_name = strdup(category_name);
else else
demand_data->category_name = NULL; demand_data->category_name = '\0';
return demand_data; return demand_data;
} }

20
src/inpfile.c
View File

@@ -142,20 +142,18 @@ 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)) {
if (lnode) { sprintf(s, " %-31s %14.6f", node->ID, ucf * 100.0); // get_base_demand(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);
}
} }
} }
} }