From c56fbcd1a38d02278fa858b41537e626cbea287e Mon Sep 17 00:00:00 2001
From: sjplimp <sjplimp@f3b2605a-c512-4ea7-a41b-209d697bcdaa>
Date: Fri, 27 Mar 2015 19:55:56 +0000
Subject: [PATCH] git-svn-id: svn://svn.icms.temple.edu/lammps-ro/trunk@13315
 f3b2605a-c512-4ea7-a41b-209d697bcdaa

---
 src/neighbor.cpp | 3 ++-
 src/special.cpp  | 2 +-
 2 files changed, 3 insertions(+), 2 deletions(-)

diff --git a/src/neighbor.cpp b/src/neighbor.cpp
index 37e6696ffd..d2face512f 100644
--- a/src/neighbor.cpp
+++ b/src/neighbor.cpp
@@ -876,7 +876,8 @@ void Neighbor::init()
   int bond_off = 0;
   int angle_off = 0;
   for (i = 0; i < modify->nfix; i++)
-    if (strcmp(modify->fix[i]->style,"shake") == 0)
+    if ((strcmp(modify->fix[i]->style,"shake") == 0)
+        || (strcmp(modify->fix[i]->style,"rattle") == 0))
       bond_off = angle_off = 1;
   if (force->bond && force->bond_match("quartic")) bond_off = 1;
 
diff --git a/src/special.cpp b/src/special.cpp
index 420a8388ab..6b969e0006 100644
--- a/src/special.cpp
+++ b/src/special.cpp
@@ -220,7 +220,7 @@ void Special::build()
   // extract count from buffer that has cycled back to me
   // nspecial[i][1] = # of 1-3 neighbors of atom i
 
-  j = 0;
+<  j = 0;
   for (i = 0; i < nlocal; i++) {
     nspecial[i][1] = buf[j];
     j += 2 + nspecial[i][0];