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 ae28aefd047e054c69e9a0ada23ae847baf92291..be404308f4514458fab5492237fd98da86c9e6cd 100644 (file)
--- a/src/gromacs/legacyheaders/types/nrnb.h
+++ b/src/gromacs/legacyheaders/types/nrnb.h
@@ -80,11 +80,13 @@ enum
     eNR_NBKERNEL_ALLVSALLGB,
 
     eNR_NBNXN_DIST2,
-    eNR_NBNXN_LJ_RF,  eNR_NBNXN_LJ_RF_E,
-    eNR_NBNXN_LJ_TAB, eNR_NBNXN_LJ_TAB_E,
-    eNR_NBNXN_LJ,     eNR_NBNXN_LJ_E,
-    eNR_NBNXN_RF,     eNR_NBNXN_RF_E,
-    eNR_NBNXN_TAB,    eNR_NBNXN_TAB_E,
+    eNR_NBNXN_LJ_RF,    eNR_NBNXN_LJ_RF_E,
+    eNR_NBNXN_LJ_TAB,   eNR_NBNXN_LJ_TAB_E,
+    eNR_NBNXN_LJ_EWALD, eNR_NBNXN_LJ_EWALD_E,
+    eNR_NBNXN_LJ,       eNR_NBNXN_LJ_E,
+    eNR_NBNXN_RF,       eNR_NBNXN_RF_E,
+    eNR_NBNXN_TAB,      eNR_NBNXN_TAB_E,
+    eNR_NBNXN_EWALD,    eNR_NBNXN_EWALD_E,
     eNR_NB14,
     eNR_BORN_RADII_STILL,     eNR_BORN_RADII_HCT_OBC,
     eNR_BORN_CHAINRULE,