aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorErik Schnetter <schnetter@gmail.com>2013-07-29 15:51:12 -0700
committerErik Schnetter <schnetter@gmail.com>2013-07-29 15:51:12 -0700
commit320d6af5dd93dc1b5e124ba40679a48c201b2058 (patch)
tree2c1ea6b52335f89f6368e852b2cd94629e2252d1
parentac1ecd7d99c9a241d4849ce43020c24791943bd1 (diff)
LoopControl: Correct check whether vectorization is enabled
-rw-r--r--Carpet/LoopControl/src/loopcontrol.cc2
-rw-r--r--Carpet/LoopControl/src/loopcontrol.h2
2 files changed, 2 insertions, 2 deletions
diff --git a/Carpet/LoopControl/src/loopcontrol.cc b/Carpet/LoopControl/src/loopcontrol.cc
index 8281fc04a..222d4e64f 100644
--- a/Carpet/LoopControl/src/loopcontrol.cc
+++ b/Carpet/LoopControl/src/loopcontrol.cc
@@ -841,7 +841,7 @@ void lc_control_init(lc_control_t *restrict const control,
control->overall.min.v[d] = loop_min[d];
control->overall.max.v[d] = loop_max[d];
// Thread loop
-#if VECTORISE_ALIGNED_ARRAYS
+#if VECTORISE && VECTORISE_ALIGNED_ARRAYS
// Move start to be aligned with vector size
control->coarse_thread.min.v[d] =
aligndown(control->overall.min.v[d], vect_size[d]);
diff --git a/Carpet/LoopControl/src/loopcontrol.h b/Carpet/LoopControl/src/loopcontrol.h
index 3d5571810..93dfda4dd 100644
--- a/Carpet/LoopControl/src/loopcontrol.h
+++ b/Carpet/LoopControl/src/loopcontrol.h
@@ -145,7 +145,7 @@ extern "C" {
CCTK_BUILTIN_EXPECT(lc_dir##D==0, 1) ? 0 : \
lc_dir##D<0 ? I+1 : lc_control.overall.max.v[D]-I;
-#if VECTORISE_ALIGNED_ARRAYS
+#if VECTORISE && VECTORISE_ALIGNED_ARRAYS
/* Arrays are aligned: fmin0 is the aligned loop boundary; keep it,
and set up imin to be the intended loop boundary */
# define LC_ALIGN(i,j,k, vec_imin,vec_imax) \