From eb15331d25bfcd55d6da04873f930de250b365e9 Mon Sep 17 00:00:00 2001
From: Alexei Borissov <dc-bori1@cosma-c.cosma>
Date: Mon, 21 May 2018 16:00:01 +0100
Subject: [PATCH] added counter of unconverged particles
---
src/engine.c | 8 ++++----
src/engine.h | 1 +
2 files changed, 5 insertions(+), 4 deletions(-)
diff --git a/src/engine.c b/src/engine.c
index aefe516628..c235ee3666 100644
--- a/src/engine.c
+++ b/src/engine.c
@@ -4743,17 +4743,17 @@ 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 %6d %6d %6d %.5e\n",
+ " %6d %14e %14e %10.5f %14e %4d %4d %12lld %12lld %12lld %21.3f %6d %.5e %6d %6d %.5e\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, (n_eagle_cooling_rate_calls_1 - n_eagle_cooling_rate_calls_3)/n_eagle_cooling_rate_calls_2, n_eagle_cooling_rate_calls_2, n_eagle_cooling_rate_calls_3, ((float) n_eagle_cooling_rate_calls_3)/((float) n_eagle_cooling_rate_calls_2));
+ e->s_updates, e->wallclock_time, e->step_props, ((float) n_eagle_cooling_rate_calls_1)/((float) n_eagle_cooling_rate_calls_2), n_eagle_cooling_rate_calls_2, n_eagle_cooling_rate_calls_3, ((float) n_eagle_cooling_rate_calls_3)/((float) n_eagle_cooling_rate_calls_2), n_eagle_cooling_rate_calls_4);
fflush(stdout);
fprintf(e->file_timesteps,
- " %6d %14e %14e %14e %4d %4d %12lld %12lld %12lld %21.3f %6d %6d %6d %6d %.5e\n",
+ " %6d %14e %14e %14e %4d %4d %12lld %12lld %12lld %21.3f %6d %.5e %6d %6d %.5e %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, (n_eagle_cooling_rate_calls_1 - n_eagle_cooling_rate_calls_3)/n_eagle_cooling_rate_calls_2, n_eagle_cooling_rate_calls_2, n_eagle_cooling_rate_calls_3, ((float) n_eagle_cooling_rate_calls_3)/((float) n_eagle_cooling_rate_calls_2));
+ e->wallclock_time, e->step_props, ((float) (n_eagle_cooling_rate_calls_1 - 20*n_eagle_cooling_rate_calls_4))/((float) n_eagle_cooling_rate_calls_2), n_eagle_cooling_rate_calls_2, n_eagle_cooling_rate_calls_3, ((float) n_eagle_cooling_rate_calls_3)/((float) n_eagle_cooling_rate_calls_2), n_eagle_cooling_rate_calls_4);
fflush(e->file_timesteps);
}
n_eagle_cooling_rate_calls_1 = 0;
diff --git a/src/engine.h b/src/engine.h
index dde846f49a..61bef1c3c2 100644
--- a/src/engine.h
+++ b/src/engine.h
@@ -54,6 +54,7 @@
int n_eagle_cooling_rate_calls_1;
int n_eagle_cooling_rate_calls_2;
int n_eagle_cooling_rate_calls_3;
+int n_eagle_cooling_rate_calls_4;
/**
* @brief The different policies the #engine can follow.
--
GitLab