Commit 6ce26301 authored by Matthieu Schaller's avatar Matthieu Schaller
Browse files

Removed debugging messages.

parent fa13fb0e
...@@ -215,8 +215,6 @@ runner_iact_nonsym_bh_bh_swallow(const float r2, const float *dx, ...@@ -215,8 +215,6 @@ runner_iact_nonsym_bh_bh_swallow(const float r2, const float *dx,
h = hj; h = hj;
} }
message("hello!");
const float G = 43.; // MATTHIEU: Fix this!!! const float G = 43.; // MATTHIEU: Fix this!!!
/* The BH with the smaller mass will be merged onto the one with the /* The BH with the smaller mass will be merged onto the one with the
...@@ -239,8 +237,7 @@ runner_iact_nonsym_bh_bh_swallow(const float r2, const float *dx, ...@@ -239,8 +237,7 @@ runner_iact_nonsym_bh_bh_swallow(const float r2, const float *dx,
(bj->merger_data.swallow_mass == bi->subgrid_mass && (bj->merger_data.swallow_mass == bi->subgrid_mass &&
bj->merger_data.swallow_id < bi->id)) { bj->merger_data.swallow_id < bi->id)) {
message("BH %lld wants to swallow BH particle %lld on node %d", message("BH %lld wants to swallow BH particle %lld", bi->id, bj->id);
bi->id, bj->id, engine_rank);
bj->merger_data.swallow_id = bi->id; bj->merger_data.swallow_id = bi->id;
bj->merger_data.swallow_mass = bi->subgrid_mass; bj->merger_data.swallow_mass = bi->subgrid_mass;
......
...@@ -619,13 +619,7 @@ void cell_pack_bpart_swallow(const struct cell *c, ...@@ -619,13 +619,7 @@ void cell_pack_bpart_swallow(const struct cell *c,
const struct bpart *bparts = c->black_holes.parts; const struct bpart *bparts = c->black_holes.parts;
for (size_t i = 0; i < count; ++i) { for (size_t i = 0; i < count; ++i) {
data[i] = bparts[i].merger_data;
message("Sending id=%lld swallowid=%lld",
bparts[i].id,
bparts[i].merger_data.swallow_id);
data[i] = bparts[i].merger_data;
} }
} }
...@@ -636,13 +630,7 @@ void cell_unpack_bpart_swallow(struct cell *c, ...@@ -636,13 +630,7 @@ void cell_unpack_bpart_swallow(struct cell *c,
struct bpart *bparts = c->black_holes.parts; struct bpart *bparts = c->black_holes.parts;
for (size_t i = 0; i < count; ++i) { for (size_t i = 0; i < count; ++i) {
bparts[i].merger_data = data[i]; bparts[i].merger_data = data[i];
message("Receiving! id=%lld swallow_id=%lld",
bparts[i].id,
data[i].swallow_id);
} }
} }
...@@ -4080,7 +4068,7 @@ int cell_unskip_black_holes_tasks(struct cell *c, struct scheduler *s) { ...@@ -4080,7 +4068,7 @@ int cell_unskip_black_holes_tasks(struct cell *c, struct scheduler *s) {
scheduler_activate(s, t); scheduler_activate(s, t);
} }
} }
/* Un-skip the feedback tasks involved with this cell. */ /* Un-skip the feedback tasks involved with this cell. */
for (struct link *l = c->black_holes.feedback; l != NULL; l = l->next) { for (struct link *l = c->black_holes.feedback; l != NULL; l = l->next) {
struct task *t = l->t; struct task *t = l->t;
......
...@@ -356,9 +356,8 @@ void engine_addtasks_send_black_holes(struct engine *e, struct cell *ci, ...@@ -356,9 +356,8 @@ void engine_addtasks_send_black_holes(struct engine *e, struct cell *ci,
t_rho = scheduler_addtask(s, task_type_send, task_subtype_bpart_rho, t_rho = scheduler_addtask(s, task_type_send, task_subtype_bpart_rho,
ci->mpi.tag, 0, ci, cj); ci->mpi.tag, 0, ci, cj);
t_bh_merger = t_bh_merger = scheduler_addtask(
scheduler_addtask(s, task_type_send, task_subtype_bpart_merger, s, task_type_send, task_subtype_bpart_merger, ci->mpi.tag, 0, ci, cj);
ci->mpi.tag, 0, ci, cj);
t_gas_swallow = scheduler_addtask( t_gas_swallow = scheduler_addtask(
s, task_type_send, task_subtype_part_swallow, ci->mpi.tag, 0, ci, cj); s, task_type_send, task_subtype_part_swallow, ci->mpi.tag, 0, ci, cj);
...@@ -387,7 +386,7 @@ void engine_addtasks_send_black_holes(struct engine *e, struct cell *ci, ...@@ -387,7 +386,7 @@ void engine_addtasks_send_black_holes(struct engine *e, struct cell *ci,
t_bh_merger); t_bh_merger);
scheduler_addunlock(s, t_bh_merger, scheduler_addunlock(s, t_bh_merger,
ci->hydro.super->black_holes.swallow_ghost[2]); ci->hydro.super->black_holes.swallow_ghost[2]);
scheduler_addunlock(s, ci->hydro.super->black_holes.swallow_ghost[0], scheduler_addunlock(s, ci->hydro.super->black_holes.swallow_ghost[0],
t_gas_swallow); t_gas_swallow);
scheduler_addunlock(s, t_gas_swallow, scheduler_addunlock(s, t_gas_swallow,
...@@ -635,9 +634,8 @@ void engine_addtasks_recv_black_holes(struct engine *e, struct cell *c, ...@@ -635,9 +634,8 @@ void engine_addtasks_recv_black_holes(struct engine *e, struct cell *c,
t_rho = scheduler_addtask(s, task_type_recv, task_subtype_bpart_rho, t_rho = scheduler_addtask(s, task_type_recv, task_subtype_bpart_rho,
c->mpi.tag, 0, c, NULL); c->mpi.tag, 0, c, NULL);
t_bh_merger = scheduler_addtask(s, task_type_recv, t_bh_merger = scheduler_addtask(
task_subtype_bpart_merger, s, task_type_recv, task_subtype_bpart_merger, c->mpi.tag, 0, c, NULL);
c->mpi.tag, 0, c, NULL);
t_gas_swallow = scheduler_addtask( t_gas_swallow = scheduler_addtask(
s, task_type_recv, task_subtype_part_swallow, c->mpi.tag, 0, c, NULL); s, task_type_recv, task_subtype_part_swallow, c->mpi.tag, 0, c, NULL);
...@@ -678,7 +676,7 @@ void engine_addtasks_recv_black_holes(struct engine *e, struct cell *c, ...@@ -678,7 +676,7 @@ void engine_addtasks_recv_black_holes(struct engine *e, struct cell *c,
scheduler_addunlock(s, t_gas_swallow, l->t); scheduler_addunlock(s, t_gas_swallow, l->t);
} }
for (struct link *l = c->black_holes.do_bh_swallow; l != NULL; for (struct link *l = c->black_holes.do_bh_swallow; l != NULL;
l = l->next) { l = l->next) {
scheduler_addunlock(s, t_bh_merger, l->t); scheduler_addunlock(s, t_bh_merger, l->t);
scheduler_addunlock(s, l->t, t_feedback); scheduler_addunlock(s, l->t, t_feedback);
} }
......
...@@ -417,7 +417,7 @@ void engine_marktasks_mapper(void *map_data, int num_elements, ...@@ -417,7 +417,7 @@ void engine_marktasks_mapper(void *map_data, int num_elements,
else if ((t_subtype == task_subtype_bh_density || else if ((t_subtype == task_subtype_bh_density ||
t_subtype == task_subtype_bh_swallow || t_subtype == task_subtype_bh_swallow ||
t_subtype == task_subtype_do_gas_swallow || t_subtype == task_subtype_do_gas_swallow ||
t_subtype == task_subtype_do_bh_swallow || t_subtype == task_subtype_do_bh_swallow ||
t_subtype == task_subtype_bh_feedback) && t_subtype == task_subtype_bh_feedback) &&
(ci_active_black_holes || cj_active_black_holes) && (ci_active_black_holes || cj_active_black_holes) &&
(ci_nodeID == nodeID || cj_nodeID == nodeID)) { (ci_nodeID == nodeID || cj_nodeID == nodeID)) {
......
...@@ -4006,7 +4006,7 @@ void runner_do_bh_swallow(struct runner *r, struct cell *c, int timer) { ...@@ -4006,7 +4006,7 @@ void runner_do_bh_swallow(struct runner *r, struct cell *c, int timer) {
/* message("OO id=%lld swallow_id = %lld", cell_bp->id, */ /* message("OO id=%lld swallow_id = %lld", cell_bp->id, */
/* swallow_id); */ /* swallow_id); */
/* Has this particle been flagged for swallowing? */ /* Has this particle been flagged for swallowing? */
if (swallow_id >= 0) { if (swallow_id >= 0) {
...@@ -4433,8 +4433,6 @@ void runner_do_recv_bpart(struct runner *r, struct cell *c, int clear_sorts, ...@@ -4433,8 +4433,6 @@ void runner_do_recv_bpart(struct runner *r, struct cell *c, int clear_sorts,
/* message("Receiving bparts id=%lld time_bin=%d", */ /* message("Receiving bparts id=%lld time_bin=%d", */
/* bparts[k].id, bparts[k].time_bin); */ /* bparts[k].id, bparts[k].time_bin); */
if (bparts[k].time_bin == time_bin_inhibited) continue; if (bparts[k].time_bin == time_bin_inhibited) continue;
time_bin_min = min(time_bin_min, bparts[k].time_bin); time_bin_min = min(time_bin_min, bparts[k].time_bin);
...@@ -4609,11 +4607,11 @@ void *runner_main(void *data) { ...@@ -4609,11 +4607,11 @@ void *runner_main(void *data) {
runner_do_gas_swallow_pair(r, ci, cj, 1); runner_do_gas_swallow_pair(r, ci, cj, 1);
else if (t->subtype == task_subtype_do_bh_swallow) else if (t->subtype == task_subtype_do_bh_swallow)
runner_do_bh_swallow_pair(r, ci, cj, 1); runner_do_bh_swallow_pair(r, ci, cj, 1);
else if (t->subtype == task_subtype_bh_feedback) else if (t->subtype == task_subtype_bh_feedback)
runner_dopair_branch_bh_feedback(r, ci, cj); runner_dopair_branch_bh_feedback(r, ci, cj);
else else
error("Unknown/invalid task subtype (%s/%s).", error("Unknown/invalid task subtype (%s/%s).",
taskID_names[t->type], subtaskID_names[t->subtype]); taskID_names[t->type], subtaskID_names[t->subtype]);
break; break;
case task_type_sub_self: case task_type_sub_self:
...@@ -4643,7 +4641,7 @@ void *runner_main(void *data) { ...@@ -4643,7 +4641,7 @@ void *runner_main(void *data) {
runner_dosub_self_bh_feedback(r, ci, 1); runner_dosub_self_bh_feedback(r, ci, 1);
else else
error("Unknown/invalid task subtype (%s/%s).", error("Unknown/invalid task subtype (%s/%s).",
taskID_names[t->type], subtaskID_names[t->subtype]); taskID_names[t->type], subtaskID_names[t->subtype]);
break; break;
case task_type_sub_pair: case task_type_sub_pair:
...@@ -4669,11 +4667,11 @@ void *runner_main(void *data) { ...@@ -4669,11 +4667,11 @@ void *runner_main(void *data) {
runner_do_gas_swallow_pair(r, ci, cj, 1); runner_do_gas_swallow_pair(r, ci, cj, 1);
else if (t->subtype == task_subtype_do_bh_swallow) else if (t->subtype == task_subtype_do_bh_swallow)
runner_do_bh_swallow_pair(r, ci, cj, 1); runner_do_bh_swallow_pair(r, ci, cj, 1);
else if (t->subtype == task_subtype_bh_feedback) else if (t->subtype == task_subtype_bh_feedback)
runner_dosub_pair_bh_feedback(r, ci, cj, 1); runner_dosub_pair_bh_feedback(r, ci, cj, 1);
else else
error("Unknown/invalid task subtype (%s/%s).", error("Unknown/invalid task subtype (%s/%s).",
taskID_names[t->type], subtaskID_names[t->subtype]); taskID_names[t->type], subtaskID_names[t->subtype]);
break; break;
case task_type_sort: case task_type_sort:
......
Supports Markdown
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment