From 6fa634cfe1809705f9e05de42250c5f2c30dae67 Mon Sep 17 00:00:00 2001
From: Andreas Gattringer <andreas.gattringer@univie.ac.at>
Date: Wed, 28 Dec 2022 12:16:05 +0100
Subject: [PATCH] summary file changes - changed field order - write log file
entry only after the run name is set
---
src/cats/configuration/load_configuration.c | 7 +++++--
src/cats/grids/cats_grid.c | 2 +-
src/cats/grids/gdal_save.c | 2 +-
src/cats/stats/global_stats.c | 2 +-
4 files changed, 8 insertions(+), 5 deletions(-)
diff --git a/src/cats/configuration/load_configuration.c b/src/cats/configuration/load_configuration.c
index 48ca3d7..995c7d3 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 3960f6e..413161a 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 3166e56..74ac287 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 2bcaa50..5471588 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);
}
--
GitLab