From 509dce4818fa7941f8dc603d121274fb96e6198a Mon Sep 17 00:00:00 2001
From: sjplimp <sjplimp@f3b2605a-c512-4ea7-a41b-209d697bcdaa>
Date: Tue, 23 Mar 2010 15:18:16 +0000
Subject: [PATCH] git-svn-id: svn://svn.icms.temple.edu/lammps-ro/trunk@3920
 f3b2605a-c512-4ea7-a41b-209d697bcdaa

---
 src/GRANULAR/fix_wall_gran.cpp | 8 +++++---
 1 file changed, 5 insertions(+), 3 deletions(-)

diff --git a/src/GRANULAR/fix_wall_gran.cpp b/src/GRANULAR/fix_wall_gran.cpp
index cda1fb9081..5331ce1f6f 100644
--- a/src/GRANULAR/fix_wall_gran.cpp
+++ b/src/GRANULAR/fix_wall_gran.cpp
@@ -31,7 +31,7 @@
 
 using namespace LAMMPS_NS;
 
-enum{XPLANE,YPLANE,ZPLANE,ZCYLINDER};
+enum{XPLANE,YPLANE,ZPLANE,ZCYLINDER};    // XYZ PLANE need to be 0,1,2
 enum{HOOKE,HOOKE_HISTORY,HERTZ_HISTORY};
 
 #define BIG 1.0e20
@@ -255,8 +255,10 @@ void FixWallGran::post_force(int vflag)
   vwall[0] = vwall[1] = vwall[2] = 0.0;
   if (wiggle) {
     double arg = omega * (update->ntimestep - time_origin) * dt;
-    wlo = lo + amplitude - amplitude*cos(arg);
-    whi = hi + amplitude - amplitude*cos(arg);
+    if (wallstyle == axis) {
+      wlo = lo + amplitude - amplitude*cos(arg);
+      whi = hi + amplitude - amplitude*cos(arg);
+    }
     vwall[axis] = amplitude*omega*sin(arg);
   } else if (wshear) vwall[axis] = vshear;