From 5a69314f1135f1de53cb65ac1f6a4fc1cc70c7b4 Mon Sep 17 00:00:00 2001 From: Matthieu Schaller <matthieu.schaller@durham.ac.uk> Date: Fri, 29 Jan 2016 14:43:30 +0000 Subject: [PATCH] Compile with clang --- src/cell.c | 15 +++++++++++++++ src/cell.h | 1 + src/space.c | 10 ++-------- 3 files changed, 18 insertions(+), 8 deletions(-) diff --git a/src/cell.c b/src/cell.c index b4716838c6..79afff700f 100644 --- a/src/cell.c +++ b/src/cell.c @@ -568,3 +568,18 @@ void cell_init_parts(struct cell *c, void *data) { c->t_end_min = 0.; } + +/** + * @brief Cleans the links in a given cell. + * + * @param c Cell to act upon + * @param data Unused parameter + */ +void cell_clean_links(struct cell * c, void * data) { + c->density = NULL; + c->nr_density = 0; + + c->force = NULL; + c->nr_force = 0; +} + diff --git a/src/cell.h b/src/cell.h index 107c41d9cb..a837e782db 100644 --- a/src/cell.h +++ b/src/cell.h @@ -178,5 +178,6 @@ int cell_unpack(struct pcell *pc, struct cell *c, struct space *s); int cell_getsize(struct cell *c); int cell_link(struct cell *c, struct part *parts); void cell_init_parts(struct cell *c, void *data); +void cell_clean_links(struct cell * c, void * data); #endif /* SWIFT_CELL_H */ diff --git a/src/space.c b/src/space.c index 0eb114bf92..0f697b46f9 100644 --- a/src/space.c +++ b/src/space.c @@ -1237,13 +1237,7 @@ void space_init(struct space *s, double dim[3], struct part *parts, int N, */ void space_link_cleanup(struct space *s) { - void cell_clean_links(struct cell * c, void * data) { - c->density = NULL; - c->nr_density = 0; - - c->force = NULL; - c->nr_force = 0; - } - + /* Recursively apply the cell link cleaning routine */ space_map_cells_pre(s, 1, cell_clean_links, NULL); + } -- GitLab