diff --git a/src/runner.c b/src/runner.c
index 6b8a9605299eed9f8bff967af6a425660dd7f3df..2275710a5d601d48ed052020d786e5899f05ffcc 100644
--- a/src/runner.c
+++ b/src/runner.c
@@ -107,7 +107,7 @@ const char runner_flip[27] = {1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 0,
* @param c cell
* @param timer 1 if the time is to be recorded.
*/
-void runner_dograv_external(struct runner *r, struct cell *c, int timer) {
+void runner_do_grav_external(struct runner *r, struct cell *c, int timer) {
struct gpart *g, *gparts = c->gparts;
int i, k, gcount = c->gcount;
@@ -120,7 +120,7 @@ void runner_dograv_external(struct runner *r, struct cell *c, int timer) {
/* Recurse? */
if (c->split) {
for (k = 0; k < 8; k++)
- if (c->progeny[k] != NULL) runner_dograv_external(r, c->progeny[k], 0);
+ if (c->progeny[k] != NULL) runner_do_grav_external(r, c->progeny[k], 0);
return;
}
@@ -196,7 +196,7 @@ void runner_dograv_external(struct runner *r, struct cell *c, int timer) {
* @param N The number of entries.
*/
-void runner_dosort_ascending(struct entry *sort, int N) {
+void runner_do_sort_ascending(struct entry *sort, int N) {
struct {
short int lo, hi;
@@ -278,7 +278,7 @@ void runner_dosort_ascending(struct entry *sort, int N) {
* for recursive calls.
*/
-void runner_dosort(struct runner *r, struct cell *c, int flags, int clock) {
+void runner_do_sort(struct runner *r, struct cell *c, int flags, int clock) {
struct entry *finger;
struct entry *fingers[8];
@@ -312,7 +312,7 @@ void runner_dosort(struct runner *r, struct cell *c, int flags, int clock) {
for (k = 0; k < 8; k++) {
if (c->progeny[k] == NULL) continue;
missing = flags & ~c->progeny[k]->sorted;
- if (missing) runner_dosort(r, c->progeny[k], missing, 0);
+ if (missing) runner_do_sort(r, c->progeny[k], missing, 0);
}
/* Loop over the 13 different sort arrays. */
@@ -402,7 +402,7 @@ void runner_dosort(struct runner *r, struct cell *c, int flags, int clock) {
if (flags & (1 << j)) {
sort[j * (count + 1) + count].d = FLT_MAX;
sort[j * (count + 1) + count].i = 0;
- runner_dosort_ascending(&sort[j * (count + 1)], count);
+ runner_do_sort_ascending(&sort[j * (count + 1)], count);
c->sorted |= (1 << j);
}
}
@@ -423,7 +423,7 @@ void runner_dosort(struct runner *r, struct cell *c, int flags, int clock) {
if (clock) TIMER_TOC(timer_dosort);
}
-void runner_dogsort(struct runner *r, struct cell *c, int flags, int clock) {
+void runner_do_gsort(struct runner *r, struct cell *c, int flags, int clock) {
struct entry *finger;
struct entry *fingers[8];
@@ -457,7 +457,7 @@ void runner_dogsort(struct runner *r, struct cell *c, int flags, int clock) {
for (k = 0; k < 8; k++) {
if (c->progeny[k] == NULL) continue;
missing = flags & ~c->progeny[k]->gsorted;
- if (missing) runner_dogsort(r, c->progeny[k], missing, 0);
+ if (missing) runner_do_gsort(r, c->progeny[k], missing, 0);
}
/* Loop over the 13 different sort arrays. */
@@ -547,7 +547,7 @@ void runner_dogsort(struct runner *r, struct cell *c, int flags, int clock) {
if (flags & (1 << j)) {
gsort[j * (count + 1) + count].d = FLT_MAX;
gsort[j * (count + 1) + count].i = 0;
- runner_dosort_ascending(&gsort[j * (count + 1)], count);
+ runner_do_sort_ascending(&gsort[j * (count + 1)], count);
c->gsorted |= (1 << j);
}
}
@@ -1333,7 +1333,7 @@ void *runner_main(void *data) {
error("Unknown task subtype.");
break;
case task_type_sort:
- runner_dosort(r, ci, t->flags, 1);
+ runner_do_sort(r, ci, t->flags, 1);
break;
case task_type_sub:
if (t->subtype == task_subtype_density)
@@ -1378,7 +1378,7 @@ void *runner_main(void *data) {
runner_dograv_down(r, t->ci);
break;
case task_type_grav_external:
- runner_dograv_external(r, t->ci, 1);
+ runner_do_grav_external(r, t->ci, 1);
break;
case task_type_part_sort:
space_do_parts_sort();
diff --git a/src/runner.h b/src/runner.h
index 04d36ac683f3c925d24150f082fdfff302373db1..2ba06f93005ab7dbfbbf05af05fc2d0581557a4f 100644
--- a/src/runner.h
+++ b/src/runner.h
@@ -48,11 +48,11 @@ struct runner {
/* Function prototypes. */
void runner_do_cellhierarchy(struct runner *r, struct cell *c);
-void runner_dosort(struct runner *r, struct cell *c, int flag, int clock);
-void runner_dogsort(struct runner *r, struct cell *c, int flag, int clock);
-void runner_dokick(struct runner *r, struct cell *c, int timer);
-void runner_dodrift(struct runner *r, struct cell *c, int timer);
-void runner_doinit(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_gsort(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_drift(struct runner *r, struct cell *c, int timer);
+void runner_do_init(struct runner *r, struct cell *c, int timer);
void *runner_main(void *data);
#endif /* SWIFT_RUNNER_H */
diff --git a/src/runner_doiact.h b/src/runner_doiact.h
index de339db6133fcc829bdc6ee0ce9e537b68982422..97e22138b6c09750c1737741f58e61744a891c98 100644
--- a/src/runner_doiact.h
+++ b/src/runner_doiact.h
@@ -1982,8 +1982,8 @@ void DOSUB1(struct runner *r, struct cell *ci, struct cell *cj, int sid,
else if (ci->ti_end_min <= ti_current || cj->ti_end_min <= ti_current) {
/* Do any of the cells need to be sorted first? */
- if (!(ci->sorted & (1 << sid))) runner_dosort(r, ci, (1 << sid), 1);
- if (!(cj->sorted & (1 << sid))) runner_dosort(r, cj, (1 << sid), 1);
+ if (!(ci->sorted & (1 << sid))) runner_do_sort(r, ci, (1 << sid), 1);
+ if (!(cj->sorted & (1 << sid))) runner_do_sort(r, cj, (1 << sid), 1);
/* Compute the interactions. */
DOPAIR1(r, ci, cj);
@@ -2251,8 +2251,8 @@ void DOSUB2(struct runner *r, struct cell *ci, struct cell *cj, int sid,
else if (ci->ti_end_min <= ti_current || cj->ti_end_min <= ti_current) {
/* Do any of the cells need to be sorted first? */
- if (!(ci->sorted & (1 << sid))) runner_dosort(r, ci, (1 << sid), 1);
- if (!(cj->sorted & (1 << sid))) runner_dosort(r, cj, (1 << sid), 1);
+ if (!(ci->sorted & (1 << sid))) runner_do_sort(r, ci, (1 << sid), 1);
+ if (!(cj->sorted & (1 << sid))) runner_do_sort(r, cj, (1 << sid), 1);
/* Compute the interactions. */
DOPAIR2(r, ci, cj);
@@ -2850,7 +2850,7 @@ void DOSUB_SUBSET(struct runner *r, struct cell *ci, struct part *parts,
sid = sortlistID[sid];
/* Do any of the cells need to be sorted first? */
- if (!(cj->sorted & (1 << sid))) runner_dosort(r, cj, (1 << sid), 1);
+ if (!(cj->sorted & (1 << sid))) runner_do_sort(r, cj, (1 << sid), 1);
/* Compute the interactions. */
DOPAIR_SUBSET(r, ci, parts, ind, count, cj);
diff --git a/src/runner_doiact_grav.h b/src/runner_doiact_grav.h
index 02626295a49f314fef840bc044a476f5c9cf332d..75775c24d1d35eaef2cde66a08c4f13561ef0ae4 100644
--- a/src/runner_doiact_grav.h
+++ b/src/runner_doiact_grav.h
@@ -60,8 +60,8 @@ void runner_dopair_grav_new(struct runner *r, struct cell *ci,
sid = space_getsid(e->s, &ci, &cj, shift);
/* Make sure the cells are sorted. */
- runner_dogsort(r, ci, (1 << sid), 0);
- runner_dogsort(r, cj, (1 << sid), 0);
+ runner_do_gsort(r, ci, (1 << sid), 0);
+ runner_do_gsort(r, cj, (1 << sid), 0);
/* Have the cells been sorted? */
if (!(ci->gsorted & (1 << sid)) || !(cj->gsorted & (1 << sid)))