diff --git a/src/collectgroup.c b/src/collectgroup.c
index 221bd82c7c16976298e9fa7309b6fb99c9c91f26..b704a0a5ea33cc1c5332fc0575061ad8e38f4d21 100644
--- a/src/collectgroup.c
+++ b/src/collectgroup.c
@@ -99,9 +99,18 @@ void collectgroup1_apply(struct collectgroup1 *grp1, struct engine *e) {
* @param g_updates the number of updated gravity particles on this node this
* step.
* @param s_updates the number of updated star particles on this node this step.
- * @param ti_end_min the minimum end time for next time step after this step.
- * @param ti_end_max the maximum end time for next time step after this step.
- * @param ti_beg_max the maximum begin time for next time step after this step.
+ * @param ti_hydro_end_min the minimum end time for next hydro time step after
+ * this step.
+ * @param ti_hydro_end_max the maximum end time for next hydro time step after
+ * this step.
+ * @param ti_hydro_beg_max the maximum begin time for next hydro time step after
+ * this step.
+ * @param ti_gravity_end_min the minimum end time for next gravity time step
+ * after this step.
+ * @param ti_gravity_end_max the maximum end time for next gravity time step
+ * after this step.
+ * @param ti_gravity_beg_max the maximum begin time for next gravity time step
+ * after this step.
* @param forcerebuild whether a rebuild is required after this step.
*/
void collectgroup1_init(struct collectgroup1 *grp1, size_t updates,
diff --git a/src/engine.c b/src/engine.c
index 1f4a05f08971ea9905ce8b7dec58690b5784a569..497e453ec14767df9a422f810e6ec447243c525c 100644
--- a/src/engine.c
+++ b/src/engine.c
@@ -1543,10 +1543,10 @@ void engine_exchange_cells(struct engine *e) {
size_t count_parts_in = 0, count_gparts_in = 0, count_sparts_in = 0;
for (int k = 0; k < nr_proxies; k++)
for (int j = 0; j < e->proxies[k].nr_cells_in; j++) {
- if(e->proxies[k].cells_in_type[j] & proxy_cell_type_hydro)
- count_parts_in += e->proxies[k].cells_in[j]->count;
- if(e->proxies[k].cells_in_type[j] & proxy_cell_type_gravity)
- count_gparts_in += e->proxies[k].cells_in[j]->gcount;
+ if (e->proxies[k].cells_in_type[j] & proxy_cell_type_hydro)
+ count_parts_in += e->proxies[k].cells_in[j]->count;
+ if (e->proxies[k].cells_in_type[j] & proxy_cell_type_gravity)
+ count_gparts_in += e->proxies[k].cells_in[j]->gcount;
count_sparts_in += e->proxies[k].cells_in[j]->scount;
}
if (count_parts_in > s->size_parts_foreign) {
@@ -1577,15 +1577,15 @@ void engine_exchange_cells(struct engine *e) {
struct spart *sparts = s->sparts_foreign;
for (int k = 0; k < nr_proxies; k++) {
for (int j = 0; j < e->proxies[k].nr_cells_in; j++) {
-
- if(e->proxies[k].cells_in_type[j] & proxy_cell_type_hydro) {
- cell_link_parts(e->proxies[k].cells_in[j], parts);
- parts = &parts[e->proxies[k].cells_in[j]->count];
+
+ if (e->proxies[k].cells_in_type[j] & proxy_cell_type_hydro) {
+ cell_link_parts(e->proxies[k].cells_in[j], parts);
+ parts = &parts[e->proxies[k].cells_in[j]->count];
}
- if(e->proxies[k].cells_in_type[j] & proxy_cell_type_gravity) {
- cell_link_gparts(e->proxies[k].cells_in[j], gparts);
- gparts = &gparts[e->proxies[k].cells_in[j]->gcount];
+ if (e->proxies[k].cells_in_type[j] & proxy_cell_type_gravity) {
+ cell_link_gparts(e->proxies[k].cells_in[j], gparts);
+ gparts = &gparts[e->proxies[k].cells_in[j]->gcount];
}
cell_link_sparts(e->proxies[k].cells_in[j], sparts);
@@ -3451,65 +3451,14 @@ void engine_print_task_counts(struct engine *e) {
const int nr_tasks = sched->nr_tasks;
const struct task *const tasks = sched->tasks;
- int count_send_ti = 0;
- int count_recv_ti = 0;
- int count_send_gpart = 0;
- int count_recv_gpart = 0;
- int count_send_xv = 0;
- int count_recv_xv = 0;
- int count_send_rho = 0;
- int count_recv_rho = 0;
-
/* Count and print the number of each task type. */
int counts[task_type_count + 1];
for (int k = 0; k <= task_type_count; k++) counts[k] = 0;
for (int k = 0; k < nr_tasks; k++) {
if (tasks[k].skip)
counts[task_type_count] += 1;
- else {
+ else
counts[(int)tasks[k].type] += 1;
-
- if (tasks[k].type == task_type_send &&
- tasks[k].subtype == task_subtype_tend) {
- count_send_ti++;
- /* message("Send_ti: nodeID_i=%d cellID_i=%ld nodeID_j=%d cellID_j=%ld",
- */
- /* tasks[k].ci->nodeID, tasks[k].ci - e->s->cells_top, */
- /* tasks[k].cj->nodeID, tasks[k].cj - e->s->cells_top); */
- }
- if (tasks[k].type == task_type_recv &&
- tasks[k].subtype == task_subtype_tend) {
- count_recv_ti++;
- /* message("recv_rho: nodeID_i=%d cellID_i=%ld nodeID_j=n/a
- * cellID_j=n/a", */
- /* tasks[k].ci->nodeID, tasks[k].ci - e->s->cells_top ); */
- }
- if (tasks[k].type == task_type_send &&
- tasks[k].subtype == task_subtype_gpart)
- count_send_gpart++;
- if (tasks[k].type == task_type_recv &&
- tasks[k].subtype == task_subtype_gpart)
- count_recv_gpart++;
- if (tasks[k].type == task_type_send &&
- tasks[k].subtype == task_subtype_xv)
- count_send_xv++;
- if (tasks[k].type == task_type_recv &&
- tasks[k].subtype == task_subtype_xv)
- count_recv_xv++;
- if (tasks[k].type == task_type_send &&
- tasks[k].subtype == task_subtype_rho) {
- count_send_rho++;
- /* message("Send_rho: nodeID_i=%d cellID_i=%ld nodeID_j=%d cellID_j=%ld", */
- /* tasks[k].ci->nodeID, tasks[k].ci - e->s->cells_top, */
- /* tasks[k].cj->nodeID, tasks[k].cj - e->s->cells_top); */
- }
- if (tasks[k].type == task_type_recv &&
- tasks[k].subtype == task_subtype_rho) {
- count_recv_rho++;
- /* message("recv_rho: nodeID_i=%d cellID_i=%ld nodeID_j=n/a cellID_j=n/a", */
- /* tasks[k].ci->nodeID, tasks[k].ci - e->s->cells_top); */
- }
- }
}
message("Total = %d (per cell = %d)", nr_tasks,
(int)ceil((double)nr_tasks / e->s->tot_cells));
@@ -3524,15 +3473,9 @@ void engine_print_task_counts(struct engine *e) {
printf(" %s=%i", taskID_names[k], counts[k]);
printf(" skipped=%i ]\n", counts[task_type_count]);
fflush(stdout);
- /* message("nr_parts = %zu.", e->s->nr_parts); */
- /* message("nr_gparts = %zu.", e->s->nr_gparts); */
- /* message("nr_sparts = %zu.", e->s->nr_sparts); */
- message("ti_current=%lld", e->ti_current);
- message(
- "send_ti=%d, recv_ti=%d, send_gpart=%d, recv_gpart=%d, send_xv=%d, "
- "recv_xv=%d, send_rho=%d, recv_rho=%d",
- count_send_ti, count_recv_ti, count_send_gpart, count_recv_gpart,
- count_send_xv, count_recv_xv, count_send_rho, count_recv_rho);
+ message("nr_parts = %zu.", e->s->nr_parts);
+ message("nr_gparts = %zu.", e->s->nr_gparts);
+ message("nr_sparts = %zu.", e->s->nr_sparts);
if (e->verbose)
message("took %.3f %s.", clocks_from_ticks(getticks() - tic),
@@ -4319,9 +4262,6 @@ void engine_init_particles(struct engine *e, int flag_entropy_ICs,
if (e->verbose) message("took %.3f %s.", e->wallclock_time, clocks_getunit());
}
-/* integertime_t *address_hydro = 0; */
-/* integertime_t *address_gravity = 0; */
-
/**
* @brief Let the #engine loose to compute the forces.
*
@@ -4365,22 +4305,6 @@ void engine_step(struct engine *e) {
/* Prepare the tasks to be launched, rebuild or repartition if needed. */
engine_prepare(e);
- /* engine_print_task_counts(e); */
- /* space_print_cells(e->s); */
-
- /* /\* Register the time-step information *\/ */
- /* if (e->step == 3) { */
-
- /* for (int i = 0; i < e->s->nr_cells; ++i) */
- /* if (&e->s->cells_top[i] - e->s->cells_top == 12) { */
- /* message("Found cell!"); */
- /* address_hydro = &e->s->cells_top[i].ti_hydro_end_min; */
- /* address_gravity = &e->s->cells_top[i].ti_gravity_end_min; */
- /* message("address: %p time_end=%lld", address_hydro, */
- /* e->s->cells_top[i].ti_hydro_end_min); */
- /* } */
- /* } */
-
#ifdef WITH_MPI
/* Repartition the space amongst the nodes? */
engine_repartition_trigger(e);
@@ -4713,13 +4637,13 @@ void engine_makeproxies(struct engine *e) {
/* Compute how many cells away we need to walk */
int delta = 1; /*hydro case */
- if(with_gravity) {
+ if (with_gravity) {
const double distance = 2.5 * cells[0].width[0] / props->theta_crit;
delta = (int)(distance / cells[0].width[0]) + 1;
}
/* Let's be verbose about this choice */
- if(e->verbose)
+ if (e->verbose)
message("Looking for proxies up to %d top-level cells away", delta);
/* Loop over each cell in the space. */
@@ -4731,8 +4655,8 @@ void engine_makeproxies(struct engine *e) {
/* Get the cell ID. */
const int cid = cell_getid(cdim, ind[0], ind[1], ind[2]);
- double CoM_i[3] = {0., 0., 0.};
- double r_max_i = 0.;
+ double CoM_i[3] = {0., 0., 0.};
+ double r_max_i = 0.;
if (with_gravity) {
@@ -4743,7 +4667,7 @@ void engine_makeproxies(struct engine *e) {
CoM_i[2] = multi_i->CoM[2];
r_max_i = multi_i->r_max;
}
-
+
/* Loop over all its neighbours (periodic). */
for (int i = -delta; i <= delta; i++) {
int ii = ind[0] + i;
@@ -4785,11 +4709,14 @@ void engine_makeproxies(struct engine *e) {
/* This is super-ugly but checks for direct neighbours */
/* with periodic BC */
- if (((abs(ind[0] - ii) <= 1 || abs(ind[0] - ii - cdim[0]) <= 1 ||
+ if (((abs(ind[0] - ii) <= 1 ||
+ abs(ind[0] - ii - cdim[0]) <= 1 ||
abs(ind[0] - ii + cdim[0]) <= 1) &&
- (abs(ind[1] - jj) <= 1 || abs(ind[1] - jj - cdim[1]) <= 1 ||
+ (abs(ind[1] - jj) <= 1 ||
+ abs(ind[1] - jj - cdim[1]) <= 1 ||
abs(ind[1] - jj + cdim[1]) <= 1) &&
- (abs(ind[2] - kk) <= 1 || abs(ind[2] - kk - cdim[2]) <= 1 ||
+ (abs(ind[2] - kk) <= 1 ||
+ abs(ind[2] - kk - cdim[2]) <= 1 ||
abs(ind[2] - kk + cdim[2]) <= 1)))
proxy_type |= (int)proxy_cell_type_hydro;
}
diff --git a/src/runner_doiact_vec.c b/src/runner_doiact_vec.c
index bda7dba97d8e9c35e79ec8c16150f3ac6b372809..480fb6a3a4282703790adf87b2bc1872c394f2e2 100644
--- a/src/runner_doiact_vec.c
+++ b/src/runner_doiact_vec.c
@@ -397,15 +397,13 @@ __attribute__((always_inline)) INLINE static void populate_max_index_no_cache(
* @param max_active_bin The largest time-bin active during this step.
*/
__attribute__((always_inline)) INLINE static void
-populate_max_index_no_cache_force(const struct cell *ci, const struct cell *cj,
- const struct entry *restrict sort_i,
- const struct entry *restrict sort_j,
- const float dx_max, const float rshift,
- const double hi_max_raw,
- const double hj_max_raw, const double h_max,
- const double di_max, const double dj_min, int *max_index_i,
- int *max_index_j, int *init_pi, int *init_pj,
- const timebin_t max_active_bin) {
+populate_max_index_no_cache_force(
+ const struct cell *ci, const struct cell *cj,
+ const struct entry *restrict sort_i, const struct entry *restrict sort_j,
+ const float dx_max, const float rshift, const double hi_max_raw,
+ const double hj_max_raw, const double h_max, const double di_max,
+ const double dj_min, int *max_index_i, int *max_index_j, int *init_pi,
+ int *init_pj, const timebin_t max_active_bin) {
const struct part *restrict parts_i = ci->parts;
const struct part *restrict parts_j = cj->parts;
@@ -468,7 +466,7 @@ populate_max_index_no_cache_force(const struct cell *ci, const struct cell *cj,
last_pj = -1;
active_id = last_pj;
while (last_pj < cj->count &&
- sort_j[last_pj + 1].d - h_max - dx_max < di_max) {
+ sort_j[last_pj + 1].d - h_max - dx_max < di_max) {
last_pj++;
/* Store the index of the particle if it is active. */
if (part_is_active_no_debug(&parts_j[sort_j[last_pj].i], max_active_bin))
@@ -1572,9 +1570,9 @@ void runner_dopair2_force_vec(struct runner *r, struct cell *ci,
/* Also find the first pi that interacts with any particle in cj and the last
* pj that interacts with any particle in ci. */
populate_max_index_no_cache_force(ci, cj, sort_i, sort_j, dx_max, rshift,
- hi_max_raw, hj_max_raw, h_max,
- di_max, dj_min, max_index_i, max_index_j,
- &first_pi, &last_pj, max_active_bin);
+ hi_max_raw, hj_max_raw, h_max, di_max,
+ dj_min, max_index_i, max_index_j, &first_pi,
+ &last_pj, max_active_bin);
/* Limits of the outer loops. */
const int first_pi_loop = first_pi;
diff --git a/src/space.c b/src/space.c
index c1dc04ad277e56583ce7cb443a6a865780039d8a..8de790acdf0c6f6efd0ba68ad1b444925ef8cd20 100644
--- a/src/space.c
+++ b/src/space.c
@@ -3198,35 +3198,3 @@ void space_clean(struct space *s) {
free(s->sparts);
}
-void space_print_cells(const struct space *s) {
-
- char filename[200];
- sprintf(filename, "space_%d_%d.dat", s->e->step, engine_rank);
-
- FILE *file = fopen(filename, "w");
-
- fprintf(file, "ti_current=%lld\n", s->e->ti_current);
-
- for (int k = 0; k < s->cdim[2]; ++k) {
-
- fprintf(file, "\n -- k=%d -- \n\n", k);
-
- for (int j = 0; j < s->cdim[1]; ++j) {
-
- for (int i = 0; i < s->cdim[0]; ++i) {
-#ifdef WITH_MPI
-
- const int cid = cell_getid(s->cdim, i, j, k);
- const struct cell *c = &s->cells_top[cid];
- fprintf(file, "|(%d-%ld-%lld-%lld-%d)", c->nodeID, c - s->cells_top,
- c->ti_hydro_end_min, c->ti_gravity_end_min, c->gcount);
-#endif
- }
- fprintf(file, "|\n");
- }
- }
-
- fprintf(file, " -- --- --\n");
-
- fclose(file);
-}
diff --git a/src/space.h b/src/space.h
index e896cc51767eb0879abf3011107a4236b7d51e2a..c49dc37dc0df27cd3647044f219e36c299dcd73b 100644
--- a/src/space.h
+++ b/src/space.h
@@ -234,6 +234,5 @@ void space_replicate(struct space *s, int replicate, int verbose);
void space_reset_task_counters(struct space *s);
void space_clean(struct space *s);
void space_free_cells(struct space *s);
-void space_print_cells(const struct space *s);
#endif /* SWIFT_SPACE_H */