Fixed flop counting for generic cg/adress kernels

Change-Id: I95f2a68a0de64f479820143fdba09ea09805fa93

diff --git a/include/types/nrnb.h b/include/types/nrnb.h
index c895a97206a111f3c45ad58236a4989b2e53611a..98b3f72478a680a871a841c963249b974b419bdd 100644 (file)
--- a/include/types/nrnb.h
+++ b/include/types/nrnb.h
@@ -77,6 +77,8 @@ enum
     eNR_NBKERNEL_NR,                        /* Total number of interaction-specific kernel entries */
 
     eNR_NBKERNEL_GENERIC = eNR_NBKERNEL_NR, /* Reuse number; KERNEL_NR is not an entry itself */
+    eNR_NBKERNEL_GENERIC_CG,
+    eNR_NBKERNEL_GENERIC_ADRESS,
     eNR_NBKERNEL_FREE_ENERGY,               /* Add other generic kernels _before_ the free energy one */
 
     eNR_NBKERNEL_ALLVSALL,

diff --git a/src/gmxlib/nonbonded/nb_generic_adress.c b/src/gmxlib/nonbonded/nb_generic_adress.c
index 2206ae9363de57ca51c8b0eaac8ca3652635fcc2..0de6a0ca82b2a3825f49678ad30e1dea9ca609a3 100644 (file)
--- a/src/gmxlib/nonbonded/nb_generic_adress.c
+++ b/src/gmxlib/nonbonded/nb_generic_adress.c
@@ -508,9 +508,9 @@ gmx_nb_generic_adress_kernel(t_nblist *                nlist,
         velecgrp[ggid]  += vctot;
         vvdwgrp[ggid]   += vvdwtot;
     }
-    /* Estimate flops, average for generic kernel:
-     * 12 flops per outer iteration
-     * 50 flops per inner iteration
+    /* Estimate flops, average for generic adress kernel:
+     * 14 flops per outer iteration
+     * 54 flops per inner iteration
      */
-    inc_nrnb(nrnb, eNR_NBKERNEL_GENERIC, nlist->nri*12 + nlist->jindex[n]*50);
+    inc_nrnb(nrnb, eNR_NBKERNEL_GENERIC_ADRESS, nlist->nri*14 + nlist->jindex[n]*54);
 }

diff --git a/src/gmxlib/nonbonded/nb_generic_cg.c b/src/gmxlib/nonbonded/nb_generic_cg.c
index f2ef2517794f0cb5ee34c08c81e779aecbce4c7f..750a5029ea0dcc4570f6fa557d4cbcb5290af0f5 100644 (file)
--- a/src/gmxlib/nonbonded/nb_generic_cg.c
+++ b/src/gmxlib/nonbonded/nb_generic_cg.c
@@ -329,5 +329,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);
 }

diff --git a/src/gmxlib/nrnb.c b/src/gmxlib/nrnb.c
index 2c8fae57649f10a21869ac733b71f4671c9f3f07..78e66942a9008e67704a84c3299a9b20f0c3bd4e 100644 (file)
--- a/src/gmxlib/nrnb.c
+++ b/src/gmxlib/nrnb.c
@@ -88,6 +88,8 @@ static const t_nrnb_data nbdata[eNRNB] = {
     { "NB VdW & Elec. [W4-W4,F]",        1 },
 
     { "NB Generic kernel",               1 },
+    { "NB Generic charge grp kernel",    1 },
+    { "NB Generic AdResS kernel",        1 },
     { "NB Free energy kernel",           1 },
     { "NB All-vs-all",                   1 },
     { "NB All-vs-all, GB",               1 },