From 622df1ee2bb7cb70c3d6e6edd4e4d73ccdd78ebc Mon Sep 17 00:00:00 2001 From: James Willis <james.s.willis@durham.ac.uk> Date: Fri, 3 Mar 2017 14:11:19 +0000 Subject: [PATCH] Moved kernel independent code outside of #ifdef in kernel_deval_1_vec. --- src/kernel_hydro.h | 16 +++++++--------- 1 file changed, 7 insertions(+), 9 deletions(-) diff --git a/src/kernel_hydro.h b/src/kernel_hydro.h index 6992f314e7..43397aab86 100644 --- a/src/kernel_hydro.h +++ b/src/kernel_hydro.h @@ -413,11 +413,6 @@ __attribute__((always_inline)) INLINE static void kernel_deval_1_vec( dw_dx->v = vec_fma(dw_dx->v, x.v, w->v); w->v = vec_fma(x.v, w->v, wendland_const_c5.v); - /* Return everything */ - w->v = - vec_mul(w->v, vec_mul(kernel_constant_vec.v, kernel_gamma_inv_dim_vec.v)); - dw_dx->v = vec_mul(dw_dx->v, vec_mul(kernel_constant_vec.v, - kernel_gamma_inv_dim_plus_one_vec.v)); #else /* Load x and get the interval id. */ @@ -440,12 +435,15 @@ __attribute__((always_inline)) INLINE static void kernel_deval_1_vec( dw_dx->v = (dw_dx->v * x.v) + w->v; w->v = (x.v * w->v) + c[k].v; } + +#endif + /* Return everything */ - w->v = w->v * kernel_constant_vec.v * kernel_gamma_inv_dim_vec.v; - dw_dx->v = - dw_dx->v * kernel_constant_vec.v * kernel_gamma_inv_dim_plus_one_vec.v; + w->v = + vec_mul(w->v, vec_mul(kernel_constant_vec.v, kernel_gamma_inv_dim_vec.v)); + dw_dx->v = vec_mul(dw_dx->v, vec_mul(kernel_constant_vec.v, + kernel_gamma_inv_dim_plus_one_vec.v)); -#endif } /** -- GitLab