From 09836f00401810b2c35b59848cfae71be3e1d5a7 Mon Sep 17 00:00:00 2001 From: sjplimp Date: Thu, 20 Sep 2012 15:51:29 +0000 Subject: [PATCH] git-svn-id: svn://svn.icms.temple.edu/lammps-ro/trunk@8804 f3b2605a-c512-4ea7-a41b-209d697bcdaa --- src/REPLICA/fix_event.cpp | 2 +- src/REPLICA/tad.cpp | 7 +++---- 2 files changed, 4 insertions(+), 5 deletions(-) diff --git a/src/REPLICA/fix_event.cpp b/src/REPLICA/fix_event.cpp index f62f2983d8..f048ba3f12 100644 --- a/src/REPLICA/fix_event.cpp +++ b/src/REPLICA/fix_event.cpp @@ -105,7 +105,7 @@ void FixEvent::restore_event() x[i][1] = xevent[i][1]; x[i][2] = xevent[i][2]; - // Since xevent is unwrapped coordinate, need to + // since xevent is unwrapped coordinate, need to // adjust image flags when remapping image[i] = ((tagint) IMGMAX << IMG2BITS) | diff --git a/src/REPLICA/tad.cpp b/src/REPLICA/tad.cpp index bd736607bc..23633af5dc 100644 --- a/src/REPLICA/tad.cpp +++ b/src/REPLICA/tad.cpp @@ -839,10 +839,9 @@ void TAD::revert() x[i][0] = array_atom[i][0]; x[i][1] = array_atom[i][1]; x[i][2] = array_atom[i][2]; - image[i] = - ((int(array_atom[i][5]) + (tagint) IMGMAX & IMGMASK) << IMG2BITS) | - ((int(array_atom[i][4]) + (tagint) IMGMAX & IMGMASK) << IMGBITS) | - (int(array_atom[i][3]) + IMGMAX & IMGMASK); + image[i] = ((tagint) (int(array_atom[i][3]) + IMGMAX) & IMGMASK) | + (((tagint) (int(array_atom[i][4]) + IMGMAX) & IMGMASK) << IMGBITS) | + (((tagint) (int(array_atom[i][5]) + IMGMAX) & IMGMASK) << IMG2BITS); v[i][0] = -array_atom[i][6]; v[i][1] = -array_atom[i][7]; v[i][2] = -array_atom[i][8];