diff --git a/lib/gpu/lal_amoeba.cu b/lib/gpu/lal_amoeba.cu index 3c5b949c72..e44f302563 100644 --- a/lib/gpu/lal_amoeba.cu +++ b/lib/gpu/lal_amoeba.cu @@ -37,7 +37,18 @@ _texture( q_tex,int2); #else #define pos_tex x_ #define q_tex q_ +#ifdef LAMMPS_SMALLBIG +#define tagint int #endif +#ifdef LAMMPS_BIGBIG +#define tagint long +#endif +#ifdef LAMMPS_SMALLSMALL +#define tagint int +#endif + +#endif // defined(NV_KERNEL) || defined(USE_HIP) + #if (SHUFFLE_AVAIL == 0) @@ -1042,7 +1053,7 @@ __kernel void k_amoeba_udirect2b(const __global numtyp4 *restrict x_, } } else { pgamma = MIN(pti,coeff[jtype].y); // thole[jtype] - damp = pgamma * ucl_powr(r/damp,3.0); + damp = pgamma * ucl_powr(r/damp,(numtyp)3.0); if (damp < (numtyp)50.0) { numtyp expdamp = ucl_exp(-damp); scale3 = (numtyp)1.0 - expdamp; diff --git a/lib/gpu/lal_base_amoeba.cpp b/lib/gpu/lal_base_amoeba.cpp index e777981912..a5552f6f3b 100644 --- a/lib/gpu/lal_base_amoeba.cpp +++ b/lib/gpu/lal_base_amoeba.cpp @@ -27,9 +27,6 @@ BaseAmoebaT::BaseAmoeba() : _compiled(false), _max_bytes(0), short_nbor_polar_av nbor=new Neighbor(); pair_program=nullptr; ucl_device=nullptr; - #if defined(LAL_OCL_EV_JIT) - pair_program_noev=nullptr; - #endif } template