Merge release-4-6 into master

[alexxy/gromacs.git] / src / gromacs / legacyheaders / types / nrnb.h

diff --git a/src/gromacs/legacyheaders/types/nrnb.h b/src/gromacs/legacyheaders/types/nrnb.h
index d2a3ce575d622bf456466e65d5fccfd04efbc6df..945d4a3b0ec74f840345f2eb7de4c62f62951f87 100644 (file)
--- a/src/gromacs/legacyheaders/types/nrnb.h
+++ b/src/gromacs/legacyheaders/types/nrnb.h
@@ -74,6 +74,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,