diff --git a/src/runner.c b/src/runner.c
index 472f11c067d3e83018d58d200cff2ca0271eb3d2..cd047514ab6ff4c67e13bd67daabc8f00af5f67a 100644
--- a/src/runner.c
+++ b/src/runner.c
@@ -132,16 +132,16 @@ void runner_do_sourceterms(struct runner *r, struct cell *c, int timer) {
if (c->split) {
for (int k = 0; k < 8; k++)
if (c->progeny[k] != NULL) runner_do_sourceterms(r, c->progeny[k], 0);
- return;
- }
+ } else {
- if (count > 0) {
+ if (count > 0) {
- /* do sourceterms in this cell? */
- const int incell =
- sourceterms_test_cell(cell_min, cell_width, sourceterms, dimen);
- if (incell == 1) {
- sourceterms_apply(r, sourceterms, c);
+ /* do sourceterms in this cell? */
+ const int incell =
+ sourceterms_test_cell(cell_min, cell_width, sourceterms, dimen);
+ if (incell == 1) {
+ sourceterms_apply(r, sourceterms, c);
+ }
}
}
@@ -173,23 +173,19 @@ void runner_do_grav_external(struct runner *r, struct cell *c, int timer) {
if (c->split) {
for (int k = 0; k < 8; k++)
if (c->progeny[k] != NULL) runner_do_grav_external(r, c->progeny[k], 0);
- return;
- }
-
-#ifdef TASK_VERBOSE
- OUT;
-#endif
+ } else {
- /* Loop over the gparts in this cell. */
- for (int i = 0; i < gcount; i++) {
+ /* Loop over the gparts in this cell. */
+ for (int i = 0; i < gcount; i++) {
- /* Get a direct pointer on the part. */
- struct gpart *restrict gp = &gparts[i];
+ /* Get a direct pointer on the part. */
+ struct gpart *restrict gp = &gparts[i];
- /* Is this part within the time step? */
- if (gp->ti_end <= ti_current) {
+ /* Is this part within the time step? */
+ if (gp->ti_end <= ti_current) {
- external_gravity_acceleration(time, potential, constants, gp);
+ external_gravity_acceleration(time, potential, constants, gp);
+ }
}
}
@@ -221,26 +217,22 @@ void runner_do_cooling(struct runner *r, struct cell *c, int timer) {
if (c->split) {
for (int k = 0; k < 8; k++)
if (c->progeny[k] != NULL) runner_do_cooling(r, c->progeny[k], 0);
- return;
- }
-
-#ifdef TASK_VERBOSE
- OUT;
-#endif
+ } else {
- /* Loop over the parts in this cell. */
- for (int i = 0; i < count; i++) {
+ /* Loop over the parts in this cell. */
+ for (int i = 0; i < count; i++) {
- /* Get a direct pointer on the part. */
- struct part *restrict p = &parts[i];
- struct xpart *restrict xp = &xparts[i];
+ /* Get a direct pointer on the part. */
+ struct part *restrict p = &parts[i];
+ struct xpart *restrict xp = &xparts[i];
- /* Kick has already updated ti_end, so need to check ti_begin */
- if (p->ti_begin == ti_current) {
+ /* Kick has already updated ti_end, so need to check ti_begin */
+ if (p->ti_begin == ti_current) {
- const double dt = (p->ti_end - p->ti_begin) * timeBase;
+ const double dt = (p->ti_end - p->ti_begin) * timeBase;
- cooling_cool_part(constants, us, cooling_func, p, xp, dt);
+ cooling_cool_part(constants, us, cooling_func, p, xp, dt);
+ }
}
}
@@ -503,7 +495,6 @@ void runner_do_init(struct runner *r, struct cell *c, int timer) {
if (c->split) {
for (int k = 0; k < 8; k++)
if (c->progeny[k] != NULL) runner_do_init(r, c->progeny[k], 0);
- return;
} else {
/* Loop over the parts in this cell. */
@@ -542,8 +533,9 @@ void runner_do_init(struct runner *r, struct cell *c, int timer) {
*
* @param r The runner thread.
* @param c The cell.
+ * @param timer Are we timing this ?
*/
-void runner_do_extra_ghost(struct runner *r, struct cell *c) {
+void runner_do_extra_ghost(struct runner *r, struct cell *c, int timer) {
#ifdef EXTRA_HYDRO_LOOP
@@ -551,14 +543,15 @@ void runner_do_extra_ghost(struct runner *r, struct cell *c) {
const int count = c->count;
const int ti_current = r->e->ti_current;
+ TIMER_TIC;
+
/* Anything to do here? */
if (c->ti_end_min > ti_current) return;
/* Recurse? */
if (c->split) {
for (int k = 0; k < 8; k++)
- if (c->progeny[k] != NULL) runner_do_extra_ghost(r, c->progeny[k]);
- return;
+ if (c->progeny[k] != NULL) runner_do_extra_ghost(r, c->progeny[k], 0);
} else {
/* Loop over the parts in this cell. */
@@ -575,6 +568,8 @@ void runner_do_extra_ghost(struct runner *r, struct cell *c) {
}
}
+ if (timer) TIMER_TOC(timer_do_extra_ghost);
+
#else
error("SWIFT was not compiled with the extra hydro loop activated.");
#endif
@@ -586,8 +581,9 @@ void runner_do_extra_ghost(struct runner *r, struct cell *c) {
*
* @param r The runner thread.
* @param c The cell.
+ * @param timer Are we timing this ?
*/
-void runner_do_ghost(struct runner *r, struct cell *c) {
+void runner_do_ghost(struct runner *r, struct cell *c, int timer) {
struct part *restrict parts = c->parts;
struct xpart *restrict xparts = c->xparts;
@@ -610,140 +606,141 @@ void runner_do_ghost(struct runner *r, struct cell *c) {
/* Recurse? */
if (c->split) {
for (int k = 0; k < 8; k++)
- if (c->progeny[k] != NULL) runner_do_ghost(r, c->progeny[k]);
- return;
- }
+ if (c->progeny[k] != NULL) runner_do_ghost(r, c->progeny[k], 0);
+ } else {
- /* Init the IDs that have to be updated. */
- int *pid = NULL;
- if ((pid = malloc(sizeof(int) * count)) == NULL)
- error("Can't allocate memory for pid.");
- for (int k = 0; k < count; k++) pid[k] = k;
+ /* Init the IDs that have to be updated. */
+ int *pid = NULL;
+ if ((pid = malloc(sizeof(int) * count)) == NULL)
+ error("Can't allocate memory for pid.");
+ for (int k = 0; k < count; k++) pid[k] = k;
- /* While there are particles that need to be updated... */
- for (int num_reruns = 0; count > 0 && num_reruns < max_smoothing_iter;
- num_reruns++) {
+ /* While there are particles that need to be updated... */
+ for (int num_reruns = 0; count > 0 && num_reruns < max_smoothing_iter;
+ num_reruns++) {
- /* Reset the redo-count. */
- redo = 0;
+ /* Reset the redo-count. */
+ redo = 0;
- /* Loop over the parts in this cell. */
- for (int i = 0; i < count; i++) {
+ /* Loop over the parts in this cell. */
+ for (int i = 0; i < count; i++) {
- /* Get a direct pointer on the part. */
- struct part *restrict p = &parts[pid[i]];
- struct xpart *restrict xp = &xparts[pid[i]];
+ /* Get a direct pointer on the part. */
+ struct part *restrict p = &parts[pid[i]];
+ struct xpart *restrict xp = &xparts[pid[i]];
- /* Is this part within the timestep? */
- if (p->ti_end <= ti_current) {
+ /* Is this part within the timestep? */
+ if (p->ti_end <= ti_current) {
- /* Finish the density calculation */
- hydro_end_density(p, ti_current);
+ /* Finish the density calculation */
+ hydro_end_density(p, ti_current);
- float h_corr = 0.f;
+ float h_corr = 0.f;
- /* If no derivative, double the smoothing length. */
- if (p->density.wcount_dh == 0.0f) h_corr = p->h;
+ /* If no derivative, double the smoothing length. */
+ if (p->density.wcount_dh == 0.0f) h_corr = p->h;
- /* Otherwise, compute the smoothing length update (Newton step). */
- else {
- h_corr = (target_wcount - p->density.wcount) / p->density.wcount_dh;
+ /* Otherwise, compute the smoothing length update (Newton step). */
+ else {
+ h_corr = (target_wcount - p->density.wcount) / p->density.wcount_dh;
- /* Truncate to the range [ -p->h/2 , p->h ]. */
- h_corr = (h_corr < p->h) ? h_corr : p->h;
- h_corr = (h_corr > -0.5f * p->h) ? h_corr : -0.5f * p->h;
- }
+ /* Truncate to the range [ -p->h/2 , p->h ]. */
+ h_corr = (h_corr < p->h) ? h_corr : p->h;
+ h_corr = (h_corr > -0.5f * p->h) ? h_corr : -0.5f * p->h;
+ }
- /* Did we get the right number density? */
- if (p->density.wcount > max_wcount || p->density.wcount < min_wcount) {
+ /* Did we get the right number density? */
+ if (p->density.wcount > max_wcount ||
+ p->density.wcount < min_wcount) {
- /* Ok, correct then */
- p->h += h_corr;
+ /* Ok, correct then */
+ p->h += h_corr;
- /* Flag for another round of fun */
- pid[redo] = pid[i];
- redo += 1;
+ /* Flag for another round of fun */
+ pid[redo] = pid[i];
+ redo += 1;
- /* Re-initialise everything */
- hydro_init_part(p);
+ /* Re-initialise everything */
+ hydro_init_part(p);
- /* Off we go ! */
- continue;
- }
+ /* Off we go ! */
+ continue;
+ }
- /* We now have a particle whose smoothing length has converged */
+ /* We now have a particle whose smoothing length has converged */
- /* As of here, particle force variables will be set. */
+ /* As of here, particle force variables will be set. */
- /* Compute variables required for the force loop */
- hydro_prepare_force(p, xp, ti_current, timeBase);
+ /* Compute variables required for the force loop */
+ hydro_prepare_force(p, xp, ti_current, timeBase);
- /* The particle force values are now set. Do _NOT_
- try to read any particle density variables! */
+ /* The particle force values are now set. Do _NOT_
+ try to read any particle density variables! */
- /* Prepare the particle for the force loop over neighbours */
- hydro_reset_acceleration(p);
+ /* Prepare the particle for the force loop over neighbours */
+ hydro_reset_acceleration(p);
+ }
}
- }
- /* We now need to treat the particles whose smoothing length had not
- * converged again */
+ /* We now need to treat the particles whose smoothing length had not
+ * converged again */
- /* Re-set the counter for the next loop (potentially). */
- count = redo;
- if (count > 0) {
+ /* Re-set the counter for the next loop (potentially). */
+ count = redo;
+ if (count > 0) {
- /* Climb up the cell hierarchy. */
- for (struct cell *finger = c; finger != NULL; finger = finger->parent) {
+ /* Climb up the cell hierarchy. */
+ for (struct cell *finger = c; finger != NULL; finger = finger->parent) {
- /* Run through this cell's density interactions. */
- for (struct link *l = finger->density; l != NULL; l = l->next) {
+ /* Run through this cell's density interactions. */
+ for (struct link *l = finger->density; l != NULL; l = l->next) {
- /* Self-interaction? */
- if (l->t->type == task_type_self)
- runner_doself_subset_density(r, finger, parts, pid, count);
+ /* Self-interaction? */
+ if (l->t->type == task_type_self)
+ runner_doself_subset_density(r, finger, parts, pid, count);
- /* Otherwise, pair interaction? */
- else if (l->t->type == task_type_pair) {
+ /* Otherwise, pair interaction? */
+ else if (l->t->type == task_type_pair) {
- /* Left or right? */
- if (l->t->ci == finger)
- runner_dopair_subset_density(r, finger, parts, pid, count,
- l->t->cj);
- else
- runner_dopair_subset_density(r, finger, parts, pid, count,
- l->t->ci);
+ /* Left or right? */
+ if (l->t->ci == finger)
+ runner_dopair_subset_density(r, finger, parts, pid, count,
+ l->t->cj);
+ else
+ runner_dopair_subset_density(r, finger, parts, pid, count,
+ l->t->ci);
- }
+ }
- /* Otherwise, sub-self interaction? */
- else if (l->t->type == task_type_sub_self)
- runner_dosub_subset_density(r, finger, parts, pid, count, NULL, -1,
- 1);
-
- /* Otherwise, sub-pair interaction? */
- else if (l->t->type == task_type_sub_pair) {
-
- /* Left or right? */
- if (l->t->ci == finger)
- runner_dosub_subset_density(r, finger, parts, pid, count,
- l->t->cj, -1, 1);
- else
- runner_dosub_subset_density(r, finger, parts, pid, count,
- l->t->ci, -1, 1);
+ /* Otherwise, sub-self interaction? */
+ else if (l->t->type == task_type_sub_self)
+ runner_dosub_subset_density(r, finger, parts, pid, count, NULL,
+ -1, 1);
+
+ /* Otherwise, sub-pair interaction? */
+ else if (l->t->type == task_type_sub_pair) {
+
+ /* Left or right? */
+ if (l->t->ci == finger)
+ runner_dosub_subset_density(r, finger, parts, pid, count,
+ l->t->cj, -1, 1);
+ else
+ runner_dosub_subset_density(r, finger, parts, pid, count,
+ l->t->ci, -1, 1);
+ }
}
}
}
}
- }
- if (count)
- message("Smoothing length failed to converge on %i particles.", count);
+ if (count)
+ message("Smoothing length failed to converge on %i particles.", count);
- /* Be clean */
- free(pid);
+ /* Be clean */
+ free(pid);
+ }
- TIMER_TOC(timer_do_ghost);
+ if (timer) TIMER_TOC(timer_do_ghost);
}
/**
@@ -918,10 +915,6 @@ void runner_do_kick(struct runner *r, struct cell *c, int timer) {
return;
}
-#ifdef TASK_VERBOSE
- OUT;
-#endif
-
int updated = 0, g_updated = 0;
int ti_end_min = max_nr_timesteps, ti_end_max = 0;
@@ -1224,11 +1217,11 @@ void *runner_main(void *data) {
runner_do_init(r, ci, 1);
break;
case task_type_ghost:
- runner_do_ghost(r, ci);
+ runner_do_ghost(r, ci, 1);
break;
#ifdef EXTRA_HYDRO_LOOP
case task_type_extra_ghost:
- runner_do_extra_ghost(r, ci);
+ runner_do_extra_ghost(r, ci, 1);
break;
#endif
case task_type_kick:
diff --git a/src/runner.h b/src/runner.h
index bffd3562df76d449d2bca762458c3d0d9b084b35..a8caf24248c99438f16729e2cac3e1031535f62b 100644
--- a/src/runner.h
+++ b/src/runner.h
@@ -48,11 +48,13 @@ struct runner {
};
/* Function prototypes. */
-void runner_do_ghost(struct runner *r, struct cell *c);
+void runner_do_ghost(struct runner *r, struct cell *c, int timer);
+void runner_do_extra_ghost(struct runner *r, struct cell *c, int timer);
void runner_do_sort(struct runner *r, struct cell *c, int flag, int clock);
void runner_do_kick(struct runner *r, struct cell *c, int timer);
void runner_do_init(struct runner *r, struct cell *c, int timer);
void runner_do_cooling(struct runner *r, struct cell *c, int timer);
+void runner_do_grav_external(struct runner *r, struct cell *c, int timer);
void *runner_main(void *data);
void runner_do_drift_mapper(void *map_data, int num_elements, void *extra_data);
diff --git a/src/timers.h b/src/timers.h
index d75508afd88cf2fd57d06f9530bff8607d79d127..bc877d4094425a4948290d2c7c099f49cbd44280 100644
--- a/src/timers.h
+++ b/src/timers.h
@@ -56,6 +56,7 @@ enum {
timer_dosub_pair_grav,
timer_dopair_subset,
timer_do_ghost,
+ timer_do_extra_ghost,
timer_dorecv_cell,
timer_gettask,
timer_qget,