X-Git-Url: http://biod.pnpi.spb.ru/gitweb/?a=blobdiff_plain;f=src%2Fgromacs%2Fmdlib%2Fnbnxn_cuda%2Fnbnxn_cuda_kernels.cuh;h=3bdb17f8feaf51b33c790c09f252a5243a8d0578;hb=8e974b0eb5bc42cb870a69aa7008abf969bfef8a;hp=897b956a74c63ec8a76948a911a6ff7ee5124863;hpb=95b9f1461089c8e677df8b2f948c7b851c436f3a;p=alexxy%2Fgromacs.git diff --git a/src/gromacs/mdlib/nbnxn_cuda/nbnxn_cuda_kernels.cuh b/src/gromacs/mdlib/nbnxn_cuda/nbnxn_cuda_kernels.cuh index 897b956a74..3bdb17f8fe 100644 --- a/src/gromacs/mdlib/nbnxn_cuda/nbnxn_cuda_kernels.cuh +++ b/src/gromacs/mdlib/nbnxn_cuda/nbnxn_cuda_kernels.cuh @@ -157,7 +157,7 @@ /* Analytical Ewald interaction kernels with twin-range cut-off */ #define EL_EWALD_ANA -#define LJ_CUTOFF_CHECK +#define VDW_CUTOFF_CHECK /* cut-off + V shift LJ */ #define NB_KERNEL_FUNC_NAME(x, ...) x ## _ElecEwTwinCut_VdwLJ ## __VA_ARGS__ @@ -189,7 +189,7 @@ #undef NB_KERNEL_FUNC_NAME #undef EL_EWALD_ANA -#undef LJ_CUTOFF_CHECK +#undef VDW_CUTOFF_CHECK /* Tabulated Ewald interaction kernels */ @@ -229,7 +229,7 @@ /* Tabulated Ewald interaction kernels with twin-range cut-off */ #define EL_EWALD_TAB -#define LJ_CUTOFF_CHECK +#define VDW_CUTOFF_CHECK /* cut-off + V shift LJ */ #define NB_KERNEL_FUNC_NAME(x, ...) x ## _ElecEwQSTabTwinCut_VdwLJ ## __VA_ARGS__ @@ -261,4 +261,4 @@ #undef NB_KERNEL_FUNC_NAME #undef EL_EWALD_TAB -#undef LJ_CUTOFF_CHECK +#undef VDW_CUTOFF_CHECK