Skip to content
Snippets Groups Projects
Commit c62f307d authored by Matthieu Schaller's avatar Matthieu Schaller
Browse files

Implement the new function signatures for the star loops. Implement the sub-self and sub-pair

parent 802993af
No related branches found
No related tags found
No related merge requests found
This commit is part of merge request !1217. Comments created here will be created in the context of that merge request.
Hide whitespace changes
Inline Side-by-side
src/runner_doiact_functions_stars.h
+ 103
− 92
Edit View file @ c62f307d
...@@ -966,7 +966,7 @@ void DOPAIR1_SUBSET_BRANCH_STARS(struct runner *r, struct cell *restrict ci, ...@@ -966,7 +966,7 @@ void DOPAIR1_SUBSET_BRANCH_STARS(struct runner *r, struct cell *restrict ci,
DOPAIR1_SUBSET_STARS(r, ci, sparts_i, ind, scount, cj, sid, flipped, shift); DOPAIR1_SUBSET_STARS(r, ci, sparts_i, ind, scount, cj, sid, flipped, shift);
#endif #endif
} }
#if 0
void DOSUB_SUBSET_STARS(struct runner *r, struct cell *ci, struct spart *sparts, void DOSUB_SUBSET_STARS(struct runner *r, struct cell *ci, struct spart *sparts,
int *ind, int scount, struct cell *cj, int gettimer) { int *ind, int scount, struct cell *cj, int gettimer) {
...@@ -1050,6 +1050,7 @@ void DOSUB_SUBSET_STARS(struct runner *r, struct cell *ci, struct spart *sparts, ...@@ -1050,6 +1050,7 @@ void DOSUB_SUBSET_STARS(struct runner *r, struct cell *ci, struct spart *sparts,
} /* otherwise, pair interaction. */ } /* otherwise, pair interaction. */
} }
#endif
/** /**
* @brief Determine which version of DOSELF1_STARS needs to be called depending * @brief Determine which version of DOSELF1_STARS needs to be called depending
...@@ -1059,7 +1060,8 @@ void DOSUB_SUBSET_STARS(struct runner *r, struct cell *ci, struct spart *sparts, ...@@ -1059,7 +1060,8 @@ void DOSUB_SUBSET_STARS(struct runner *r, struct cell *ci, struct spart *sparts,
* @param c #cell c * @param c #cell c
* *
*/ */
void DOSELF1_BRANCH_STARS(struct runner *r, struct cell *c) { void DOSELF1_BRANCH_STARS(struct runner *r, struct cell *c,
const int limit_min, const int limit_max) {
const struct engine *restrict e = r->e; const struct engine *restrict e = r->e;
...@@ -1116,7 +1118,8 @@ void DOSELF1_BRANCH_STARS(struct runner *r, struct cell *c) { ...@@ -1116,7 +1118,8 @@ void DOSELF1_BRANCH_STARS(struct runner *r, struct cell *c) {
* @param cj #cell cj * @param cj #cell cj
* *
*/ */
void DOPAIR1_BRANCH_STARS(struct runner *r, struct cell *ci, struct cell *cj) { void DOPAIR1_BRANCH_STARS(struct runner *r, struct cell *ci, struct cell *cj,
const int limit_min, const int limit_max) {
const struct engine *restrict e = r->e; const struct engine *restrict e = r->e;
...@@ -1190,6 +1193,8 @@ void DOPAIR1_BRANCH_STARS(struct runner *r, struct cell *ci, struct cell *cj) { ...@@ -1190,6 +1193,8 @@ void DOPAIR1_BRANCH_STARS(struct runner *r, struct cell *ci, struct cell *cj) {
#endif #endif
} }
/** /**
* @brief Compute grouped sub-cell interactions for pairs * @brief Compute grouped sub-cell interactions for pairs
* *
...@@ -1202,95 +1207,74 @@ void DOPAIR1_BRANCH_STARS(struct runner *r, struct cell *ci, struct cell *cj) { ...@@ -1202,95 +1207,74 @@ void DOPAIR1_BRANCH_STARS(struct runner *r, struct cell *ci, struct cell *cj) {
* redundant computations to find the sid on-the-fly. * redundant computations to find the sid on-the-fly.
*/ */
void DOSUB_PAIR1_STARS(struct runner *r, struct cell *ci, struct cell *cj, void DOSUB_PAIR1_STARS(struct runner *r, struct cell *ci, struct cell *cj,
int gettimer) { int recurse_below_h_max, const int gettimer) {
TIMER_TIC; TIMER_TIC;
struct space *s = r->e->s; struct space *s = r->e->s;
const struct engine *e = r->e; const struct engine *e = r->e;
/* Should we even bother? */
const int should_do_ci = ci->stars.count != 0 && cj->hydro.count != 0 &&
cell_is_active_stars(ci, e);
const int should_do_cj = cj->stars.count != 0 && ci->hydro.count != 0 &&
cell_is_active_stars(cj, e);
if (!should_do_ci && !should_do_cj) return;
/* Get the type of pair and flip ci/cj if needed. */ /* Get the type of pair and flip ci/cj if needed. */
double shift[3]; double shift[3];
const int sid = space_getsid(s, &ci, &cj, shift); const int sid = space_getsid(s, &ci, &cj, shift);
/* Recurse? */ message("sid=%d", sid);
if (cell_can_recurse_in_pair_stars_task(ci, cj) &&
cell_can_recurse_in_pair_stars_task(cj, ci)) { /* What kind of pair are we doing here? */
struct cell_split_pair *csp = &cell_split_pairs[sid]; const int do_ci = ci->stars.count != 0 && cj->hydro.count != 0 && cell_is_active_stars(ci, e);
for (int k = 0; k < csp->count; k++) { const int do_cj = cj->stars.count != 0 && ci->hydro.count != 0 && cell_is_active_stars(cj, e);
const int pid = csp->pairs[k].pid;
const int pjd = csp->pairs[k].pjd; /* Should we even bother? */
if (ci->progeny[pid] != NULL && cj->progeny[pjd] != NULL) if (!do_ci && !do_cj) return;
DOSUB_PAIR1_STARS(r, ci->progeny[pid], cj->progeny[pjd], 0);
}
}
/* Otherwise, compute the pair directly. */
else {
#if (FUNCTION_TASK_LOOP == TASK_LOOP_DENSITY)
const int do_ci_stars = ci->nodeID == e->nodeID;
const int do_cj_stars = cj->nodeID == e->nodeID;
#else
/* here we are updating the hydro -> switch ci, cj */
const int do_ci_stars = cj->nodeID == e->nodeID;
const int do_cj_stars = ci->nodeID == e->nodeID;
#endif
const int do_ci = ci->stars.count != 0 && cj->hydro.count != 0 &&
cell_is_active_stars(ci, e) && do_ci_stars;
const int do_cj = cj->stars.count != 0 && ci->hydro.count != 0 &&
cell_is_active_stars(cj, e) && do_cj_stars;
if (do_ci) { if (!ci->split || ci->stars.count < space_recurse_size_pair_stars ||
!cj->split || cj->stars.count < space_recurse_size_pair_stars) {
/* Make sure both cells are drifted to the current timestep. */
if (!cell_are_spart_drifted(ci, e))
error("Interacting undrifted cells (sparts).");
if (!cell_are_part_drifted(cj, e)) /* We interact all particles in that cell:
error("Interacting undrifted cells (parts)."); - No limit on the smallest h
- Apply the max h limit if we are recursing below the level
where h is smaller than the cell size */
DOPAIR1_BRANCH_STARS(r, ci, cj, /*limit_h_min=*/0,
/*limit_h_max=*/recurse_below_h_max);
/* Do any of the cells need to be sorted first? */ } else {
if (!(ci->stars.sorted & (1 << sid)) ||
ci->stars.dx_max_sort_old > ci->dmin * space_maxreldx) {
error("Interacting unsorted cell (sparts).");
}
if (!(cj->hydro.sorted & (1 << sid)) ||
cj->hydro.dx_max_sort_old > cj->dmin * space_maxreldx)
error("Interacting unsorted cell (parts). %i", cj->nodeID);
}
if (do_cj) {
/* Make sure both cells are drifted to the current timestep. */ /* If some particles are larger than the daughter cells, we must
if (!cell_are_part_drifted(ci, e)) process them at this level before going deeper */
error("Interacting undrifted cells (parts)."); if (recurse_below_h_max) {
if (!cell_are_spart_drifted(cj, e))
error("Interacting undrifted cells (sparts).");
/* Do any of the cells need to be sorted first? */ /* Should we change the recursion regime because we encountered a large
if (!(ci->hydro.sorted & (1 << sid)) || particle? */
ci->hydro.dx_max_sort_old > ci->dmin * space_maxreldx) { if (!recurse_below_h_max && (!cell_can_recurse_in_pair_stars_task1(ci) ||
error("Interacting unsorted cell (parts)."); !cell_can_recurse_in_pair_stars_task1(cj)))
} recurse_below_h_max = 1;
/* message("Multi-level PAIR! ci->count=%d cj->count=%d", ci->hydro.count,
*/
/* cj->hydro.count); */
if (!(cj->stars.sorted & (1 << sid)) || /* Interact all *active* particles with h in the range [dmin/2, dmin)
cj->stars.dx_max_sort_old > cj->dmin * space_maxreldx) { with all their neighbours */
error("Interacting unsorted cell (sparts)."); DOPAIR1_BRANCH_STARS(r, ci, cj, /*limit_h_min=*/1, /*limit_h_max=*/1);
}
} }
if (do_ci || do_cj) DOPAIR1_BRANCH_STARS(r, ci, cj); /* Recurse to the lower levels. */
const struct cell_split_pair *const csp = &cell_split_pairs[sid];
for (int k = 0; k < csp->count; k++) {
const int pid = csp->pairs[k].pid;
const int pjd = csp->pairs[k].pjd;
if (ci->progeny[pid] != NULL && cj->progeny[pjd] != NULL) {
DOSUB_PAIR1_STARS(r, ci->progeny[pid], cj->progeny[pjd], recurse_below_h_max,
/*gettimer=*/0);
}
}
} }
TIMER_TOC(TIMER_DOSUB_PAIR_STARS); TIMER_TOC(TIMER_DOSUB_PAIR_STARS);
} }
...@@ -1302,41 +1286,68 @@ void DOSUB_PAIR1_STARS(struct runner *r, struct cell *ci, struct cell *cj, ...@@ -1302,41 +1286,68 @@ void DOSUB_PAIR1_STARS(struct runner *r, struct cell *ci, struct cell *cj,
* @param ci The first #cell. * @param ci The first #cell.
* @param gettimer Do we have a timer ? * @param gettimer Do we have a timer ?
*/ */
void DOSUB_SELF1_STARS(struct runner *r, struct cell *ci, int gettimer) { void DOSUB_SELF1_STARS(struct runner *r, struct cell *c, int recurse_below_h_max, const int gettimer) {
TIMER_TIC; TIMER_TIC;
#ifdef SWIFT_DEBUG_CHECKS #ifdef SWIFT_DEBUG_CHECKS
if (ci->nodeID != engine_rank) if (c->nodeID != engine_rank)
error("This function should not be called on foreign cells"); error("This function should not be called on foreign cells");
#endif #endif
/* Should we even bother? */ /* Should we even bother? */
if (ci->hydro.count == 0 || ci->stars.count == 0 || if (c->hydro.count == 0 || c->stars.count == 0 ||
!cell_is_active_stars(ci, r->e)) !cell_is_active_stars(c, r->e))
return; return;
/* Recurse? */
if (cell_can_recurse_in_self_stars_task(ci)) {
/* Loop over all progeny. */ /* We reached a leaf OR a cell small enough to process quickly */
for (int k = 0; k < 8; k++) if (!c->split || c->stars.count < space_recurse_size_self_stars) {
if (ci->progeny[k] != NULL) {
DOSUB_SELF1_STARS(r, ci->progeny[k], 0);
for (int j = k + 1; j < 8; j++)
if (ci->progeny[j] != NULL)
DOSUB_PAIR1_STARS(r, ci->progeny[k], ci->progeny[j], 0);
}
}
/* Otherwise, compute self-interaction. */ /* We interact all particles in that cell:
else { - No limit on the smallest h
- Apply the max h limit if we are recursing below the level
where h is smaller than the cell size */
DOSELF1_BRANCH_STARS(r, c, /*limit_h_min=*/0,
/*limit_h_max=*/recurse_below_h_max);
/* Drift the cell to the current timestep if needed. */ } else {
if (!cell_are_spart_drifted(ci, r->e)) error("Interacting undrifted cell.");
DOSELF1_BRANCH_STARS(r, ci); /* Should we change the recursion regime because we encountered a large
} particle at this level? */
if (!recurse_below_h_max && !cell_can_recurse_in_self_stars_task1(c))
recurse_below_h_max = 1;
/* If some particles are larger than the daughter cells, we must
process them at this level before going deeper */
if (recurse_below_h_max) {
/* message("Multi-level SELF! c->count=%d", c->hydro.count); */
TIMER_TOC(TIMER_DOSUB_SELF_STARS); /* Interact all *active* particles with h in the range [dmin/2, dmin)
with all their neighbours */
DOSELF1_BRANCH_STARS(r, c, /*limit_h_min=*/1, /*limit_h_max=*/1);
}
/* Recurse to the lower levels. */
for (int k = 0; k < 8; k++) {
if (c->progeny[k] != NULL) {
DOSUB_SELF1_STARS(r, c->progeny[k], recurse_below_h_max, /*gettimer=*/0);
for (int j = k + 1; j < 8; j++) {
if (c->progeny[j] != NULL) {
DOSUB_PAIR1_STARS(r, c->progeny[k], c->progeny[j], recurse_below_h_max,
/*gettimer=*/0);
}
}
}
}
}
if(gettimer) TIMER_TOC(TIMER_DOSUB_SELF_STARS);
} }
src/runner_doiact_stars.h
+ 7
− 4
Edit View file @ c62f307d
...@@ -86,12 +86,15 @@ ...@@ -86,12 +86,15 @@
#define _IACT_STARS(f) PASTE(runner_iact_nonsym_stars, f) #define _IACT_STARS(f) PASTE(runner_iact_nonsym_stars, f)
#define IACT_STARS _IACT_STARS(FUNCTION) #define IACT_STARS _IACT_STARS(FUNCTION)
void DOSELF1_BRANCH_STARS(struct runner *r, struct cell *c); void DOSELF1_BRANCH_STARS(struct runner *r, struct cell *c,
void DOPAIR1_BRANCH_STARS(struct runner *r, struct cell *ci, struct cell *cj); const int limit_min, const int limit_max);
void DOPAIR1_BRANCH_STARS(struct runner *r, struct cell *ci, struct cell *cj,
const int limit_min, const int limit_max);
void DOSUB_SELF1_STARS(struct runner *r, struct cell *ci, int gettimer); void DOSUB_SELF1_STARS(struct runner *r, struct cell *ci, int recurse_below_h_max,
const int gettimer);
void DOSUB_PAIR1_STARS(struct runner *r, struct cell *ci, struct cell *cj, void DOSUB_PAIR1_STARS(struct runner *r, struct cell *ci, struct cell *cj,
int gettimer); int recurse_below_h_max, const int gettimer);
void DOSELF1_SUBSET_BRANCH_STARS(struct runner *r, struct cell *restrict ci, void DOSELF1_SUBSET_BRANCH_STARS(struct runner *r, struct cell *restrict ci,
struct spart *restrict sparts, struct spart *restrict sparts,
......
src/runner_main.c
+ 10
− 8
Edit View file @ c62f307d
...@@ -200,9 +200,9 @@ void *runner_main(void *data) { ...@@ -200,9 +200,9 @@ void *runner_main(void *data) {
else if (t->subtype == task_subtype_external_grav) else if (t->subtype == task_subtype_external_grav)
runner_do_grav_external(r, ci, 1); runner_do_grav_external(r, ci, 1);
else if (t->subtype == task_subtype_stars_density) else if (t->subtype == task_subtype_stars_density)
runner_doself_branch_stars_density(r, ci); runner_doself_branch_stars_density(r, ci, t->flags, t->flags);
else if (t->subtype == task_subtype_stars_feedback) else if (t->subtype == task_subtype_stars_feedback)
runner_doself_branch_stars_feedback(r, ci); runner_doself_branch_stars_feedback(r, ci, t->flags, t->flags);
else if (t->subtype == task_subtype_bh_density) else if (t->subtype == task_subtype_bh_density)
runner_doself_branch_bh_density(r, ci); runner_doself_branch_bh_density(r, ci);
else if (t->subtype == task_subtype_bh_swallow) else if (t->subtype == task_subtype_bh_swallow)
...@@ -237,9 +237,9 @@ void *runner_main(void *data) { ...@@ -237,9 +237,9 @@ void *runner_main(void *data) {
else if (t->subtype == task_subtype_grav) else if (t->subtype == task_subtype_grav)
runner_dopair_recursive_grav(r, ci, cj, 1); runner_dopair_recursive_grav(r, ci, cj, 1);
else if (t->subtype == task_subtype_stars_density) else if (t->subtype == task_subtype_stars_density)
runner_dopair_branch_stars_density(r, ci, cj); runner_dopair_branch_stars_density(r, ci, cj, t->flags, t->flags);
else if (t->subtype == task_subtype_stars_feedback) else if (t->subtype == task_subtype_stars_feedback)
runner_dopair_branch_stars_feedback(r, ci, cj); runner_dopair_branch_stars_feedback(r, ci, cj, t->flags, t->flags);
else if (t->subtype == task_subtype_bh_density) else if (t->subtype == task_subtype_bh_density)
runner_dopair_branch_bh_density(r, ci, cj); runner_dopair_branch_bh_density(r, ci, cj);
else if (t->subtype == task_subtype_bh_swallow) else if (t->subtype == task_subtype_bh_swallow)
...@@ -273,9 +273,9 @@ void *runner_main(void *data) { ...@@ -273,9 +273,9 @@ void *runner_main(void *data) {
else if (t->subtype == task_subtype_limiter) else if (t->subtype == task_subtype_limiter)
runner_dosub_self1_limiter(r, ci, 1); runner_dosub_self1_limiter(r, ci, 1);
else if (t->subtype == task_subtype_stars_density) else if (t->subtype == task_subtype_stars_density)
runner_dosub_self_stars_density(r, ci, 1); runner_dosub_self_stars_density(r, ci, /*recurse_below_h_max=*/t->flags, 1);
else if (t->subtype == task_subtype_stars_feedback) else if (t->subtype == task_subtype_stars_feedback)
runner_dosub_self_stars_feedback(r, ci, 1); runner_dosub_self_stars_feedback(r, ci, /*recurse_below_h_max=*/t->flags, 1);
else if (t->subtype == task_subtype_bh_density) else if (t->subtype == task_subtype_bh_density)
runner_dosub_self_bh_density(r, ci, 1); runner_dosub_self_bh_density(r, ci, 1);
else if (t->subtype == task_subtype_bh_swallow) else if (t->subtype == task_subtype_bh_swallow)
...@@ -310,9 +310,11 @@ void *runner_main(void *data) { ...@@ -310,9 +310,11 @@ void *runner_main(void *data) {
else if (t->subtype == task_subtype_limiter) else if (t->subtype == task_subtype_limiter)
runner_dosub_pair1_limiter(r, ci, cj, 1); runner_dosub_pair1_limiter(r, ci, cj, 1);
else if (t->subtype == task_subtype_stars_density) else if (t->subtype == task_subtype_stars_density)
runner_dosub_pair_stars_density(r, ci, cj, 1); runner_dosub_pair_stars_density(r, ci, cj,
/*recurse_below_h_max=*/t->flags, 1);
else if (t->subtype == task_subtype_stars_feedback) else if (t->subtype == task_subtype_stars_feedback)
runner_dosub_pair_stars_feedback(r, ci, cj, 1); runner_dosub_pair_stars_feedback(r, ci, cj,
/*recurse_below_h_max=*/t->flags, 1);
else if (t->subtype == task_subtype_bh_density) else if (t->subtype == task_subtype_bh_density)
runner_dosub_pair_bh_density(r, ci, cj, 1); runner_dosub_pair_bh_density(r, ci, cj, 1);
else if (t->subtype == task_subtype_bh_swallow) else if (t->subtype == task_subtype_bh_swallow)
......
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Please register or to comment