Merge release-4-6 into master

[alexxy/gromacs.git] / src / gromacs / gmxlib / nonbonded / nb_generic_cg.c

diff --git a/src/gromacs/gmxlib/nonbonded/nb_generic_cg.c b/src/gromacs/gmxlib/nonbonded/nb_generic_cg.c
index a7befbec0616522ec3e031b7ba7ba300ef933455..cc24267d1162f1420adc2cc1cf58f8c6c3d950ca 100644 (file)
--- a/src/gromacs/gmxlib/nonbonded/nb_generic_cg.c
+++ b/src/gromacs/gmxlib/nonbonded/nb_generic_cg.c
@@ -327,5 +327,5 @@ gmx_nb_generic_cg_kernel(t_nblist *                nlist,
      * 12  flops per outer iteration
      * 100 flops per inner iteration
      */
-    inc_nrnb(nrnb, eNR_NBKERNEL_FREE_ENERGY, nlist->nri*12 + nlist->jindex[n]*100);
+    inc_nrnb(nrnb, eNR_NBKERNEL_GENERIC_CG, nlist->nri*12 + nlist->jindex[n]*100);
 }