From c6b41bb33566359ae16bc18c7a940f497adf4327 Mon Sep 17 00:00:00 2001
From: Matthieu Schaller <schaller@strw.leidenuniv.nl>
Date: Sun, 23 Sep 2018 23:42:24 +0100
Subject: [PATCH] Print more digits for the redshift and scale-factor to
stdout.
---
examples/main.c | 17 +++++++++--------
src/engine.c | 18 ++++++++++--------
2 files changed, 19 insertions(+), 16 deletions(-)
diff --git a/examples/main.c b/examples/main.c
index 91fba71f69..0af9cc2160 100644
--- a/examples/main.c
+++ b/examples/main.c
@@ -974,7 +974,7 @@ int main(int argc, char *argv[]) {
/* Legend */
if (myrank == 0) {
- printf("# %6s %14s %14s %10s %14s %9s %12s %12s %12s %16s [%s] %6s\n",
+ printf("# %6s %14s %12s %12s %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");
@@ -1144,18 +1144,19 @@ int main(int argc, char *argv[]) {
/* Print some information to the screen */
printf(
- " %6d %14e %14e %10.5f %14e %4d %4d %12lld %12lld %12lld %21.3f %6d\n",
+ " %6d %14e %12.7f %12.7f %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(stdout);
- 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);
+ fprintf(e.file_timesteps,
+ " %6d %14e %12.7f %12.7f %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 dde0ca9bca..954aaec272 100644
--- a/src/engine.c
+++ b/src/engine.c
@@ -4778,19 +4778,21 @@ void engine_step(struct engine *e) {
/* Print some information to the screen */
printf(
- " %6d %14e %14e %10.5f %14e %4d %4d %12lld %12lld %12lld %21.3f %6d\n",
+ " %6d %14e %12.7f %12.7f %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(stdout);
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);
+ fprintf(
+ e->file_timesteps,
+ " %6d %14e %12.7f %12.7f %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);
}
@@ -6270,7 +6272,7 @@ 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 %10s %14s %9s %12s %12s %12s %16s [%s] %6s\n",
+ "# %6s %14s %12s %12s %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");
--
GitLab