Move nbnxn files to nbnxm directory

[alexxy/gromacs.git] / src / gromacs / nbnxm / kernels_simd_4xm / kernel_ElecEw_VdwLJPSw_VF.cpp

diff --git a/src/gromacs/mdlib/nbnxn_kernels/simd_4xn/nbnxn_kernel_ElecEw_VdwLJPSw_VF_4xn.cpp b/src/gromacs/nbnxm/kernels_simd_4xm/kernel_ElecEw_VdwLJPSw_VF.cpp
similarity index 90%
rename from src/gromacs/mdlib/nbnxn_kernels/simd_4xn/nbnxn_kernel_ElecEw_VdwLJPSw_VF_4xn.cpp
rename to src/gromacs/nbnxm/kernels_simd_4xm/kernel_ElecEw_VdwLJPSw_VF.cpp
index 415d25b77ad375030a50b1f6ff97e6d67a845503..a348ca16e66b1b711ee38c98d96e2232478dbdbd 100644 (file)
--- a/src/gromacs/mdlib/nbnxn_kernels/simd_4xn/nbnxn_kernel_ElecEw_VdwLJPSw_VF_4xn.cpp
+++ b/src/gromacs/nbnxm/kernels_simd_4xm/kernel_ElecEw_VdwLJPSw_VF.cpp
@@ -34,7 +34,7 @@
  */
 /*
  * Note: this file was generated by the Verlet kernel generator for
- * kernel type 4xn.
+ * kernel type 4xm.
  */
 
 /* Some target architectures compile kernels for only some NBNxN
@@ -45,11 +45,11 @@
  */
 #include "gmxpre.h"
 
-#include "gromacs/mdlib/nbnxn_simd.h"
 #include "gromacs/mdtypes/interaction_const.h"
+#include "gromacs/nbnxm/nbnxm_simd.h"
 
 #define GMX_SIMD_J_UNROLL_SIZE 1
-#include "gromacs/mdlib/nbnxn_kernels/simd_4xn/nbnxn_kernel_simd_4xn.h"
+#include "gromacs/nbnxm/kernels_simd_4xm/kernels.h"
 
 #define CALC_COUL_EWALD
 #define LJ_POT_SWITCH
@@ -57,12 +57,12 @@
 #define CALC_ENERGIES
 
 #ifdef GMX_NBNXN_SIMD_4XN
-#include "gromacs/mdlib/nbnxn_kernels/simd_4xn/nbnxn_kernel_simd_4xn_common.h"
+#include "gromacs/nbnxm/kernels_simd_4xm/kernel_common.h"
 #endif /* GMX_NBNXN_SIMD_4XN */
 
 #ifdef CALC_ENERGIES
 void
-nbnxn_kernel_ElecEw_VdwLJPSw_VF_4xn(const NbnxnPairlistCpu    gmx_unused *nbl,
+nbnxm_kernel_ElecEw_VdwLJPSw_VF_4xm(const NbnxnPairlistCpu    gmx_unused *nbl,
                                     const nbnxn_atomdata_t    gmx_unused *nbat,
                                     const interaction_const_t gmx_unused *ic,
                                     rvec                      gmx_unused *shift_vec,
@@ -72,7 +72,7 @@ nbnxn_kernel_ElecEw_VdwLJPSw_VF_4xn(const NbnxnPairlistCpu    gmx_unused *nbl,
                                     real                      gmx_unused *Vc)
 #else /* CALC_ENERGIES */
 void
-nbnxn_kernel_ElecEw_VdwLJPSw_VF_4xn(const NbnxnPairlistCpu    gmx_unused *nbl,
+nbnxm_kernel_ElecEw_VdwLJPSw_VF_4xm(const NbnxnPairlistCpu    gmx_unused *nbl,
                                     const nbnxn_atomdata_t    gmx_unused *nbat,
                                     const interaction_const_t gmx_unused *ic,
                                     rvec                      gmx_unused *shift_vec,
@@ -80,7 +80,7 @@ nbnxn_kernel_ElecEw_VdwLJPSw_VF_4xn(const NbnxnPairlistCpu    gmx_unused *nbl,
                                     real                      gmx_unused *fshift)
 #endif /* CALC_ENERGIES */
 #ifdef GMX_NBNXN_SIMD_4XN
-#include "gromacs/mdlib/nbnxn_kernels/simd_4xn/nbnxn_kernel_simd_4xn_outer.h"
+#include "gromacs/nbnxm/kernels_simd_4xm/kernel_outer.h"
 #else /* GMX_NBNXN_SIMD_4XN */
 {
 /* No need to call gmx_incons() here, because the only function