git-svn-id: svn://svn.icms.temple.edu/lammps-ro/trunk@2353 f3b2605a-c512-4ea7-a41b-209d697bcdaa

2009-01-08 22:54:40 +00:00
parent aeda10da5f
commit d15532c6aa
1 changed files with 7 additions and 0 deletions
--- a/src/GRANULAR/fix_wall_gran.cpp
+++ b/src/GRANULAR/fix_wall_gran.cpp
@ -70,6 +70,13 @@ FixWallGran::FixWallGran(LAMMPS *lmp, int narg, char **arg) :
      xmu < 0.0 || xmu > 1.0 || dampflag < 0 || dampflag > 1)
    error->all("Illegal fix wall/gran command");

+  // convert Kn and Kt from pressure units to force/distance^2 if Hertzian
+
+  if (force->pair_match("gran/hertz/history",1)) {
+    kn /= force->nktv2p;
+    kt /= force->nktv2p;
+  }
+
  // wallstyle args

  int iarg = 9;