biod.pnpi.spb.ru
/
alexxy
/
gromacs.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Merge release-5-0 into master
[alexxy/gromacs.git]
/
src
/
gromacs
/
mdlib
/
nbnxn_cuda
/
nbnxn_cuda_kernels.cuh
diff --git
a/src/gromacs/mdlib/nbnxn_cuda/nbnxn_cuda_kernels.cuh
b/src/gromacs/mdlib/nbnxn_cuda/nbnxn_cuda_kernels.cuh
index c468306899094a050f87816c90cb0fe4087de5a0..3b37869e6dda00b17ae3f2fa4bced6347a271587 100644
(file)
--- 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
/* 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__
/* 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 NB_KERNEL_FUNC_NAME
#undef EL_EWALD_ANA
-#undef
LJ
_CUTOFF_CHECK
+#undef
VDW
_CUTOFF_CHECK
/* Tabulated Ewald interaction kernels */
/* Tabulated Ewald interaction kernels */
@@
-229,7
+229,7
@@
/* Tabulated Ewald interaction kernels with twin-range cut-off */
#define EL_EWALD_TAB
/* 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__
/* 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 NB_KERNEL_FUNC_NAME
#undef EL_EWALD_TAB
-#undef
LJ
_CUTOFF_CHECK
+#undef
VDW
_CUTOFF_CHECK