From a0e6f923402e6e95e1b735146de1e09dd5bca4c3 Mon Sep 17 00:00:00 2001
From: loikki <loic.hausammann@protonmail.ch>
Date: Wed, 31 Oct 2018 09:33:28 +0100
Subject: [PATCH] Change e->log to e->logger
---
examples/main.c | 2 +-
src/engine.c | 28 ++++++++++++++--------------
src/engine.h | 4 ++--
src/logger.c | 9 +++++----
src/logger_io.c | 2 +-
src/logger_io.h | 1 -
src/parallel_io.c | 2 +-
src/runner.c | 6 +++---
src/serial_io.c | 2 +-
src/space.c | 1 -
10 files changed, 28 insertions(+), 29 deletions(-)
diff --git a/examples/main.c b/examples/main.c
index 74b48bc9db..d1087b1322 100644
--- a/examples/main.c
+++ b/examples/main.c
@@ -1008,7 +1008,7 @@ int main(int argc, char *argv[]) {
/* Write the state of the system before starting time integration. */
#ifdef WITH_LOGGER
- logger_log_all(e.log, &e);
+ logger_log_all(e.logger, &e);
engine_dump_index(&e);
#endif
engine_dump_snapshot(&e);
diff --git a/src/engine.c b/src/engine.c
index 038e0e8fbb..ca9156d5d8 100644
--- a/src/engine.c
+++ b/src/engine.c
@@ -5213,10 +5213,10 @@ void engine_init_particles(struct engine *e, int flag_entropy_ICs,
#ifdef WITH_LOGGER
/* Mark the first time step in the particle logger file. */
- logger_log_timestamp(e->log, e->ti_current, &e->log->timestamp_offset);
+ logger_log_timestamp(e->logger, e->ti_current, &e->logger->timestamp_offset);
/* Make sure that we have enough space in the particle logger file
* to store the particles in current time step. */
- logger_ensure_size(e->log, e->total_nr_parts, e->total_nr_gparts, 0);
+ logger_ensure_size(e->logger, e->total_nr_parts, e->total_nr_gparts, 0);
#endif
/* Now, launch the calculation */
@@ -5470,10 +5470,10 @@ void engine_step(struct engine *e) {
#ifdef WITH_LOGGER
/* Mark the current time step in the particle logger file. */
- logger_log_timestamp(e->log, e->ti_current, &e->log->timestamp_offset);
+ logger_log_timestamp(e->logger, e->ti_current, &e->logger->timestamp_offset);
/* Make sure that we have enough space in the particle logger file
* to store the particles in current time step. */
- logger_ensure_size(e->log, e->total_nr_parts, e->total_nr_gparts, 0);
+ logger_ensure_size(e->logger, e->total_nr_parts, e->total_nr_gparts, 0);
#endif
/* Are we drifting everything (a la Gadget/GIZMO) ? */
@@ -5627,7 +5627,7 @@ void engine_check_for_dumps(struct engine *e) {
/* Dump everything */
engine_print_stats(e);
#ifdef WITH_LOGGER
- /* Write a file containing the offsets in the particle logger. */
+ /* Write a file containing the offsets in the particle logger. */
engine_dump_index(e);
#else
engine_dump_snapshot(e);
@@ -5662,7 +5662,7 @@ void engine_check_for_dumps(struct engine *e) {
/* Dump snapshot */
#ifdef WITH_LOGGER
- /* Write a file containing the offsets in the particle logger. */
+ /* Write a file containing the offsets in the particle logger. */
engine_dump_index(e);
#else
engine_dump_snapshot(e);
@@ -5685,7 +5685,7 @@ void engine_check_for_dumps(struct engine *e) {
/* Dump snapshot */
#ifdef WITH_LOGGER
- /* Write a file containing the offsets in the particle logger. */
+ /* Write a file containing the offsets in the particle logger. */
engine_dump_index(e);
#else
engine_dump_snapshot(e);
@@ -5725,7 +5725,7 @@ void engine_check_for_dumps(struct engine *e) {
/* Dump... */
#ifdef WITH_LOGGER
- /* Write a file containing the offsets in the particle logger. */
+ /* Write a file containing the offsets in the particle logger. */
engine_dump_index(e);
#else
engine_dump_snapshot(e);
@@ -6525,7 +6525,7 @@ void engine_dump_index(struct engine *e) {
}
/* Dump... */
- write_index_single(e, e->log->base_name, e->internal_units,
+ write_index_single(e, e->logger->base_name, e->internal_units,
e->snapshot_units);
/* Flag that we dumped a snapshot */
@@ -6706,8 +6706,8 @@ void engine_init(struct engine *e, struct space *s, struct swift_params *params,
#endif
#if defined(WITH_LOGGER)
- e->log = (struct logger *)malloc(sizeof(struct logger));
- logger_init(e->log, params);
+ e->logger = (struct logger *)malloc(sizeof(struct logger));
+ logger_init(e->logger, params);
#endif
/* Make the space link back to the engine. */
@@ -7319,7 +7319,7 @@ void engine_config(int restart, struct engine *e, struct swift_params *params,
#ifdef WITH_LOGGER
/* Write the particle logger header */
- logger_write_file_header(e->log, e);
+ logger_write_file_header(e->logger, e);
#endif
/* Free the affinity stuff */
@@ -7742,8 +7742,8 @@ void engine_clean(struct engine *e) {
free(e->links);
free(e->cell_loc);
#if defined(WITH_LOGGER)
- logger_clean(e->log);
- free(e->log);
+ logger_clean(e->logger);
+ free(e->logger);
#endif
scheduler_clean(&e->sched);
space_clean(e->s);
diff --git a/src/engine.h b/src/engine.h
index fac7c0f608..5cd9bfb304 100644
--- a/src/engine.h
+++ b/src/engine.h
@@ -78,7 +78,7 @@ enum engine_policy {
engine_policy_feedback = (1 << 18)
};
#define engine_maxpolicy 18
-extern const char *engine_policy_names[engine_maxpolicy+2];
+extern const char *engine_policy_names[engine_maxpolicy + 2];
/**
* @brief The different unusual events that can take place in a time-step.
@@ -315,7 +315,7 @@ struct engine {
struct repartition *reparttype;
#ifdef WITH_LOGGER
- struct logger *log;
+ struct logger *logger;
#endif
/* How many steps have we done with the same set of tasks? */
diff --git a/src/logger.c b/src/logger.c
index 2e10c0b18f..06d9cd466a 100644
--- a/src/logger.c
+++ b/src/logger.c
@@ -418,7 +418,8 @@ void logger_ensure_size(struct logger *log, size_t total_nr_parts,
void logger_init(struct logger *log, struct swift_params *params) {
/* read parameters */
log->delta_step = parser_get_param_int(params, "Logger:delta_step");
- size_t buffer_size = parser_get_param_float(params, "Logger:initial_buffer_size") * 1e9;
+ size_t buffer_size =
+ parser_get_param_float(params, "Logger:initial_buffer_size") * 1e9;
log->buffer_scale =
parser_get_opt_param_float(params, "Logger:buffer_scale", 10);
parser_get_param_string(params, "Logger:basename", log->base_name);
@@ -441,7 +442,6 @@ void logger_init(struct logger *log, struct swift_params *params) {
struct dump *dump_file = log->dump;
dump_init(dump_file, logger_name_file, buffer_size);
-
}
/**
@@ -608,7 +608,8 @@ void logger_parameters_init(struct logger_parameters *log_params) {
cur_name += log_params->label_size;
/* set the data size */
- log_params->masks_data_size = malloc(sizeof(size_t) * log_params->number_mask);
+ log_params->masks_data_size =
+ malloc(sizeof(size_t) * log_params->number_mask);
log_params->masks_data_size[0] = 3 * sizeof(double);
log_params->masks_data_size[1] = 3 * sizeof(float);
log_params->masks_data_size[2] = 3 * sizeof(float);
@@ -620,7 +621,7 @@ void logger_parameters_init(struct logger_parameters *log_params) {
/* Compute the size of a chunk if all the mask are activated */
log_params->total_size = logger_offset_size + logger_mask_size;
-
+
for (size_t i = 0; i < log_params->number_mask; i++) {
if (log_params->masks[i] != logger_mask_timestamp)
log_params->total_size += log_params->masks_data_size[i];
diff --git a/src/logger_io.c b/src/logger_io.c
index f80baaee4d..a0a5ba1db8 100644
--- a/src/logger_io.c
+++ b/src/logger_io.c
@@ -87,7 +87,7 @@ void write_index_single(struct engine* e, const char* baseName,
// struct spart* sparts = e->s->sparts;
static int outputCount = 0;
- struct logger* log = e->log;
+ struct logger* log = e->logger;
/* Number of unassociated gparts */
const size_t Ndm = Ntot > 0 ? Ntot - (Ngas + Nstars) : 0;
diff --git a/src/logger_io.h b/src/logger_io.h
index d8ac10a9ff..f5b1274fb7 100644
--- a/src/logger_io.h
+++ b/src/logger_io.h
@@ -34,7 +34,6 @@ void write_index_single(struct engine* e, const char* baseName,
const struct unit_system* internal_units,
const struct unit_system* snapshot_units);
-
/**
* @brief Specifies which particle fields to write to a dataset
*
diff --git a/src/parallel_io.c b/src/parallel_io.c
index 84dd4e8461..510b637c67 100644
--- a/src/parallel_io.c
+++ b/src/parallel_io.c
@@ -433,7 +433,7 @@ void prepareArray(struct engine* e, hid_t grp, char* fileName, FILE* xmfFile,
/* Add a line to the XMF */
if (xmfFile != NULL)
xmf_write_line(xmfFile, fileName, partTypeGroupName, props.name, N_total,
- props.dimension, props.type);
+ props.dimension, props.type);
/* Close everything */
H5Pclose(h_plist_id);
diff --git a/src/runner.c b/src/runner.c
index 89634a75cc..cf5492dad4 100644
--- a/src/runner.c
+++ b/src/runner.c
@@ -2731,10 +2731,10 @@ void runner_do_logger(struct runner *r, struct cell *c, int timer) {
* debugging checks */
if (part_is_starting(p, e)) {
- if (logger_should_write(&xp->logger_data, e->log)) {
+ if (logger_should_write(&xp->logger_data, e->logger)) {
/* Write particle */
- /* Currently writing everything, should adapt it through time */
- logger_log_part(e->log, p,
+ /* Currently writing everything, should adapt it through time */
+ logger_log_part(e->logger, p,
logger_mask_x | logger_mask_v | logger_mask_a |
logger_mask_u | logger_mask_h | logger_mask_rho |
logger_mask_consts,
diff --git a/src/serial_io.c b/src/serial_io.c
index bd33925bf5..5e976335e2 100644
--- a/src/serial_io.c
+++ b/src/serial_io.c
@@ -302,7 +302,7 @@ void prepareArray(const struct engine* e, hid_t grp, char* fileName,
/* Write XMF description for this data set */
if (xmfFile != NULL)
xmf_write_line(xmfFile, fileName, partTypeGroupName, props.name, N_total,
- props.dimension, props.type);
+ props.dimension, props.type);
/* Write unit conversion factors for this data set */
char buffer[FIELD_BUFFER_SIZE];
diff --git a/src/space.c b/src/space.c
index ddf3c5c959..716040c6e9 100644
--- a/src/space.c
+++ b/src/space.c
@@ -2700,7 +2700,6 @@ void space_first_init_parts_mapper(void *restrict map_data, int count,
logger_part_data_init(&xp[k].logger_data);
#endif
-
/* Overwrite the internal energy? */
if (u_init > 0.f) hydro_set_init_internal_energy(&p[k], u_init);
--
GitLab