diff --git a/src/cell.h b/src/cell.h
index a64cc3fe423700e122e852c1fe982adc8046a2bf..57c76ca51895e205f7f0a3b43836117909658c01 100644
--- a/src/cell.h
+++ b/src/cell.h
@@ -205,10 +205,10 @@ struct pcell_step {
*/
struct cell {
- int num_hydro_proxies;
- int num_grav_proxies;
- int num_foreign_pair_hydro;
- int num_foreign_pair_grav;
+ /* 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 31ee8f761bc56c17b1f7b853027f97e77341c665..7c117cc72518b53eb4f3b72a32826a032e7e755e 100644
--- a/src/engine.c
+++ b/src/engine.c
@@ -3660,10 +3660,10 @@ 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;
- }
+ /* 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 */
@@ -3786,7 +3786,7 @@ void engine_makeproxies(struct engine *e) {
e->nr_proxies += 1;
/* Check the maximal proxy limit */
- if (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,10 +3797,10 @@ 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++;
+ /* 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 +3825,7 @@ void engine_makeproxies(struct engine *e) {
e->nr_proxies += 1;
/* Check the maximal proxy limit */
- if (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,10 +3836,10 @@ 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++;
+ /* 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 c2c07c9462c7e4784258bd1b4ce658476b295d6f..709cdf2f76db6b9bc12606c07a144ede32d580ec 100644
--- a/src/engine_maketasks.c
+++ b/src/engine_maketasks.c
@@ -902,10 +902,10 @@ void engine_make_self_gravity_tasks_mapper(void *map_data, int num_elements,
}
#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);
+ /* 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); */
}
}
}
@@ -948,9 +948,9 @@ 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;
- }
+ /* 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,
@@ -1864,10 +1864,10 @@ void engine_make_hydroloop_tasks_mapper(void *map_data, int num_elements,
}
#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);
+ /* 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); */
}
}
}
@@ -1892,9 +1892,9 @@ 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;
- }
+ /* 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)
@@ -2043,16 +2043,16 @@ 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);
- }
+ /* 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)
@@ -2166,14 +2166,14 @@ void engine_maketasks(struct engine *e) {
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);
- }
+ /* 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); */
+ /* } */
}