Commit 814df924 authored by James Willis's avatar James Willis
Browse files

Formatting.

parent 93c7e699
......@@ -64,7 +64,7 @@ __attribute__((always_inline)) INLINE static void calcRemInteractions(
int *icount_align) {
mask_t int_mask, int_mask2;
/* Work out the number of remainder interactions and pad secondary cache. */
*icount_align = icount;
int rem = icount % (NUM_VEC_PROC * VEC_SIZE);
......@@ -72,7 +72,7 @@ __attribute__((always_inline)) INLINE static void calcRemInteractions(
int pad = (NUM_VEC_PROC * VEC_SIZE) - rem;
*icount_align += pad;
/* Initialise masks to true. */
/* Initialise masks to true. */
vec_init_mask(int_mask);
vec_init_mask(int_mask2);
......@@ -272,7 +272,6 @@ __attribute__((always_inline)) INLINE static void populate_max_d_no_cache(
const struct part *pi = &parts_i[sort_i[k].i];
const float d = sort_i[k].d + dx_max;
// max_di[k] = d + h * kernel_gamma - rshift;
max_di[k] = d + hi_max;
/* If the particle is out of range set the index to
......@@ -458,7 +457,8 @@ __attribute__((always_inline)) INLINE void runner_doself1_density_vec(
v_r2_2.v = vec_fma(v_dz_tmp2.v, v_dz_tmp2.v, v_r2_2.v);
/* Form a mask from r2 < hig2 and r2 > 0.*/
mask_t v_doi_mask, v_doi_mask_self_check, v_doi_mask2, v_doi_mask2_self_check;
mask_t v_doi_mask, v_doi_mask_self_check, v_doi_mask2,
v_doi_mask2_self_check;
int doi_mask, doi_mask_self_check, doi_mask2, doi_mask2_self_check;
/* Form r2 > 0 mask and r2 < hig2 mask. */
......@@ -466,7 +466,8 @@ __attribute__((always_inline)) INLINE void runner_doself1_density_vec(
vec_create_mask(v_doi_mask, vec_cmp_lt(v_r2.v, v_hig2.v));
/* Form r2 > 0 mask and r2 < hig2 mask. */
vec_create_mask(v_doi_mask2_self_check, vec_cmp_gt(v_r2_2.v, vec_setzero()));
vec_create_mask(v_doi_mask2_self_check,
vec_cmp_gt(v_r2_2.v, vec_setzero()));
vec_create_mask(v_doi_mask2, vec_cmp_lt(v_r2_2.v, v_hig2.v));
/* Form integer masks. */
......@@ -475,7 +476,7 @@ __attribute__((always_inline)) INLINE void runner_doself1_density_vec(
doi_mask2_self_check = vec_form_int_mask(v_doi_mask2_self_check);
doi_mask2 = vec_form_int_mask(v_doi_mask2);
/* Combine the two masks. */
doi_mask = doi_mask & doi_mask_self_check;
doi_mask2 = doi_mask2 & doi_mask2_self_check;
......
Supports Markdown
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment