Merge origin/release-4-6 into master

[alexxy/gromacs.git] / src / gromacs / gmxlib / nonbonded / nb_generic.h

diff --git a/src/gromacs/gmxlib/nonbonded/nb_generic.h b/src/gromacs/gmxlib/nonbonded/nb_generic.h
index fc44051cbc670468e940035bbd4ef2e426b02f65..845ca5699767f74a0c8674f03dfdb4a2acfef3ad 100644 (file)
--- a/src/gromacs/gmxlib/nonbonded/nb_generic.h
+++ b/src/gromacs/gmxlib/nonbonded/nb_generic.h
@@ -35,22 +35,19 @@
 #ifndef _nb_generic_h_
 #define _nb_generic_h_
 
+#include "nb_kernel.h"
 #include "types/simple.h"
 #include "typedefs.h"
 
 void
-gmx_nb_generic_kernel(t_nblist *           nlist,
-                                         t_forcerec *         fr,
-                                         t_mdatoms *          mdatoms,
-                                         real *               x,
-                                         real *               f,
-                                         real *               fshift,
-                                         real *               Vc,
-                                         real *               Vvdw,
-                                         real                 tabscale,  
-                                         real *               VFtab,
-                                         int *                outeriter,
-                                         int *                inneriter);
+gmx_nb_generic_kernel(t_nblist *                nlist,
+                      rvec *                    x,
+                      rvec *                    f,
+                      t_forcerec *              fr,
+                      t_mdatoms *               mdatoms,
+                      nb_kernel_data_t *        kernel_data,
+                      t_nrnb *                  nrnb);
+
 
 #endif