From cbfb8a1938292ce58d97bd229ed94c2a9881e8e5 Mon Sep 17 00:00:00 2001 From: Matthieu Schaller <matthieu.schaller@durham.ac.uk> Date: Thu, 29 Dec 2016 15:47:10 +0100 Subject: [PATCH] Clean-up --- src/const.h | 2 -- src/gravity/Default/gravity_part.h | 6 ------ src/hydro/Gadget2/hydro_part.h | 6 ------ src/runner.c | 4 ++-- src/runner_doiact_grav.h | 2 ++ 5 files changed, 4 insertions(+), 16 deletions(-) diff --git a/src/const.h b/src/const.h index 4b46ec1cb0..c290a3e73a 100644 --- a/src/const.h +++ b/src/const.h @@ -59,6 +59,4 @@ #define SOURCETERMS_NONE //#define SOURCETERMS_SN_FEEDBACK -#define ICHECK -116650 - #endif /* SWIFT_CONST_H */ diff --git a/src/gravity/Default/gravity_part.h b/src/gravity/Default/gravity_part.h index cd16287db6..18d524d39f 100644 --- a/src/gravity/Default/gravity_part.h +++ b/src/gravity/Default/gravity_part.h @@ -44,12 +44,6 @@ struct gpart { /* Softening length */ float epsilon; - /* Particle time of beginning of time-step. */ - // int ti_begin; - - /* Particle time of end of time-step. */ - // int ti_end; - /* Time-step length */ timebin_t time_bin; diff --git a/src/hydro/Gadget2/hydro_part.h b/src/hydro/Gadget2/hydro_part.h index f10d72b90b..56162055f4 100644 --- a/src/hydro/Gadget2/hydro_part.h +++ b/src/hydro/Gadget2/hydro_part.h @@ -71,12 +71,6 @@ struct part { /* Particle mass. */ float mass; - /* Particle time of beginning of time-step. */ - // int ti_begin; - - /* Particle time of end of time-step. */ - // int ti_end; - /* Particle density. */ float rho; diff --git a/src/runner.c b/src/runner.c index b7c7129f25..d3b067f177 100644 --- a/src/runner.c +++ b/src/runner.c @@ -896,8 +896,8 @@ void runner_do_kick1(struct runner *r, struct cell *c, int timer) { /** * @brief Perform the second half-kick on all the active particles in a cell. * - * Also computes the next time-step of all active particles, prepare them to be - * drifted and update the cell's statistics. + * Also computes the next time-step of all active particles, prepare them to be + * drifted and update the cell's statistics. * * @param r The runner thread. * @param c The cell. diff --git a/src/runner_doiact_grav.h b/src/runner_doiact_grav.h index 9d2606ceb0..59a5ae4966 100644 --- a/src/runner_doiact_grav.h +++ b/src/runner_doiact_grav.h @@ -25,6 +25,8 @@ #include "gravity.h" #include "part.h" +#define ICHECK -1000 + /** * @brief Compute the recursive upward sweep, i.e. construct the * multipoles in a cell hierarchy. -- GitLab