X-Git-Url: http://biod.pnpi.spb.ru/gitweb/?a=blobdiff_plain;f=src%2Fgromacs%2Fmdlib%2Fnbnxn_cuda%2Fnbnxn_cuda_kernels.cuh;h=3b37869e6dda00b17ae3f2fa4bced6347a271587;hb=19d3c2e5d0c401eb59010960d11a18b6ba2c54c6;hp=c468306899094a050f87816c90cb0fe4087de5a0;hpb=fe90f1c1c71a3a43a27ec9ba76e772ae54786c7f;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 c468306899..3b37869e6d 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