From 856d9ab2ac0a0226fef589456aa162d95afda1b8 Mon Sep 17 00:00:00 2001 From: lhausamm Date: Wed, 18 Apr 2018 16:32:18 +0200 Subject: [PATCH] format --- src/space.c | 15 +++++++-------- src/space.h | 6 ++---- 2 files changed, 9 insertions(+), 12 deletions(-) diff --git a/src/space.c b/src/space.c index 8c0ee864a..98f9614e8 100644 --- a/src/space.c +++ b/src/space.c @@ -2311,7 +2311,7 @@ void space_synchronize_particle_positions(struct space *s) { } void space_first_init_parts_mapper(void *restrict map_data, int count, - void *restrict extra_data) { + void *restrict extra_data) { struct part *restrict p = (struct part *)map_data; const struct space *restrict s = (struct space *)extra_data; @@ -2385,11 +2385,11 @@ void space_first_init_parts(struct space *s, int verbose) { if (verbose) message("took %.3f %s.", clocks_from_ticks(getticks() - tic), - clocks_getunit()); + clocks_getunit()); } void space_first_init_gparts_mapper(void *restrict map_data, int count, - void *restrict extra_data) { + void *restrict extra_data) { struct gpart *restrict gp = (struct gpart *)map_data; const struct space *restrict s = (struct space *)extra_data; @@ -2398,7 +2398,6 @@ void space_first_init_gparts_mapper(void *restrict map_data, int count, const float a_factor_vel = cosmo->a * cosmo->a; const struct gravity_props *grav_props = s->e->gravity_properties; - for (int k = 0; k < count; k++) { /* Convert velocities to internal units */ gp[k].v_full[0] *= a_factor_vel; @@ -2438,11 +2437,11 @@ void space_first_init_gparts(struct space *s, int verbose) { if (verbose) message("took %.3f %s.", clocks_from_ticks(getticks() - tic), - clocks_getunit()); + clocks_getunit()); } void space_first_init_sparts_mapper(void *restrict map_data, int count, - void *restrict extra_data) { + void *restrict extra_data) { struct spart *restrict sp = (struct spart *)map_data; const struct space *restrict s = (struct space *)extra_data; @@ -2483,7 +2482,7 @@ void space_first_init_sparts_mapper(void *restrict map_data, int count, * * Calls star_first_init_spart() on all the particles */ - void space_first_init_sparts(struct space *s, int verbose) { +void space_first_init_sparts(struct space *s, int verbose) { const ticks tic = getticks(); if (s->nr_sparts > 0) threadpool_map(&s->e->threadpool, space_first_init_sparts_mapper, s->sparts, @@ -2491,7 +2490,7 @@ void space_first_init_sparts_mapper(void *restrict map_data, int count, if (verbose) message("took %.3f %s.", clocks_from_ticks(getticks() - tic), - clocks_getunit()); + clocks_getunit()); } void space_init_parts_mapper(void *restrict map_data, int count, diff --git a/src/space.h b/src/space.h index 06febc720..e8ad1929f 100644 --- a/src/space.h +++ b/src/space.h @@ -221,10 +221,8 @@ void space_synchronize_particle_positions(struct space *s); void space_do_parts_sort(); void space_do_gparts_sort(); void space_do_sparts_sort(); -void space_first_init_parts(struct space *s, - int verbose); -void space_first_init_gparts(struct space *s, - int verbose); +void space_first_init_parts(struct space *s, int verbose); +void space_first_init_gparts(struct space *s, int verbose); void space_first_init_sparts(struct space *s, int verbose); void space_init_parts(struct space *s, int verbose); void space_init_gparts(struct space *s, int verbose); -- 2.26.2