Implemented nbnxn LJ switch functions

[alexxy/gromacs.git] / src / gromacs / mdlib / nbnxn_kernels / simd_2xnn / nbnxn_kernel_ElecEw_VdwLJCombGeom_VgrpF_2xnn.c

diff --git a/src/gromacs/mdlib/nbnxn_kernels/simd_2xnn/nbnxn_kernel_simd_2xnn_ewald_comb_lb_energrp.c b/src/gromacs/mdlib/nbnxn_kernels/simd_2xnn/nbnxn_kernel_ElecEw_VdwLJCombGeom_VgrpF_2xnn.c
similarity index 94%
rename from src/gromacs/mdlib/nbnxn_kernels/simd_2xnn/nbnxn_kernel_simd_2xnn_ewald_comb_lb_energrp.c
rename to src/gromacs/mdlib/nbnxn_kernels/simd_2xnn/nbnxn_kernel_ElecEw_VdwLJCombGeom_VgrpF_2xnn.c
index 3152d80c621c798da6a0dbee71da9b268179edd7..3f84925291dad7f4d14ba2852e0d04133157f07b 100644 (file)
--- a/src/gromacs/mdlib/nbnxn_kernels/simd_2xnn/nbnxn_kernel_simd_2xnn_ewald_comb_lb_energrp.c
+++ b/src/gromacs/mdlib/nbnxn_kernels/simd_2xnn/nbnxn_kernel_ElecEw_VdwLJCombGeom_VgrpF_2xnn.c
@@ -1,7 +1,7 @@
 /*
  * This file is part of the GROMACS molecular simulation package.
  *
- * Copyright (c) 2012,2013, by the GROMACS development team, led by
+ * Copyright (c) 2012,2013,2014, by the GROMACS development team, led by
  * Mark Abraham, David van der Spoel, Berk Hess, and Erik Lindahl,
  * and including many others, as listed in the AUTHORS file in the
  * top-level source directory and at http://www.gromacs.org.
@@ -47,7 +47,7 @@
 #include "nbnxn_kernel_simd_2xnn.h"
 
 #define CALC_COUL_EWALD
-#define LJ_COMB_LB
+#define LJ_COMB_GEOM
 #define CALC_ENERGIES
 #define ENERGY_GROUPS
 
@@ -57,7 +57,7 @@
 
 #ifdef CALC_ENERGIES
 void
-nbnxn_kernel_simd_2xnn_ewald_comb_lb_energrp(const nbnxn_pairlist_t    gmx_unused *nbl,
+nbnxn_kernel_ElecEw_VdwLJCombGeom_VgrpF_2xnn(const nbnxn_pairlist_t    gmx_unused *nbl,
                                              const nbnxn_atomdata_t    gmx_unused *nbat,
                                              const interaction_const_t gmx_unused *ic,
                                              rvec                      gmx_unused *shift_vec,
@@ -67,7 +67,7 @@ nbnxn_kernel_simd_2xnn_ewald_comb_lb_energrp(const nbnxn_pairlist_t    gmx_unuse
                                              real                      gmx_unused *Vc)
 #else /* CALC_ENERGIES */
 void
-nbnxn_kernel_simd_2xnn_ewald_comb_lb_energrp(const nbnxn_pairlist_t    gmx_unused *nbl,
+nbnxn_kernel_ElecEw_VdwLJCombGeom_VgrpF_2xnn(const nbnxn_pairlist_t    gmx_unused *nbl,
                                              const nbnxn_atomdata_t    gmx_unused *nbat,
                                              const interaction_const_t gmx_unused *ic,
                                              rvec                      gmx_unused *shift_vec,