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,12 +619,6 @@ void cell_pack_bpart_swallow(const struct cell *c, ...@@ -619,12 +619,6 @@ 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) {
message("Sending id=%lld swallowid=%lld",
bparts[i].id,
bparts[i].merger_data.swallow_id);
data[i] = bparts[i].merger_data; 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);
} }
} }
......
...@@ -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);
...@@ -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);
......
...@@ -4434,8 +4434,6 @@ void runner_do_recv_bpart(struct runner *r, struct cell *c, int clear_sorts, ...@@ -4434,8 +4434,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);
time_bin_max = max(time_bin_max, bparts[k].time_bin); time_bin_max = max(time_bin_max, bparts[k].time_bin);
......
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