diff --git a/src/cats/configuration/load_configuration.c b/src/cats/configuration/load_configuration.c index 48ca3d742cd25b18dc0a84dccbc27248144eca2d..995c7d34048138ec7eb62ccb9b400dd8b8f4b5f9 100644 --- a/src/cats/configuration/load_configuration.c +++ b/src/cats/configuration/load_configuration.c @@ -73,8 +73,7 @@ load_configuration_from_file(const char *filename, const struct program_options if (conf->summary_file_name) { conf->summary_file = fopen(conf->summary_file_name, "w"); ENSURE_FILE_OPENED(conf->summary_file, conf->summary_file_name) - fprintf(conf->summary_file, "run.name,replicate,file.type,file.name,year\n"); - if (conf->log_file_name) fprintf(conf->summary_file, "%s,%d,log,%s,NA\n", conf->run_name, conf->simulation.replicate, conf->log_file_name); + fprintf(conf->summary_file, "run.name,replicate,year,file.type,file.name\n"); fflush(conf->summary_file); } #ifdef USEMPI @@ -136,6 +135,10 @@ load_configuration_from_file(const char *filename, const struct program_options // clean up and return free(count.dispersals); + if (conf->log_file_name && conf->summary_file) { + fprintf(conf->summary_file, "%s,%d,NA,log,%s\n", conf->run_name, conf->simulation.replicate, conf->log_file_name); + fflush(conf->summary_file); + } return conf; } diff --git a/src/cats/grids/cats_grid.c b/src/cats/grids/cats_grid.c index 3960f6efd79bed779c5f733acd1ce213a5cf4d0d..413161ac37dff339df7d018c042c39bc4f15cc2e 100644 --- a/src/cats/grids/cats_grid.c +++ b/src/cats/grids/cats_grid.c @@ -344,7 +344,7 @@ void initialize_grid_stats(struct cats_grid *grid, struct cats_configuration *co grid->stats.file = fopen(filename, "a+"); ENSURE_FILE_OPENED(grid->stats.file, filename) if (conf->summary_file) { - fprintf(conf->summary_file, "%s,%d,grid-stats,%s,NA\n", conf->run_name, conf->simulation.replicate, filename); + fprintf(conf->summary_file, "%s,%d,NA,grid-stats,%s\n", conf->run_name, conf->simulation.replicate, filename); fflush(conf->summary_file); } free(filename); diff --git a/src/cats/grids/gdal_save.c b/src/cats/grids/gdal_save.c index 3166e56d1b857e953cc5cb343b62a8a214ecf735..74ac287e851a17fad69011723ffe61d2802bea15 100644 --- a/src/cats/grids/gdal_save.c +++ b/src/cats/grids/gdal_save.c @@ -71,7 +71,7 @@ void *save_population_to_gdal(struct cats_grid *grid, struct cats_configuration fflush(stderr); } if (conf->summary_file){ - fprintf(conf->summary_file, "%s,%d,population,%s,%d\n",conf->run_name, conf->simulation.replicate, filename, conf->time.year_current); + fprintf(conf->summary_file, "%s,%d,%d,population,%s\n",conf->run_name, conf->simulation.replicate, conf->time.year_current, filename); fflush(conf->summary_file); } diff --git a/src/cats/stats/global_stats.c b/src/cats/stats/global_stats.c index 2bcaa50fd23476e7d7946ef0b4c2d860e88d5bcd..5471588345aeb82ef11c528db2143afdd2699c20 100644 --- a/src/cats/stats/global_stats.c +++ b/src/cats/stats/global_stats.c @@ -50,7 +50,7 @@ void initialize_global_stats(struct cats_configuration *conf) conf->statsfile_global = fopen(filename, "a+"); ENSURE_FILE_OPENED(conf->statsfile_global, filename) if (conf->summary_file) { - fprintf(conf->summary_file, "%s,%d,global-stats,%s,NA\n",conf->run_name, conf->simulation.replicate,filename); + fprintf(conf->summary_file, "%s,%d,NA,global-stats,%s\n",conf->run_name, conf->simulation.replicate,filename); fflush(conf->summary_file); }