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
6ddb833c
Commit
6ddb833c
authored
Jun 26, 2017
by
Matthieu Schaller
Browse files
Print more information when returning an error message for unsorted particles in DOPAIR1()
parent
5de48823
Changes
3
Hide whitespace changes
Inline
Side-by-side
src/cell.c
View file @
6ddb833c
...
...
@@ -1791,7 +1791,9 @@ int cell_unskip_tasks(struct cell *c, struct scheduler *s) {
if
(
l
==
NULL
)
error
(
"Missing link to send_ti task."
);
scheduler_activate
(
s
,
l
->
t
);
}
}
else
if
(
t
->
type
==
task_type_pair
)
{
}
else
if
(
t
->
type
==
task_type_pair
)
{
/* ci and cj on same node */
scheduler_activate
(
s
,
ci
->
drift_part
);
scheduler_activate
(
s
,
cj
->
drift_part
);
}
...
...
src/engine.c
View file @
6ddb833c
...
...
@@ -2717,7 +2717,7 @@ void engine_marktasks_mapper(void *map_data, int num_elements,
scheduler_activate
(
s
,
l
->
t
);
}
}
else
if
(
t
->
type
==
task_type_pair
)
{
}
else
if
(
t
->
type
==
task_type_pair
)
{
/* ci and cj on same node */
scheduler_activate
(
s
,
ci
->
drift_part
);
scheduler_activate
(
s
,
cj
->
drift_part
);
}
...
...
src/runner_doiact.h
View file @
6ddb833c
...
...
@@ -919,7 +919,7 @@ void DOPAIR1(struct runner *r, struct cell *ci, struct cell *cj, const int sid,
p
->
x
[
2
]
*
runner_shift
[
sid
][
2
];
if
(
fabsf
(
d
-
sort_i
[
pid
].
d
)
-
ci
->
dx_max_sort
>
1.0e-6
*
max
(
fabsf
(
d
),
ci
->
dx_max_sort
))
error
(
"particle shift diff exceeds dx_max_sort
."
);
error
(
"particle shift diff exceeds dx_max_sort
in cell ci. ci->nodeID=%d cj->nodeID=%d d=%e sort_i[pid].d=%e ci->dx_max_sort=%e ci->dx_max_sort_old=%e"
,
ci
->
nodeID
,
cj
->
nodeID
,
d
,
sort_i
[
pid
].
d
,
ci
->
dx_max_sort
,
ci
->
dx_max_sort_old
);
}
for
(
int
pjd
=
0
;
pjd
<
cj
->
count
;
pjd
++
)
{
const
struct
part
*
p
=
&
cj
->
parts
[
sort_j
[
pjd
].
i
];
...
...
@@ -928,7 +928,7 @@ void DOPAIR1(struct runner *r, struct cell *ci, struct cell *cj, const int sid,
p
->
x
[
2
]
*
runner_shift
[
sid
][
2
];
if
(
fabsf
(
d
-
sort_j
[
pjd
].
d
)
-
cj
->
dx_max_sort
>
1.0e-6
*
max
(
fabsf
(
d
),
cj
->
dx_max_sort
))
error
(
"particle shift diff exceeds dx_max_sort
."
);
error
(
"particle shift diff exceeds dx_max_sort
in cell cj. cj->nodeID=%d ci->nodeID=%d d=%e sort_j[pjd].d=%e cj->dx_max_sort=%e cj->dx_max_sort_old=%e"
,
cj
->
nodeID
,
ci
->
nodeID
,
d
,
sort_j
[
pjd
].
d
,
cj
->
dx_max_sort
,
cj
->
dx_max_sort_old
);
}
#endif
/* SWIFT_DEBUG_CHECKS */
...
...
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