From ff5163816a5be037fa791b13a0fd6040e627b744 Mon Sep 17 00:00:00 2001
From: Matthieu Schaller <schaller@strw.leidenuniv.nl>
Date: Mon, 6 Aug 2018 16:27:25 +0200
Subject: [PATCH] Do not duplicate lines in the timestep file when restarting.
Also print the redshift and not just the scale-factor.
---
examples/main.c | 4 ++--
src/engine.c | 15 ++++++++-------
2 files changed, 10 insertions(+), 9 deletions(-)
diff --git a/examples/main.c b/examples/main.c
index 234bd72547..ba36bd8703 100644
--- a/examples/main.c
+++ b/examples/main.c
@@ -1093,8 +1093,8 @@ int main(int argc, char *argv[]) {
fflush(stdout);
fprintf(e.file_timesteps,
- " %6d %14e %14e %14e %4d %4d %12lld %12lld %12lld %21.3f %6d\n",
- e.step, e.time, e.cosmology->a, e.time_step, e.min_active_bin,
+ " %6d %14e %14e %10.5f %14e %4d %4d %12lld %12lld %12lld %21.3f %6d\n",
+ e.step, e.time, e.cosmology->a, e.cosmology->z, e.time_step, e.min_active_bin,
e.max_active_bin, e.updates, e.g_updates, e.s_updates,
e.wallclock_time, e.step_props);
fflush(e.file_timesteps);
diff --git a/src/engine.c b/src/engine.c
index 03ed34eea8..52b252e2c1 100644
--- a/src/engine.c
+++ b/src/engine.c
@@ -4714,11 +4714,12 @@ void engine_step(struct engine *e) {
e->s_updates, e->wallclock_time, e->step_props);
fflush(stdout);
- fprintf(e->file_timesteps,
- " %6d %14e %14e %14e %4d %4d %12lld %12lld %12lld %21.3f %6d\n",
- e->step, e->time, e->cosmology->a, e->time_step, e->min_active_bin,
- e->max_active_bin, e->updates, e->g_updates, e->s_updates,
- e->wallclock_time, e->step_props);
+ if(!e->restarting)
+ fprintf(e->file_timesteps,
+ " %6d %14e %14e %10.5f %14e %4d %4d %12lld %12lld %12lld %21.3f %6d\n",
+ e->step, e->time, e->cosmology->a, e->cosmology->z, e->time_step, e->min_active_bin,
+ e->max_active_bin, e->updates, e->g_updates, e->s_updates,
+ e->wallclock_time, e->step_props);
fflush(e->file_timesteps);
}
@@ -6050,8 +6051,8 @@ void engine_config(int restart, struct engine *e, struct swift_params *params,
engine_step_prop_snapshot, engine_step_prop_restarts);
fprintf(e->file_timesteps,
- "# %6s %14s %14s %14s %9s %12s %12s %12s %16s [%s] %6s\n", "Step",
- "Time", "Scale-factor", "Time-step", "Time-bins", "Updates",
+ "# %6s %14s %14s %10s %14s %9s %12s %12s %12s %16s [%s] %6s\n", "Step",
+ "Time", "Scale-factor", "Redshift", "Time-step", "Time-bins", "Updates",
"g-Updates", "s-Updates", "Wall-clock time", clocks_getunit(),
"Props");
fflush(e->file_timesteps);
--
GitLab