From fc43e3851ad03f027c6d66b79cfd376bc466a1e6 Mon Sep 17 00:00:00 2001 From: Matthieu Schaller <matthieu.schaller@durham.ac.uk> Date: Wed, 30 May 2018 09:32:19 +0200 Subject: [PATCH] Do not set the signal velocity to 1 in hydro_has_no_neighbours(). Code formatting. --- src/hydro/Minimal/hydro.h | 1 - src/hydro/Minimal/hydro_debug.h | 8 +++----- src/hydro/MinimalMultiMat/hydro.h | 1 - src/hydro/MinimalMultiMat/hydro_debug.h | 8 +++----- 4 files changed, 6 insertions(+), 12 deletions(-) diff --git a/src/hydro/Minimal/hydro.h b/src/hydro/Minimal/hydro.h index 8bbaacfbea..812f8ad72d 100644 --- a/src/hydro/Minimal/hydro.h +++ b/src/hydro/Minimal/hydro.h @@ -370,7 +370,6 @@ __attribute__((always_inline)) INLINE static void hydro_part_has_no_neighbours( p->density.wcount = kernel_root * h_inv_dim; p->density.rho_dh = 0.f; p->density.wcount_dh = 0.f; - p->force.v_sig = 1.f; } /** diff --git a/src/hydro/Minimal/hydro_debug.h b/src/hydro/Minimal/hydro_debug.h index eb0c99dd4c..73ffc26b8a 100644 --- a/src/hydro/Minimal/hydro_debug.h +++ b/src/hydro/Minimal/hydro_debug.h @@ -42,13 +42,11 @@ __attribute__((always_inline)) INLINE static void hydro_debug_particle( "m=%.3g, u=%.3g, du/dt=%.3g, P=%.3g, c_s=%.3g, \n " "v_sig=%.3g, h=%.3g, dh/dt=%.3g, wcount=%.3g, rho=%.3g, \n " "dh_drho=%.3g, time_bin=%d \n", - p->x[0], p->x[1], p->x[2], p->v[0], p->v[1], p->v[2], - xp->v_full[0], xp->v_full[1], xp->v_full[2], - p->a_hydro[0], p->a_hydro[1], p->a_hydro[2], + p->x[0], p->x[1], p->x[2], p->v[0], p->v[1], p->v[2], xp->v_full[0], + xp->v_full[1], xp->v_full[2], p->a_hydro[0], p->a_hydro[1], p->a_hydro[2], p->mass, p->u, p->u_dt, hydro_get_comoving_pressure(p), p->force.soundspeed, p->force.v_sig, p->h, p->force.h_dt, - p->density.wcount, p->rho, p->density.rho_dh, - p->time_bin); + p->density.wcount, p->rho, p->density.rho_dh, p->time_bin); } #endif /* SWIFT_MINIMAL_HYDRO_DEBUG_H */ diff --git a/src/hydro/MinimalMultiMat/hydro.h b/src/hydro/MinimalMultiMat/hydro.h index 405b4b5b0a..cfad6b2b2b 100644 --- a/src/hydro/MinimalMultiMat/hydro.h +++ b/src/hydro/MinimalMultiMat/hydro.h @@ -371,7 +371,6 @@ __attribute__((always_inline)) INLINE static void hydro_part_has_no_neighbours( p->density.wcount = kernel_root * h_inv_dim; p->density.rho_dh = 0.f; p->density.wcount_dh = 0.f; - p->force.v_sig = 1.f; } /** diff --git a/src/hydro/MinimalMultiMat/hydro_debug.h b/src/hydro/MinimalMultiMat/hydro_debug.h index 01d4d24b11..17b624ad0f 100644 --- a/src/hydro/MinimalMultiMat/hydro_debug.h +++ b/src/hydro/MinimalMultiMat/hydro_debug.h @@ -44,13 +44,11 @@ __attribute__((always_inline)) INLINE static void hydro_debug_particle( "m=%.3g, u=%.3g, du/dt=%.3g, P=%.3g, c_s=%.3g, \n " "v_sig=%.3g, h=%.3g, dh/dt=%.3g, wcount=%.3g, rho=%.3g, \n " "dh_drho=%.3g, time_bin=%d, mat_id=%d \n", - p->x[0], p->x[1], p->x[2], p->v[0], p->v[1], p->v[2], - xp->v_full[0], xp->v_full[1], xp->v_full[2], - p->a_hydro[0], p->a_hydro[1], p->a_hydro[2], + p->x[0], p->x[1], p->x[2], p->v[0], p->v[1], p->v[2], xp->v_full[0], + xp->v_full[1], xp->v_full[2], p->a_hydro[0], p->a_hydro[1], p->a_hydro[2], p->mass, p->u, p->u_dt, hydro_get_comoving_pressure(p), p->force.soundspeed, p->force.v_sig, p->h, p->force.h_dt, - p->density.wcount, p->rho, p->density.rho_dh, - p->time_bin, p->mat_id); + p->density.wcount, p->rho, p->density.rho_dh, p->time_bin, p->mat_id); } #endif /* SWIFT_MINIMAL_MULTI_MAT_HYDRO_DEBUG_H */ -- GitLab