diff --git a/src/feedback/EAGLE/feedback_iact.h b/src/feedback/EAGLE/feedback_iact.h
index 79906a83dffde727aa80829f3742c1a714ee483d..e57e903c8fc797acaa96e323ea457cab4f894c5a 100644
--- a/src/feedback/EAGLE/feedback_iact.h
+++ b/src/feedback/EAGLE/feedback_iact.h
@@ -300,10 +300,10 @@ runner_iact_nonsym_feedback_apply(const float r2, const float *dx,
hydro_set_physical_internal_energy(pj, xpj, cosmo, u_new);
hydro_set_drifted_physical_internal_energy(pj, cosmo, u_new);
- message(
- "We did some heating! id %llu star id %llu probability %.5e "
- "random_num %.5e du %.5e du/ini %.5e",
- pj->id, si->id, prob, rand, delta_u, delta_u / u_init);
+ /* message( */
+ /* "We did some heating! id %llu star id %llu probability %.5e " */
+ /* "random_num %.5e du %.5e du/ini %.5e", */
+ /* pj->id, si->id, prob, rand, delta_u, delta_u / u_init); */
}
}
}
diff --git a/src/runner.c b/src/runner.c
index b5766b4834494ca316bd0d8554a96aec8d16e413..38c450316d4133ad2937b1fec8f8cf368ef3daa8 100644
--- a/src/runner.c
+++ b/src/runner.c
@@ -142,10 +142,6 @@
#undef FUNCTION_TASK_LOOP
#undef FUNCTION
-int cell_to_check = -10000000;
-int parent_cell_to_check = -10000000;
-int super_cell_to_check = -10000000;
-
/**
* @brief Intermediate task after the density to check that the smoothing
* lengths are correct.
@@ -1104,7 +1100,8 @@ void runner_do_star_formation(struct runner *r, struct cell *c, int timer) {
/* Did we get a star? (Or did we run out of spare ones?) */
if (sp != NULL) {
- message("We formed a star id=%lld cellID=%d", sp->id, c->cellID);
+ /* message("We formed a star id=%lld cellID=%d", sp->id,
+ * c->cellID); */
/* Copy the properties of the gas particle to the star particle */
star_formation_copy_properties(p, xp, sp, e, sf_props, cosmo,
@@ -1507,17 +1504,6 @@ void runner_do_stars_sort(struct runner *r, struct cell *c, int flags,
if (c->hydro.super == NULL) error("Task called above the super level!!!");
#endif
- if (c->cellID == cell_to_check) {
- message("Sorting stars in cellID=%d count=%d is_super=%d super=%d",
- c->cellID, c->stars.count, c == c->hydro.super,
- c->hydro.super->cellID);
- }
-
- if (c->cellID == super_cell_to_check) {
- message("Sorting stars in cellID=%d count=%d is_super=%d", c->cellID,
- c->stars.count, c == c->hydro.super);
- }
-
/* We need to do the local sorts plus whatever was requested further up. */
flags |= c->stars.do_sort;
if (cleanup) {
@@ -1657,8 +1643,6 @@ void runner_do_stars_sort(struct runner *r, struct cell *c, int flags,
/* And the individual sort distances if we are a local cell */
for (int k = 0; k < count; k++) {
- if (sparts[k].id == 155966626889L)
- message("Sorting star %lld", sparts[k].id);
sparts[k].x_diff_sort[0] = 0.0f;
sparts[k].x_diff_sort[1] = 0.0f;
sparts[k].x_diff_sort[2] = 0.0f;
@@ -3158,9 +3142,6 @@ void runner_do_timestep(struct runner *r, struct cell *c, int timer) {
/* Get a handle on the part. */
struct spart *restrict sp = &sparts[k];
- if (sp->id == 155966626889L)
- message("getting time-step for spart id=%lld", sp->id);
-
/* need to be updated ? */
if (spart_is_active(sp, e)) {
@@ -3179,10 +3160,6 @@ void runner_do_timestep(struct runner *r, struct cell *c, int timer) {
sp->time_bin = get_time_bin(ti_new_step);
sp->gpart->time_bin = get_time_bin(ti_new_step);
- if (sp->id == 155966626889L)
- message("new time-step for spart id=%lld is %d", sp->id,
- sp->time_bin);
-
/* Number of updated s-particles */
s_updated++;
g_updated++;
@@ -3866,19 +3843,6 @@ void runner_do_recv_spart(struct runner *r, struct cell *c, int clear_sorts,
time_bin_min = min(time_bin_min, sparts[k].time_bin);
time_bin_max = max(time_bin_max, sparts[k].time_bin);
h_max = max(h_max, sparts[k].h);
-
- if (sparts[k].id == 155966626889L) {
- message("Received star %lld", sparts[k].id);
- cell_to_check = c->cellID;
- parent_cell_to_check = c->parent->cellID;
- super_cell_to_check = c->hydro.super->cellID;
- message("Cell to check: %d depth=%d", cell_to_check, c->depth);
- message("Parent cell to check: %d", parent_cell_to_check);
- message("Super to check: %d", super_cell_to_check);
- message("Super to check sort task: %p", c->hydro.super->stars.sorts);
- message("Super to check sort task skip: %d",
- c->hydro.super->stars.sorts->skip);
- }
}
/* Convert into a time */
diff --git a/src/runner_doiact_stars.h b/src/runner_doiact_stars.h
index 2518571656bffa8270d193987b0b323f910996b7..be4f83f8137a1908f0d3dc7f321b2d11ea28bd3d 100644
--- a/src/runner_doiact_stars.h
+++ b/src/runner_doiact_stars.h
@@ -1308,12 +1308,7 @@ void DOSUB_PAIR1_STARS(struct runner *r, struct cell *ci, struct cell *cj,
/* Do any of the cells need to be sorted first? */
if (!(ci->stars.sorted & (1 << sid)) ||
ci->stars.dx_max_sort_old > ci->dmin * space_maxreldx) {
- error(
- "Interacting unsorted cell (sparts). ci->nodeID=%d "
- "ci->stars.count=%d ci->stars[0].id=%lld ci->cellID=%d "
- "ci->super->cellID=%d",
- ci->nodeID, ci->stars.count, ci->stars.parts[0].id, ci->cellID,
- ci->hydro.super->cellID);
+ error("Interacting unsorted cell (sparts).");
}
if (!(cj->hydro.sorted & (1 << sid)) ||
@@ -1338,19 +1333,7 @@ void DOSUB_PAIR1_STARS(struct runner *r, struct cell *ci, struct cell *cj,
if (!(cj->stars.sorted & (1 << sid)) ||
cj->stars.dx_max_sort_old > cj->dmin * space_maxreldx) {
- error(
- "Interacting unsorted cell (sparts). cj->nodeID=%d "
- "cj->stars.count=%d cj->stars[0].id=%lld cj->cellID=%d "
- "cj->parent->cellID=%d cj->super->cellID=%d stars.ti_end_min=%lld "
- "ti_current=%lld cj->depth=%d cj->super->depth=%d "
- "cj->requires_sorts=%d cj->do_sort=%d sid=%d dx_max_part=%e "
- "dx_max_part_old=%e dx_max_sort=%e dx_max_sort_old=%e",
- cj->nodeID, cj->stars.count, cj->stars.parts[0].id, cj->cellID,
- cj->parent->cellID, cj->hydro.super->cellID, cj->stars.ti_end_min,
- e->ti_current, cj->depth, cj->hydro.super->depth,
- cj->stars.requires_sorts, cj->stars.do_sort, sid,
- cj->stars.dx_max_part, cj->stars.dx_max_part_old,
- cj->stars.dx_max_sort, cj->stars.dx_max_sort_old);
+ error("Interacting unsorted cell (sparts).");
}
}