From ae526d354bff83daee45a65b7fc34e731a1d04c4 Mon Sep 17 00:00:00 2001 From: James Willis <james.s.willis@durham.ac.uk> Date: Thu, 17 Aug 2017 12:14:36 +0100 Subject: [PATCH] Updated macro names after merge with master. --- src/runner_doiact_vec.c | 10 +++++----- 1 file changed, 5 insertions(+), 5 deletions(-) diff --git a/src/runner_doiact_vec.c b/src/runner_doiact_vec.c index 552fb91d09..bdf3ebda31 100644 --- a/src/runner_doiact_vec.c +++ b/src/runner_doiact_vec.c @@ -272,8 +272,8 @@ __attribute__((always_inline)) INLINE static void calcRemForceInteractions( *icount_align += pad; /* Initialise masks to true. */ - vec_init_mask(int_mask); - vec_init_mask(int_mask2); + vec_init_mask_true(int_mask); + vec_init_mask_true(int_mask2); /* Pad secondary cache so that there are no contributions in the interaction * function. */ @@ -444,8 +444,8 @@ __attribute__((always_inline)) INLINE static void storeForceInteractions( /* Initialise masks to true in case remainder interactions have been * performed. */ mask_t int_mask, int_mask2; - vec_init_mask(int_mask); - vec_init_mask(int_mask2); + vec_init_mask_true(int_mask); + vec_init_mask_true(int_mask2); /* Perform interactions. */ for (int pjd = 0; pjd < icount_align; pjd += (num_vec_proc * VEC_SIZE)) { @@ -864,7 +864,7 @@ __attribute__((always_inline)) INLINE void runner_doself2_force_vec( } /* Read the particles from the cell and store them locally in the cache. */ - cache_read_particles(c, cell_cache); + cache_read_force_particles(c, cell_cache); #ifdef SWIFT_DEBUG_CHECKS for (int i = 0; i < count; i++) { -- GitLab