From 63a75aded913ca82ef3f695984dac91dd146e33f Mon Sep 17 00:00:00 2001
From: Matthieu Schaller <matthieu.schaller@durham.ac.uk>
Date: Sat, 4 Mar 2017 17:54:54 +0000
Subject: [PATCH] Delayed the conversion time-bin --> time to then end of the
loop when receiving particles.
---
src/engine.c | 6 +++---
src/runner.c | 44 ++++++++++++++++++++++++++++++++------------
2 files changed, 35 insertions(+), 15 deletions(-)
diff --git a/src/engine.c b/src/engine.c
index 2f3b362346..52d4be9b34 100644
--- a/src/engine.c
+++ b/src/engine.c
@@ -3046,9 +3046,9 @@ void engine_step(struct engine *e) {
if (e->nodeID == 0) {
/* Print some information to the screen */
- printf(" %6d %14e %d %14e %10zu %10zu %10zu %21.3f\n", e->step, e->time,
- e->max_active_bin, e->timeStep, e->updates, e->g_updates,
- e->s_updates, e->wallclock_time);
+ printf(" %6d %14e %14e %10zu %10zu %10zu %21.3f\n", e->step, e->time,
+ e->timeStep, e->updates, e->g_updates, e->s_updates,
+ e->wallclock_time);
fflush(stdout);
fprintf(e->file_timesteps, " %6d %14e %14e %10zu %10zu %10zu %21.3f\n",
diff --git a/src/runner.c b/src/runner.c
index 521914bfde..04948926d5 100644
--- a/src/runner.c
+++ b/src/runner.c
@@ -1403,6 +1403,8 @@ void runner_do_recv_part(struct runner *r, struct cell *c, int timer) {
integertime_t ti_end_min = max_nr_timesteps;
integertime_t ti_end_max = 0;
+ timebin_t time_bin_min = num_time_bins;
+ timebin_t time_bin_max = 0;
float h_max = 0.f;
/* If this cell is a leaf, collect the particle data. */
@@ -1410,10 +1412,9 @@ void runner_do_recv_part(struct runner *r, struct cell *c, int timer) {
/* Collect everything... */
for (size_t k = 0; k < nr_parts; k++) {
- const integertime_t ti_end =
- get_integer_time_end(ti_current, parts[k].time_bin);
- ti_end_min = min(ti_end_min, ti_end);
- ti_end_max = max(ti_end_max, ti_end);
+ if(parts[k].time_bin == time_bin_inhibited) continue;
+ time_bin_min = min(time_bin_min, parts[k].time_bin);
+ time_bin_max = max(time_bin_max, parts[k].time_bin);
h_max = max(h_max, parts[k].h);
#ifdef SWIFT_DEBUG_CHECKS
@@ -1421,6 +1422,10 @@ void runner_do_recv_part(struct runner *r, struct cell *c, int timer) {
error("Received un-drifted particle !");
#endif
}
+
+ /* Convert into a time */
+ ti_end_min = get_integer_time_end(ti_current, time_bin_min);
+ ti_end_max = get_integer_time_end(ti_current, time_bin_max);
}
/* Otherwise, recurse and collect. */
@@ -1475,22 +1480,27 @@ void runner_do_recv_gpart(struct runner *r, struct cell *c, int timer) {
integertime_t ti_end_min = max_nr_timesteps;
integertime_t ti_end_max = 0;
+ timebin_t time_bin_min = num_time_bins;
+ timebin_t time_bin_max = 0;
/* If this cell is a leaf, collect the particle data. */
if (!c->split) {
/* Collect everything... */
for (size_t k = 0; k < nr_gparts; k++) {
- const integertime_t ti_end =
- get_integer_time_end(ti_current, gparts[k].time_bin);
- ti_end_min = min(ti_end_min, ti_end);
- ti_end_max = max(ti_end_max, ti_end);
+ if(gparts[k].time_bin == time_bin_inhibited) continue;
+ time_bin_min = min(time_bin_min, gparts[k].time_bin);
+ time_bin_max = max(time_bin_max, gparts[k].time_bin);
#ifdef SWIFT_DEBUG_CHECKS
if (gparts[k].ti_drift != ti_current)
error("Received un-drifted g-particle !");
#endif
}
+
+ /* Convert into a time */
+ ti_end_min = get_integer_time_end(ti_current, time_bin_min);
+ ti_end_max = get_integer_time_end(ti_current, time_bin_max);
}
/* Otherwise, recurse and collect. */
@@ -1543,17 +1553,27 @@ void runner_do_recv_spart(struct runner *r, struct cell *c, int timer) {
integertime_t ti_end_min = max_nr_timesteps;
integertime_t ti_end_max = 0;
+ timebin_t time_bin_min = num_time_bins;
+ timebin_t time_bin_max = 0;
/* If this cell is a leaf, collect the particle data. */
if (!c->split) {
/* Collect everything... */
for (size_t k = 0; k < nr_sparts; k++) {
- const integertime_t ti_end =
- get_integer_time_end(ti_current, sparts[k].time_bin);
- ti_end_min = min(ti_end_min, ti_end);
- ti_end_max = max(ti_end_max, ti_end);
+ if(sparts[k].time_bin == time_bin_inhibited) continue;
+ time_bin_min = min(time_bin_min, sparts[k].time_bin);
+ time_bin_max = max(time_bin_max, sparts[k].time_bin);
+
+#ifdef SWIFT_DEBUG_CHECKS
+ if (sparts[k].ti_drift != ti_current)
+ error("Received un-drifted s-particle !");
+#endif
}
+
+ /* Convert into a time */
+ ti_end_min = get_integer_time_end(ti_current, time_bin_min);
+ ti_end_max = get_integer_time_end(ti_current, time_bin_max);
}
/* Otherwise, recurse and collect. */
--
GitLab