Skip to content
GitLab
Projects
Groups
Snippets
/
Help
Help
Support
Community forum
Keyboard shortcuts
?
Submit feedback
Contribute to GitLab
Sign in
Toggle navigation
Menu
Open sidebar
SWIFT
SWIFTsim
Commits
6ce26301
Commit
6ce26301
authored
Jul 10, 2019
by
Matthieu Schaller
Browse files
Removed debugging messages.
parent
fa13fb0e
Changes
5
Hide whitespace changes
Inline
Side-by-side
src/black_holes/EAGLE/black_holes_iact.h
View file @
6ce26301
...
...
@@ -215,8 +215,6 @@ runner_iact_nonsym_bh_bh_swallow(const float r2, const float *dx,
h
=
hj
;
}
message
(
"hello!"
);
const
float
G
=
43
.;
// MATTHIEU: Fix this!!!
/* 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,
(
bj
->
merger_data
.
swallow_mass
==
bi
->
subgrid_mass
&&
bj
->
merger_data
.
swallow_id
<
bi
->
id
))
{
message
(
"BH %lld wants to swallow BH particle %lld on node %d"
,
bi
->
id
,
bj
->
id
,
engine_rank
);
message
(
"BH %lld wants to swallow BH particle %lld"
,
bi
->
id
,
bj
->
id
);
bj
->
merger_data
.
swallow_id
=
bi
->
id
;
bj
->
merger_data
.
swallow_mass
=
bi
->
subgrid_mass
;
...
...
src/cell.c
View file @
6ce26301
...
...
@@ -619,13 +619,7 @@ void cell_pack_bpart_swallow(const struct cell *c,
const
struct
bpart
*
bparts
=
c
->
black_holes
.
parts
;
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,
struct
bpart
*
bparts
=
c
->
black_holes
.
parts
;
for
(
size_t
i
=
0
;
i
<
count
;
++
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) {
scheduler_activate
(
s
,
t
);
}
}
/* Un-skip the feedback tasks involved with this cell. */
for
(
struct
link
*
l
=
c
->
black_holes
.
feedback
;
l
!=
NULL
;
l
=
l
->
next
)
{
struct
task
*
t
=
l
->
t
;
...
...
src/engine_maketasks.c
View file @
6ce26301
...
...
@@ -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
,
ci
->
mpi
.
tag
,
0
,
ci
,
cj
);
t_bh_merger
=
scheduler_addtask
(
s
,
task_type_send
,
task_subtype_bpart_merger
,
ci
->
mpi
.
tag
,
0
,
ci
,
cj
);
t_bh_merger
=
scheduler_addtask
(
s
,
task_type_send
,
task_subtype_bpart_merger
,
ci
->
mpi
.
tag
,
0
,
ci
,
cj
);
t_gas_swallow
=
scheduler_addtask
(
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,
t_bh_merger
);
scheduler_addunlock
(
s
,
t_bh_merger
,
ci
->
hydro
.
super
->
black_holes
.
swallow_ghost
[
2
]);
scheduler_addunlock
(
s
,
ci
->
hydro
.
super
->
black_holes
.
swallow_ghost
[
0
],
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,
t_rho
=
scheduler_addtask
(
s
,
task_type_recv
,
task_subtype_bpart_rho
,
c
->
mpi
.
tag
,
0
,
c
,
NULL
);
t_bh_merger
=
scheduler_addtask
(
s
,
task_type_recv
,
task_subtype_bpart_merger
,
c
->
mpi
.
tag
,
0
,
c
,
NULL
);
t_bh_merger
=
scheduler_addtask
(
s
,
task_type_recv
,
task_subtype_bpart_merger
,
c
->
mpi
.
tag
,
0
,
c
,
NULL
);
t_gas_swallow
=
scheduler_addtask
(
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,
scheduler_addunlock
(
s
,
t_gas_swallow
,
l
->
t
);
}
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
,
l
->
t
,
t_feedback
);
}
...
...
src/engine_marktasks.c
View file @
6ce26301
...
...
@@ -417,7 +417,7 @@ void engine_marktasks_mapper(void *map_data, int num_elements,
else
if
((
t_subtype
==
task_subtype_bh_density
||
t_subtype
==
task_subtype_bh_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
)
&&
(
ci_active_black_holes
||
cj_active_black_holes
)
&&
(
ci_nodeID
==
nodeID
||
cj_nodeID
==
nodeID
))
{
...
...
src/runner.c
View file @
6ce26301
...
...
@@ -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, */
/* swallow_id); */
/* Has this particle been flagged for swallowing? */
if
(
swallow_id
>=
0
)
{
...
...
@@ -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", */
/* bparts[k].id, bparts[k].time_bin); */
if
(
bparts
[
k
].
time_bin
==
time_bin_inhibited
)
continue
;
time_bin_min
=
min
(
time_bin_min
,
bparts
[
k
].
time_bin
);
...
...
@@ -4609,11 +4607,11 @@ void *runner_main(void *data) {
runner_do_gas_swallow_pair
(
r
,
ci
,
cj
,
1
);
else
if
(
t
->
subtype
==
task_subtype_do_bh_swallow
)
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
);
else
error
(
"Unknown/invalid task subtype (%s/%s)."
,
taskID_names
[
t
->
type
],
subtaskID_names
[
t
->
subtype
]);
taskID_names
[
t
->
type
],
subtaskID_names
[
t
->
subtype
]);
break
;
case
task_type_sub_self
:
...
...
@@ -4643,7 +4641,7 @@ void *runner_main(void *data) {
runner_dosub_self_bh_feedback
(
r
,
ci
,
1
);
else
error
(
"Unknown/invalid task subtype (%s/%s)."
,
taskID_names
[
t
->
type
],
subtaskID_names
[
t
->
subtype
]);
taskID_names
[
t
->
type
],
subtaskID_names
[
t
->
subtype
]);
break
;
case
task_type_sub_pair
:
...
...
@@ -4669,11 +4667,11 @@ void *runner_main(void *data) {
runner_do_gas_swallow_pair
(
r
,
ci
,
cj
,
1
);
else
if
(
t
->
subtype
==
task_subtype_do_bh_swallow
)
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
);
else
error
(
"Unknown/invalid task subtype (%s/%s)."
,
taskID_names
[
t
->
type
],
subtaskID_names
[
t
->
subtype
]);
taskID_names
[
t
->
type
],
subtaskID_names
[
t
->
subtype
]);
break
;
case
task_type_sort
:
...
...
Write
Preview
Supports
Markdown
0%
Try again
or
attach a new file
.
Cancel
You are about to add
0
people
to the discussion. Proceed with caution.
Finish editing this message first!
Cancel
Please
register
or
sign in
to comment