From 868b77e5f75b26722d1b4bd7a4ffd7fa57248824 Mon Sep 17 00:00:00 2001 From: lhausamm Date: Wed, 18 Apr 2018 16:28:29 +0200 Subject: [PATCH] Parallel first initialization --- src/engine.c | 6 +- src/space.c | 168 ++++++++++++++++++++++++++++++++------------------- src/space.h | 7 +-- 3 files changed, 111 insertions(+), 70 deletions(-) diff --git a/src/engine.c b/src/engine.c index 2bdad767a..a31a496be 100644 --- a/src/engine.c +++ b/src/engine.c @@ -4160,9 +4160,9 @@ void engine_first_init_particles(struct engine *e) { const ticks tic = getticks(); /* Set the particles in a state where they are ready for a run. */ - space_first_init_parts(e->s, e->chemistry, e->cooling_func); - space_first_init_gparts(e->s, e->gravity_properties); - space_first_init_sparts(e->s); + space_first_init_parts(e->s, e->verbose); + space_first_init_gparts(e->s, e->verbose); + space_first_init_sparts(e->s, e->verbose); if (e->verbose) message("took %.3f %s.", clocks_from_ticks(getticks() - tic), diff --git a/src/space.c b/src/space.c index b6aef6ea7..8c0ee864a 100644 --- a/src/space.c +++ b/src/space.c @@ -799,7 +799,7 @@ void space_rebuild(struct space *s, int verbose) { } nr_sparts = s->nr_sparts; -#endif // WITH_MPI +#endif /* WITH_MPI */ /* Sort the parts according to their cells. */ if (nr_parts > 0) @@ -908,7 +908,7 @@ void space_rebuild(struct space *s, int verbose) { } nr_gparts = s->nr_gparts; -#endif // WITH_MPI +#endif /* WITH_MPI */ /* Sort the gparts according to their cells. */ if (nr_gparts > 0) @@ -2310,19 +2310,14 @@ void space_synchronize_particle_positions(struct space *s) { s->nr_gparts, sizeof(struct gpart), 0, (void *)s); } -/** - * @brief Initialises all the particles by setting them into a valid state - * - * Calls hydro_first_init_part() on all the particles - * Calls chemistry_first_init_part() on all the particles - */ -void space_first_init_parts(struct space *s, - const struct chemistry_global_data *chemistry, - const struct cooling_function_data *cool_func) { +void space_first_init_parts_mapper(void *restrict map_data, int count, + void *restrict extra_data) { - const size_t nr_parts = s->nr_parts; - struct part *restrict p = s->parts; - struct xpart *restrict xp = s->xparts; + struct part *restrict p = (struct part *)map_data; + const struct space *restrict s = (struct space *)extra_data; + const struct engine *e = s->e; + + struct xpart *restrict xp = s->xparts + (p - s->parts); const struct cosmology *cosmo = s->e->cosmology; const struct phys_const *phys_const = s->e->physical_constants; @@ -2333,125 +2328,172 @@ void space_first_init_parts(struct space *s, const float u_init = hydro_props->initial_internal_energy; const float u_min = hydro_props->minimal_internal_energy; - for (size_t i = 0; i < nr_parts; ++i) { + const struct chemistry_data *chemistry = e->chemistry; + const struct cooling_function_data *cool_func = e->cooling_func; + for (int k = 0; k < count; k++) { /* Convert velocities to internal units */ - p[i].v[0] *= a_factor_vel; - p[i].v[1] *= a_factor_vel; - p[i].v[2] *= a_factor_vel; + p[k].v[0] *= a_factor_vel; + p[k].v[1] *= a_factor_vel; + p[k].v[2] *= a_factor_vel; #ifdef HYDRO_DIMENSION_2D - p[i].x[2] = 0.f; - p[i].v[2] = 0.f; + p[k].x[2] = 0.f; + p[k].v[2] = 0.f; #endif #ifdef HYDRO_DIMENSION_1D - p[i].x[1] = p[i].x[2] = 0.f; - p[i].v[1] = p[i].v[2] = 0.f; + p[k].x[1] = p[k].x[2] = 0.f; + p[k].v[1] = p[k].v[2] = 0.f; #endif - hydro_first_init_part(&p[i], &xp[i]); + hydro_first_init_part(&p[k], &xp[k]); /* Overwrite the internal energy? */ - if (u_init > 0.f) hydro_set_init_internal_energy(&p[i], u_init); - if (u_min > 0.f) hydro_set_init_internal_energy(&p[i], u_min); + if (u_init > 0.f) hydro_set_init_internal_energy(&p[k], u_init); + if (u_min > 0.f) hydro_set_init_internal_energy(&p[k], u_min); /* Also initialise the chemistry */ - chemistry_first_init_part(phys_const, us, cosmo, chemistry, &p[i], &xp[i]); + chemistry_first_init_part(phys_const, us, cosmo, chemistry, &p[k], &xp[k]); /* And the cooling */ - cooling_first_init_part(phys_const, us, cosmo, cool_func, &p[i], &xp[i]); + cooling_first_init_part(phys_const, us, cosmo, cool_func, &p[k], &xp[k]); /* Check part->gpart->part linkeage. */ if (p[i].gpart) p[i].gpart->id_or_neg_offset = -i; #ifdef SWIFT_DEBUG_CHECKS - p[i].ti_drift = 0; - p[i].ti_kick = 0; + p[k].ti_drift = 0; + p[k].ti_kick = 0; #endif } } /** - * @brief Initialises all the g-particles by setting them into a valid state + * @brief Initialises all the particles by setting them into a valid state * - * Calls gravity_first_init_gpart() on all the particles + * Calls hydro_first_init_part() on all the particles + * Calls chemistry_first_init_part() on all the particles + * Calls cooling_first_init_part() on all the particles */ -void space_first_init_gparts(struct space *s, - const struct gravity_props *grav_props) { +void space_first_init_parts(struct space *s, int verbose) { + + const ticks tic = getticks(); + if (s->nr_parts > 0) + threadpool_map(&s->e->threadpool, space_first_init_parts_mapper, s->parts, + s->nr_parts, sizeof(struct part), 0, s); + + if (verbose) + message("took %.3f %s.", clocks_from_ticks(getticks() - tic), + clocks_getunit()); +} + +void space_first_init_gparts_mapper(void *restrict map_data, int count, + void *restrict extra_data) { + + struct gpart *restrict gp = (struct gpart *)map_data; + const struct space *restrict s = (struct space *)extra_data; - const size_t nr_gparts = s->nr_gparts; - struct gpart *restrict gp = s->gparts; const struct cosmology *cosmo = s->e->cosmology; const float a_factor_vel = cosmo->a * cosmo->a; + const struct gravity_props *grav_props = s->e->gravity_properties; - for (size_t i = 0; i < nr_gparts; ++i) { + for (int k = 0; k < count; k++) { /* Convert velocities to internal units */ - gp[i].v_full[0] *= a_factor_vel; - gp[i].v_full[1] *= a_factor_vel; - gp[i].v_full[2] *= a_factor_vel; + gp[k].v_full[0] *= a_factor_vel; + gp[k].v_full[1] *= a_factor_vel; + gp[k].v_full[2] *= a_factor_vel; #ifdef HYDRO_DIMENSION_2D - gp[i].x[2] = 0.f; - gp[i].v_full[2] = 0.f; + gp[k].x[2] = 0.f; + gp[k].v_full[2] = 0.f; #endif #ifdef HYDRO_DIMENSION_1D - gp[i].x[1] = gp[i].x[2] = 0.f; - gp[i].v_full[1] = gp[i].v_full[2] = 0.f; + gp[k].x[1] = gp[k].x[2] = 0.f; + gp[k].v_full[1] = gp[k].v_full[2] = 0.f; #endif - gravity_first_init_gpart(&gp[i], grav_props); + gravity_first_init_gpart(&gp[k], grav_props); #ifdef SWIFT_DEBUG_CHECKS - gp[i].ti_drift = 0; - gp[i].ti_kick = 0; + gp[k].ti_drift = 0; + gp[k].ti_kick = 0; #endif } } /** - * @brief Initialises all the s-particles by setting them into a valid state + * @brief Initialises all the g-particles by setting them into a valid state * - * Calls star_first_init_spart() on all the particles + * Calls gravity_first_init_gpart() on all the particles */ -void space_first_init_sparts(struct space *s) { +void space_first_init_gparts(struct space *s, int verbose) { + + const ticks tic = getticks(); + if (s->nr_gparts > 0) + threadpool_map(&s->e->threadpool, space_first_init_gparts_mapper, s->gparts, + s->nr_gparts, sizeof(struct gpart), 0, s); + + if (verbose) + message("took %.3f %s.", clocks_from_ticks(getticks() - tic), + clocks_getunit()); +} + +void space_first_init_sparts_mapper(void *restrict map_data, int count, + void *restrict extra_data) { + + struct spart *restrict sp = (struct spart *)map_data; + const struct space *restrict s = (struct space *)extra_data; - const size_t nr_sparts = s->nr_sparts; - struct spart *restrict sp = s->sparts; const struct cosmology *cosmo = s->e->cosmology; const float a_factor_vel = cosmo->a * cosmo->a; - for (size_t i = 0; i < nr_sparts; ++i) { - + for (int k = 0; k < count; k++) { /* Convert velocities to internal units */ - sp[i].v[0] *= a_factor_vel; - sp[i].v[1] *= a_factor_vel; - sp[i].v[2] *= a_factor_vel; + sp[k].v[0] *= a_factor_vel; + sp[k].v[1] *= a_factor_vel; + sp[k].v[2] *= a_factor_vel; #ifdef HYDRO_DIMENSION_2D - sp[i].x[2] = 0.f; - sp[i].v[2] = 0.f; + sp[k].x[2] = 0.f; + sp[k].v[2] = 0.f; #endif #ifdef HYDRO_DIMENSION_1D - sp[i].x[1] = sp[i].x[2] = 0.f; - sp[i].v[1] = sp[i].v[2] = 0.f; + sp[k].x[1] = sp[k].x[2] = 0.f; + sp[k].v[1] = sp[k].v[2] = 0.f; #endif - star_first_init_spart(&sp[i]); + star_first_init_spart(&sp[k]); /* Check spart->gpart->spart linkeage. */ if (sp[i].gpart) sp[i].gpart->id_or_neg_offset = -i; #ifdef SWIFT_DEBUG_CHECKS - sp[i].ti_drift = 0; - sp[i].ti_kick = 0; + sp[k].ti_drift = 0; + sp[k].ti_kick = 0; #endif } } +/** + * @brief Initialises all the s-particles by setting them into a valid state + * + * Calls star_first_init_spart() on all the particles + */ + 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, + s->nr_sparts, sizeof(struct spart), 0, s); + + if (verbose) + message("took %.3f %s.", clocks_from_ticks(getticks() - tic), + clocks_getunit()); +} + void space_init_parts_mapper(void *restrict map_data, int count, void *restrict extra_data) { diff --git a/src/space.h b/src/space.h index db9c9edad..06febc720 100644 --- a/src/space.h +++ b/src/space.h @@ -222,11 +222,10 @@ void space_do_parts_sort(); void space_do_gparts_sort(); void space_do_sparts_sort(); void space_first_init_parts(struct space *s, - const struct chemistry_global_data *chemistry, - const struct cooling_function_data *cool_func); + int verbose); void space_first_init_gparts(struct space *s, - const struct gravity_props *grav_props); -void space_first_init_sparts(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); void space_convert_quantities(struct space *s, int verbose); -- 2.26.2