Merge branch release-2016

[alexxy/gromacs.git] / src / gromacs / topology / atoms.cpp

diff --git a/src/gromacs/topology/atoms.cpp b/src/gromacs/topology/atoms.cpp
index 72b504596a6d25bfc85b6d14213ddc14817d03c2..0fa17bcd36d388dbabe4b2cd0d5c4d032f88f70f 100644 (file)
--- a/src/gromacs/topology/atoms.cpp
+++ b/src/gromacs/topology/atoms.cpp
@@ -371,7 +371,7 @@ void cmp_atoms(FILE *fp, const t_atoms *a1, const t_atoms *a2, real ftol, real a
     if (a2)
     {
         cmp_int(fp, "atoms->nr", -1, a1->nr, a2->nr);
-        for (i = 0; (i < a1->nr); i++)
+        for (i = 0; i < std::min(a1->nr, a2->nr); i++)
         {
             cmp_atom(fp, i, &(a1->atom[i]), &(a2->atom[i]), ftol, abstol);
         }