diff --git a/src/cell.h b/src/cell.h
index 57c76ca51895e205f7f0a3b43836117909658c01..668314e1680417c928de618bbf4070e552ecdef4 100644
--- a/src/cell.h
+++ b/src/cell.h
@@ -205,11 +205,6 @@ struct pcell_step {
*/
struct cell {
- /* int num_hydro_proxies; */
- /* int num_grav_proxies; */
- /* int num_foreign_pair_hydro; */
- /* int num_foreign_pair_grav; */
-
/*! The cell location on the grid. */
double loc[3];
diff --git a/src/engine.c b/src/engine.c
index 7c117cc72518b53eb4f3b72a32826a032e7e755e..568a822a34285818f29488599bf028c39a2b1e5a 100644
--- a/src/engine.c
+++ b/src/engine.c
@@ -3615,8 +3615,6 @@ void engine_makeproxies(struct engine *e) {
const double max_mesh_dist = e->mesh->r_cut_max;
const double max_mesh_dist2 = max_mesh_dist * max_mesh_dist;
- message("max_dist = %e", max_mesh_dist2);
-
/* Distance between centre of the cell and corners */
const double r_diag2 = cell_width[0] * cell_width[0] +
cell_width[1] * cell_width[1] +
@@ -3660,12 +3658,6 @@ void engine_makeproxies(struct engine *e) {
}
}
- /* for (int i = 0; i < e->s->nr_cells; ++i) { */
- /* cells[i].num_hydro_proxies = 0; */
- /* cells[i].num_grav_proxies = 0; */
- /* } */
-
- message("delta_m=%d delta_p=%d", delta_m, delta_p);
/* Let's be verbose about this choice */
if (e->verbose)
message(
@@ -3698,7 +3690,7 @@ void engine_makeproxies(struct engine *e) {
/* Get the cell ID. */
const int cjd = cell_getid(cdim, iii, jjj, kkk);
- /* Early abort (same cell) */
+ /* Early abort */
if (cid >= cjd) continue;
/* Early abort (both same node) */
@@ -3786,7 +3778,7 @@ void engine_makeproxies(struct engine *e) {
e->nr_proxies += 1;
/* Check the maximal proxy limit */
- if ((size_t) proxy_id > 8 * sizeof(long long))
+ if ((size_t)proxy_id > 8 * sizeof(long long))
error(
"Created more than %zd proxies. cell.mpi.sendto will "
"overflow.",
@@ -3797,11 +3789,6 @@ void engine_makeproxies(struct engine *e) {
proxy_addcell_in(&proxies[proxy_id], &cells[cjd], proxy_type);
proxy_addcell_out(&proxies[proxy_id], &cells[cid], proxy_type);
- /* if (proxy_type & (int)proxy_cell_type_gravity) */
- /* cells[cid].num_grav_proxies++; */
- /* if (proxy_type & (int)proxy_cell_type_hydro) */
- /* cells[cid].num_hydro_proxies++; */
-
/* Store info about where to send the cell */
cells[cid].mpi.sendto |= (1ULL << proxy_id);
}
@@ -3825,7 +3812,7 @@ void engine_makeproxies(struct engine *e) {
e->nr_proxies += 1;
/* Check the maximal proxy limit */
- if ((size_t) proxy_id > 8 * sizeof(long long))
+ if ((size_t)proxy_id > 8 * sizeof(long long))
error(
"Created more than %zd proxies. cell.mpi.sendto will "
"overflow.",
@@ -3836,11 +3823,6 @@ void engine_makeproxies(struct engine *e) {
proxy_addcell_in(&proxies[proxy_id], &cells[cid], proxy_type);
proxy_addcell_out(&proxies[proxy_id], &cells[cjd], proxy_type);
- /* if (proxy_type & (int)proxy_cell_type_gravity) */
- /* cells[cjd].num_grav_proxies++; */
- /* if (proxy_type & (int)proxy_cell_type_hydro) */
- /* cells[cjd].num_hydro_proxies++; */
-
/* Store info about where to send the cell */
cells[cjd].mpi.sendto |= (1ULL << proxy_id);
}
diff --git a/src/engine_maketasks.c b/src/engine_maketasks.c
index 709cdf2f76db6b9bc12606c07a144ede32d580ec..35d9a420bc4d15b8bfa3dfcd60e9517fcf32b4fc 100644
--- a/src/engine_maketasks.c
+++ b/src/engine_maketasks.c
@@ -854,6 +854,7 @@ void engine_make_self_gravity_tasks_mapper(void *map_data, int num_elements,
scheduler_addtask(sched, task_type_pair, task_subtype_grav, 0, 0,
ci, cj);
+#ifdef SWIFT_DEBUG_CHECKS
#ifdef WITH_MPI
/* Let's cross-check that we had a proxy for that cell */
@@ -900,12 +901,8 @@ void engine_make_self_gravity_tasks_mapper(void *map_data, int num_elements,
"grav task!",
cid);
}
-#endif
-
- /* if (ci->nodeID == nodeID && cj->nodeID != engine_rank) */
- /* atomic_inc(&ci->num_foreign_pair_grav); */
- /* if (cj->nodeID == nodeID && ci->nodeID != engine_rank) */
- /* atomic_inc(&cj->num_foreign_pair_grav); */
+#endif /* WITH_MPI */
+#endif /* SWIFT_DEBUG_CHECKS */
}
}
}
@@ -948,10 +945,6 @@ void engine_make_self_gravity_tasks(struct engine *e) {
struct space *s = e->s;
- /* for (int i = 0; i < s->nr_cells; ++i) { */
- /* s->cells_top[i].num_foreign_pair_grav = 0; */
- /* } */
-
/* Create the multipole self and pair tasks. */
threadpool_map(&e->threadpool, engine_make_self_gravity_tasks_mapper, NULL,
s->nr_cells, 1, 0, e);
@@ -1822,6 +1815,7 @@ void engine_make_hydroloop_tasks_mapper(void *map_data, int num_elements,
scheduler_addtask(sched, task_type_pair, task_subtype_density, sid, 0,
ci, cj);
+#ifdef SWIFT_DEBUG_CHECKS
#ifdef WITH_MPI
/* Let's cross-check that we had a proxy for that cell */
@@ -1862,12 +1856,8 @@ void engine_make_hydroloop_tasks_mapper(void *map_data, int num_elements,
"hydro task!",
cid);
}
-#endif
-
- /* if (ci->nodeID == nodeID && cj->nodeID != engine_rank) */
- /* atomic_inc(&ci->num_foreign_pair_hydro); */
- /* if (cj->nodeID == nodeID && ci->nodeID != engine_rank) */
- /* atomic_inc(&cj->num_foreign_pair_hydro); */
+#endif /* WITH_MPI */
+#endif /* SWIFT_DEBUG_CHECKS */
}
}
}
@@ -1892,10 +1882,6 @@ void engine_maketasks(struct engine *e) {
ticks tic2 = getticks();
- /* for (int i = 0; i < s->nr_cells; ++i) { */
- /* s->cells_top[i].num_foreign_pair_hydro = 0; */
- /* } */
-
/* Construct the first hydro loop over neighbours */
if (e->policy & engine_policy_hydro)
threadpool_map(&e->threadpool, engine_make_hydroloop_tasks_mapper, NULL,
@@ -2043,17 +2029,6 @@ void engine_maketasks(struct engine *e) {
message("Linking stars tasks took %.3f %s (including reweight).",
clocks_from_ticks(getticks() - tic2), clocks_getunit());
- /* if (e->nodeID == 0) */
- /* for (int i = 0; i < e->s->nr_cells; ++i) { */
- /* message( */
- /* "cid= %d num_grav_proxy= %d num_hydro_proxy= %d num_foreign_grav= %d " */
- /* "num_foreign_hydro= %d", */
- /* i, e->s->cells_top[i].num_grav_proxies, */
- /* e->s->cells_top[i].num_hydro_proxies, */
- /* e->s->cells_top[i].num_foreign_pair_grav, */
- /* e->s->cells_top[i].num_foreign_pair_hydro); */
- /* } */
-
#ifdef WITH_MPI
if (e->policy & engine_policy_feedback)
error("Cannot run stellar feedback with MPI (yet).");
@@ -2165,15 +2140,4 @@ void engine_maketasks(struct engine *e) {
if (e->verbose)
message("took %.3f %s (including reweight).",
clocks_from_ticks(getticks() - tic), clocks_getunit());
-
- /* if (e->nodeID == 0) */
- /* for (int i = 0; i < e->s->nr_cells; ++i) { */
- /* message( */
- /* "cid= %d num_grav_proxy= %d num_hydro_proxy= %d num_foreign_grav= %d " */
- /* "num_foreign_hydro= %d", */
- /* i, e->s->cells_top[i].num_grav_proxies, */
- /* e->s->cells_top[i].num_hydro_proxies, */
- /* e->s->cells_top[i].num_foreign_pair_grav, */
- /* e->s->cells_top[i].num_foreign_pair_hydro); */
- /* } */
}