Commit 8145c502 authored by Richard Berger's avatar Richard Berger
Browse files

Fix OpenCL compilation errors due to bad comments in macros

parent 8d9697db
Loading
Loading
Loading
Loading
+2 −2
Original line number Diff line number Diff line
@@ -42,9 +42,9 @@ texture<int4,1> vel_tex;
// 2. C. L. Phillips, J. A. Anderson, S. C. Glotzer, Comput. Phys. Comm. 230 (2011), 7191-7201.
// PRNG period = 3666320093*2^32 ~ 2^64 ~ 10^19

#define LCGA 0x4beb5d59 // Full period 32 bit LCG
#define LCGA 0x4beb5d59 /* Full period 32 bit LCG */
#define LCGC 0x2600e1f7
#define oWeylPeriod 0xda879add // Prime period 3666320093
#define oWeylPeriod 0xda879add /* Prime period 3666320093 */
#define oWeylOffset 0x8009d14b
#define TWO_N32 0.232830643653869628906250e-9f /* 2^-32 */

+3 −3
Original line number Diff line number Diff line
@@ -27,9 +27,9 @@ texture<int4,1> pos_tex;
// LJ quantities scaled by epsilon and rmin = sigma*2^1/6 (see src/pair_lj_cubic.h)

#define _RT6TWO (numtyp)1.1224621
#define _PHIS (numtyp)-0.7869823   // energy at s
#define _DPHIDS (numtyp)2.6899009  // gradient at s
#define _A3 (numtyp)27.93357       // cubic coefficient
#define _PHIS (numtyp)-0.7869823  /* energy at s */
#define _DPHIDS (numtyp)2.6899009 /* gradient at s */
#define _A3 (numtyp)27.93357 /* cubic coefficient */

__kernel void k_lj_cubic(const __global numtyp4 *restrict x_,
                         const __global numtyp4 *restrict lj1,