From 54ad18dfe389d82d30a975fbda7611c41c71eb83 Mon Sep 17 00:00:00 2001 From: Matthieu Schaller <matthieu.schaller@durham.ac.uk> Date: Fri, 5 Feb 2016 14:04:47 +0000 Subject: [PATCH] Correct counting of steps. --- src/engine.c | 10 ++++++---- src/runner.c | 14 +++++++------- 2 files changed, 13 insertions(+), 11 deletions(-) diff --git a/src/engine.c b/src/engine.c index 947af290da..53dad3d70a 100644 --- a/src/engine.c +++ b/src/engine.c @@ -1723,8 +1723,8 @@ void engine_init_particles(struct engine *e) { TIMER_TIC; engine_launch(e, e->nr_threads, (1 << task_type_sort) | (1 << task_type_self) | - (1 << task_type_pair) | (1 << task_type_sub) | - (1 << task_type_init) | (1 << task_type_ghost) | + (1 << task_type_pair) | (1 << task_type_sub) | + (1 << task_type_init) | (1 << task_type_ghost) | (1 << task_type_send) | (1 << task_type_recv), 1 << task_subtype_density); @@ -1738,7 +1738,7 @@ void engine_init_particles(struct engine *e) { printParticle(e->s->parts, 515050, e->s->nr_parts); /* Ready to go */ - e->step = -1; + e->step = 0; } /** @@ -1818,6 +1818,9 @@ if ( e->nodeID == 0 ) printParticle(e->s->parts, 1000, e->s->nr_parts); printParticle(e->s->parts, 515050, e->s->nr_parts); + + if(e->step == 2) exit(0); + /* Move forward in time */ e->timeOld = e->time; @@ -1853,7 +1856,6 @@ if ( e->nodeID == 0 ) printParticle(e->s->parts, 1000, e->s->nr_parts); printParticle(e->s->parts, 515050, e->s->nr_parts); - exit(0); } diff --git a/src/runner.c b/src/runner.c index 848076515a..d8f3b4e62e 100644 --- a/src/runner.c +++ b/src/runner.c @@ -859,13 +859,6 @@ void runner_dokick(struct runner *r, struct cell *c, int timer) { const float new_dt_grav = gravity_compute_timestep(p, xp); new_dt = fminf(new_dt_hydro, new_dt_grav); - - if(p->id == 1000) - message("1000 dt_hydro=%e", new_dt_hydro); - - if(p->id == 515050) - message("515050 dt_hydro=%e", new_dt_hydro); - /* Recover the current timestep */ const float current_dt = p->t_end - p->t_begin; @@ -894,6 +887,13 @@ void runner_dokick(struct runner *r, struct cell *c, int timer) { p->t_begin = p->t_end; p->t_end = p->t_begin + new_dt; + if(p->id == 1000 || p->id == 515050) + message("%lld: current_t=%f t_beg=%f t_end=%f\n", + p->id, + t_current, + p->t_begin, + p->t_end); + /* Kick particles in momentum space */ xp->v_full[0] += p->a[0] * dt; xp->v_full[1] += p->a[1] * dt; -- GitLab