From 51362dbbca18de7a514c4dece2aabd2a654fc269 Mon Sep 17 00:00:00 2001 From: Matthieu Schaller <matthieu.schaller@durham.ac.uk> Date: Fri, 12 Feb 2016 15:40:52 +0000 Subject: [PATCH] No more u_hdt term in xpart --- src/hydro/Default/hydro_part.h | 3 --- src/hydro/Gadget2/hydro_part.h | 6 ------ src/runner.c | 2 +- 3 files changed, 1 insertion(+), 10 deletions(-) diff --git a/src/hydro/Default/hydro_part.h b/src/hydro/Default/hydro_part.h index 6bfe81822f..2cb5345578 100644 --- a/src/hydro/Default/hydro_part.h +++ b/src/hydro/Default/hydro_part.h @@ -29,9 +29,6 @@ struct xpart { /* Velocity at the last full step. */ float v_full[3]; - /* Entropy at the half-step. */ - float u_hdt; - /* Old density. */ float omega; diff --git a/src/hydro/Gadget2/hydro_part.h b/src/hydro/Gadget2/hydro_part.h index 45c04ba75c..fea9ee54aa 100644 --- a/src/hydro/Gadget2/hydro_part.h +++ b/src/hydro/Gadget2/hydro_part.h @@ -29,12 +29,6 @@ struct xpart { /* Velocity at the last full step. */ float v_full[3]; - /* Entropy at the half-step. */ - float u_hdt; - - /* Old density. */ - float omega; - } __attribute__((aligned(xpart_align))); /* Data of a single particle. */ diff --git a/src/runner.c b/src/runner.c index 88a94f0dcd..ade14ee625 100644 --- a/src/runner.c +++ b/src/runner.c @@ -944,7 +944,7 @@ void runner_dokick(struct runner *r, struct cell *c, int timer) { /* Collect total energy. */ ekin += 0.5 * m * (v_full[0] * v_full[0] + v_full[1] * v_full[1] + v_full[2] * v_full[2]); - epot += m * xp->u_hdt; + epot += 0.f; //MATTHIEU /* Minimal time for next end of time-step */ t_end_min = fminf(p->t_end, t_end_min); -- GitLab