diff options
| author | Barry Wardell <barry.wardell@gmail.com> | 2012-02-04 12:19:08 +0000 |
|---|---|---|
| committer | Barry Wardell <barry.wardell@gmail.com> | 2012-02-04 13:32:44 +0000 |
| commit | 5e3e89e6c71a5e2a4254ad9f529382941b97d639 (patch) | |
| tree | 54a115cb8ff562f9462c7a61fa172b552f8a2535 /Auxiliary/Cactus/KrancNumericalTools/GenericFD/src/GenericFD.h | |
| parent | c56affb26178da968ea96bd4ed6ca6ea7f17ee93 (diff) | |
| parent | 809e125e21c83dc8c126ddf1e41f9bf74d09bcf5 (diff) | |
Merge remote-tracking branch 'origin/dgfe'
Conflicts:
Auxiliary/Cactus/KrancNumericalTools/GenericFD/src/MathematicaCompat.h
Tools/CodeGen/CodeGenCactus.m
Tools/CodeGen/Kranc.m
Tools/CodeGen/Thorn.m
Diffstat (limited to 'Auxiliary/Cactus/KrancNumericalTools/GenericFD/src/GenericFD.h')
| -rw-r--r-- | Auxiliary/Cactus/KrancNumericalTools/GenericFD/src/GenericFD.h | 13 |
1 files changed, 2 insertions, 11 deletions
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); |