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
46cd345e
Commit
46cd345e
authored
Dec 08, 2017
by
James Willis
Browse files
Call naive pair when naive interactions activated.
parent
ff4ddd92
Changes
1
Hide whitespace changes
Inline
Side-by-side
src/runner_doiact.h
View file @
46cd345e
...
...
@@ -771,11 +771,6 @@ void DOPAIR1(struct runner *r, struct cell *ci, struct cell *cj, const int sid,
const
struct
engine
*
restrict
e
=
r
->
e
;
#ifdef SWIFT_USE_NAIVE_INTERACTIONS
DOPAIR1_NAIVE
(
r
,
ci
,
cj
);
return
;
#endif
TIMER_TIC
;
/* Get the cutoff shift. */
...
...
@@ -1039,8 +1034,9 @@ void DOPAIR1_BRANCH(struct runner *r, struct cell *ci, struct cell *cj) {
}
#endif
/* SWIFT_DEBUG_CHECKS */
#if defined(WITH_VECTORIZATION) && defined(GADGET2_SPH) && \
(DOPAIR1_BRANCH == runner_dopair1_density_branch)
#if defined(SWIFT_USE_NAIVE_INTERACTIONS)
DOPAIR1_NAIVE
(
r
,
ci
,
cj
);
#elif defined(WITH_VECTORIZATION) && defined(GADGET2_SPH)
if
(
!
sort_is_corner
(
sid
))
runner_dopair1_density_vec
(
r
,
ci
,
cj
,
sid
,
shift
);
else
...
...
@@ -1064,11 +1060,6 @@ void DOPAIR2(struct runner *r, struct cell *ci, struct cell *cj, const int sid,
struct
engine
*
restrict
e
=
r
->
e
;
#ifdef SWIFT_USE_NAIVE_INTERACTIONS
DOPAIR2_NAIVE
(
r
,
ci
,
cj
);
return
;
#endif
TIMER_TIC
;
/* Get the cutoff shift. */
...
...
@@ -1526,8 +1517,9 @@ void DOPAIR2_BRANCH(struct runner *r, struct cell *ci, struct cell *cj) {
}
#endif
/* SWIFT_DEBUG_CHECKS */
#if defined(WITH_VECTORIZATION) && defined(GADGET2_SPH) && \
(DOPAIR2_BRANCH == runner_dopair2_force_branch)
#ifdef SWIFT_USE_NAIVE_INTERACTIONS
DOPAIR2_NAIVE
(
r
,
ci
,
cj
);
#elif defined(WITH_VECTORIZATION) && defined(GADGET2_SPH)
if
(
!
sort_is_corner
(
sid
))
runner_dopair2_force_vec
(
r
,
ci
,
cj
,
sid
,
shift
);
else
...
...
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