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
beacd7ee
Commit
beacd7ee
authored
Oct 31, 2017
by
James Willis
Browse files
Merge branch 'master' into do_subset_vec
parents
f5c3104a
d6a00a8f
Changes
2
Hide whitespace changes
Inline
Side-by-side
configure.ac
View file @
beacd7ee
...
...
@@ -152,7 +152,7 @@ if test "$enable_mpi" = "yes"; then
fi
AM_CONDITIONAL([HAVEMPI],[test $enable_mpi = "yes"])
# Indicate that MPIRUN can be modified by an environ
e
ment variable
# Indicate that MPIRUN can be modified by an environment variable
AC_ARG_VAR(MPIRUN, Path to the mpirun command if non-standard)
# Add libtool support (now that CC is defined).
...
...
@@ -380,7 +380,7 @@ AX_PTHREAD([LIBS="$PTHREAD_LIBS $LIBS" CFLAGS="$CFLAGS $PTHREAD_CFLAGS"
non-standard location.]))
# Check for
metis
. Note AX_LIB_METIS exists, but cannot be configured
# Check for
METIS
. Note AX_LIB_METIS exists, but cannot be configured
# to be default off (i.e. given no option it tries to locate METIS), so we
# don't use that.
have_metis="no"
...
...
src/runner_doiact_vec.c
View file @
beacd7ee
...
...
@@ -1255,20 +1255,10 @@ void runner_dopair1_density_vec(struct runner *r, struct cell *ci,
vector
v_curlvySum
=
vector_setzero
();
vector
v_curlvzSum
=
vector_setzero
();
/* Pad the exit iteration if there is a serial remainder. */
int
exit_iteration_align
=
exit_iteration
;
const
int
rem
=
exit_iteration
%
VEC_SIZE
;
if
(
rem
!=
0
)
{
const
int
pad
=
VEC_SIZE
-
rem
;
if
(
exit_iteration_align
+
pad
<=
last_pj
+
1
)
exit_iteration_align
+=
pad
;
}
/* Loop over the parts in cj. Making sure to perform an iteration of the
* loop even if exit_iteration_align is zero and there is only one
* particle to interact with.*/
for
(
int
pjd
=
0
;
pjd
<=
exit_iteration
_align
;
pjd
+=
VEC_SIZE
)
{
for
(
int
pjd
=
0
;
pjd
<=
exit_iteration
;
pjd
+=
VEC_SIZE
)
{
/* Get the cache index to the jth particle. */
const
int
cj_cache_idx
=
pjd
;
...
...
@@ -1614,20 +1604,10 @@ void runner_dopair2_force_vec(struct runner *r, struct cell *ci,
vector
v_sigSum
=
vector_set1
(
pi
->
force
.
v_sig
);
vector
v_entropy_dtSum
=
vector_setzero
();
/* Pad the exit iteration if there is a serial remainder. */
int
exit_iteration_align
=
exit_iteration
;
const
int
rem
=
exit_iteration
%
VEC_SIZE
;
if
(
rem
!=
0
)
{
int
pad
=
VEC_SIZE
-
rem
;
if
(
exit_iteration_align
+
pad
<=
last_pj
+
1
)
exit_iteration_align
+=
pad
;
}
/* Loop over the parts in cj. Making sure to perform an iteration of the
* loop even if exit_iteration_align is zero and there is only one
* particle to interact with.*/
for
(
int
pjd
=
0
;
pjd
<=
exit_iteration
_align
;
pjd
+=
VEC_SIZE
)
{
for
(
int
pjd
=
0
;
pjd
<=
exit_iteration
;
pjd
+=
VEC_SIZE
)
{
/* Get the cache index to the jth particle. */
const
int
cj_cache_idx
=
pjd
;
...
...
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