From 9cc50992ec7b20fcb359c80358a787a0551364fa Mon Sep 17 00:00:00 2001 From: Erik Schnetter Date: Sat, 26 Nov 2011 10:13:26 -0500 Subject: Move vectorised definition of KRANC_GFOFFSET3D into thorn Vectors --- .../Cactus/KrancNumericalTools/GenericFD/configuration.ccl | 4 ---- .../Cactus/KrancNumericalTools/GenericFD/src/GenericFD.h | 13 ++----------- 2 files changed, 2 insertions(+), 15 deletions(-) (limited to 'Auxiliary') diff --git a/Auxiliary/Cactus/KrancNumericalTools/GenericFD/configuration.ccl b/Auxiliary/Cactus/KrancNumericalTools/GenericFD/configuration.ccl index 664b79a..477b219 100644 --- a/Auxiliary/Cactus/KrancNumericalTools/GenericFD/configuration.ccl +++ b/Auxiliary/Cactus/KrancNumericalTools/GenericFD/configuration.ccl @@ -7,7 +7,3 @@ PROVIDES GenericFD SCRIPT LANG } - -OPTIONAL Vectors -{ -} diff --git a/Auxiliary/Cactus/KrancNumericalTools/GenericFD/src/GenericFD.h b/Auxiliary/Cactus/KrancNumericalTools/GenericFD/src/GenericFD.h index ace83a0..5884d70 100644 --- a/Auxiliary/Cactus/KrancNumericalTools/GenericFD/src/GenericFD.h +++ b/Auxiliary/Cactus/KrancNumericalTools/GenericFD/src/GenericFD.h @@ -48,20 +48,11 @@ extern "C" { /* var is a pointer to a grid point, i,j,k are offsets with respect to that point. For example: KRANC_GFINDEX3D_OFFSET(&u[ind3d],-1,-1,0) */ -#ifndef VECTORISE - /* standard, thorn Vectors is not used */ /* simple implementation */ - /* # define KRANC_GFOFFSET3D(var,i,j,k) ((var)[di*(i)+dj*(j)+dk*(k)]) */ + /* #define KRANC_GFOFFSET3D(var,i,j,k) ((var)[di*(i)+dj*(j)+dk*(k)]) */ /* more efficient implementation for some compilers */ -# define KRANC_GFOFFSET3D(var,i,j,k) \ +#define KRANC_GFOFFSET3D(var,i,j,k) \ (*(CCTK_REAL const*)&((char const*)(var))[cdi*(i)+cdj*(j)+cdk*(k)]) -#else - /* vectorised version */ -# define KRANC_GFOFFSET3D(var,i,j,k) \ - vec_loadu_maybe3((i),(j),(k), \ - *(CCTK_REAL const*)& \ - ((char const*)(var))[cdi*(i)+cdj*(j)+cdk*(k)]) -#endif int sgn(CCTK_REAL x); -- cgit v1.2.3