Merge branch release-2016

[alexxy/gromacs.git] / src / gromacs / gmxlib / nrnb.cpp

diff --git a/src/gromacs/gmxlib/nrnb.cpp b/src/gromacs/gmxlib/nrnb.cpp
index c0509feb606207a47365a3caae88975aab46a620..4bc3f67230888a05c9d20651976d2411cd33997d 100644 (file)
--- a/src/gromacs/gmxlib/nrnb.cpp
+++ b/src/gromacs/gmxlib/nrnb.cpp
@@ -189,7 +189,11 @@ static const t_nrnb_data nbdata[eNRNB] = {
     { "Virtual Site 4fd",              110 },
     { "Virtual Site 4fdn",             254 },
     { "Virtual Site N",                 15 },
-    { "Mixed Generalized Born stuff",   10 }
+    { "Mixed Generalized Born stuff",   10 },
+    { "CMAP",                         1700 }, // Estimate!
+    { "Urey-Bradley",                  183 },
+    { "Cross-Bond-Bond",               163 },
+    { "Cross-Bond-Angle",              163 }
 };
 
 static void pr_two(FILE *out, int c, int i)