Skip to content
Snippets Groups Projects
Commit 51362dbb authored by Matthieu Schaller's avatar Matthieu Schaller
Browse files

No more u_hdt term in xpart

parent deb3f8e2
No related branches found
No related tags found
2 merge requests!136Master,!90Improved multi-timestep SPH
...@@ -29,9 +29,6 @@ struct xpart { ...@@ -29,9 +29,6 @@ struct xpart {
/* Velocity at the last full step. */ /* Velocity at the last full step. */
float v_full[3]; float v_full[3];
/* Entropy at the half-step. */
float u_hdt;
/* Old density. */ /* Old density. */
float omega; float omega;
......
...@@ -29,12 +29,6 @@ struct xpart { ...@@ -29,12 +29,6 @@ struct xpart {
/* Velocity at the last full step. */ /* Velocity at the last full step. */
float v_full[3]; float v_full[3];
/* Entropy at the half-step. */
float u_hdt;
/* Old density. */
float omega;
} __attribute__((aligned(xpart_align))); } __attribute__((aligned(xpart_align)));
/* Data of a single particle. */ /* Data of a single particle. */
......
...@@ -944,7 +944,7 @@ void runner_dokick(struct runner *r, struct cell *c, int timer) { ...@@ -944,7 +944,7 @@ void runner_dokick(struct runner *r, struct cell *c, int timer) {
/* Collect total energy. */ /* Collect total energy. */
ekin += 0.5 * m * (v_full[0] * v_full[0] + v_full[1] * v_full[1] + ekin += 0.5 * m * (v_full[0] * v_full[0] + v_full[1] * v_full[1] +
v_full[2] * v_full[2]); v_full[2] * v_full[2]);
epot += m * xp->u_hdt; epot += 0.f; //MATTHIEU
/* Minimal time for next end of time-step */ /* Minimal time for next end of time-step */
t_end_min = fminf(p->t_end, t_end_min); t_end_min = fminf(p->t_end, t_end_min);
......
0% Loading or .
You are about to add 0 people to the discussion. Proceed with caution.
Please register or to comment