From f352e63370ab86357589ba0037710af1de848691 Mon Sep 17 00:00:00 2001
From: sjplimp <sjplimp@f3b2605a-c512-4ea7-a41b-209d697bcdaa>
Date: Mon, 6 Nov 2006 23:43:36 +0000
Subject: [PATCH] git-svn-id: svn://svn.icms.temple.edu/lammps-ro/trunk@131
 f3b2605a-c512-4ea7-a41b-209d697bcdaa

---
 src/GRANULAR/fix_insert.cpp   | 2 +-
 src/MANYBODY/pair_sw.cpp      | 4 +++-
 src/MANYBODY/pair_tersoff.cpp | 4 +++-
 src/fix_momentum.cpp          | 4 ++--
 src/fix_recenter.cpp          | 2 +-
 src/velocity.cpp              | 2 +-
 6 files changed, 11 insertions(+), 7 deletions(-)

diff --git a/src/GRANULAR/fix_insert.cpp b/src/GRANULAR/fix_insert.cpp
index 30367ba2e4..94c6e3ec33 100644
--- a/src/GRANULAR/fix_insert.cpp
+++ b/src/GRANULAR/fix_insert.cpp
@@ -292,7 +292,7 @@ void FixInsert::pre_exchange()
   int nnew = nper;
   if (ninserted + nnew > ninsert) nnew = ninsert - ninserted;
 
-  // lo/hi current = z bounds of insertion region this timestep
+  // lo/hi current = z (or y) bounds of insertion region this timestep
 
   if (force->dimension == 3) {
     lo_current = zlo + (update->ntimestep - nfirst) * update->dt * rate;
diff --git a/src/MANYBODY/pair_sw.cpp b/src/MANYBODY/pair_sw.cpp
index 0ed56d3873..2b96b5aa7e 100755
--- a/src/MANYBODY/pair_sw.cpp
+++ b/src/MANYBODY/pair_sw.cpp
@@ -303,6 +303,7 @@ void PairSW::init_style()
 void PairSW::read_file(char *file)
 {
   int params_per_line = 13;
+  char **words = new char*[params_per_line];
 
   if (params) delete [] params;
   params = NULL;
@@ -325,7 +326,6 @@ void PairSW::read_file(char *file)
   // store params if all 3 element tags are in element list
 
   int i,n,nwords,ielement,jelement,kelement;
-  char *words[params_per_line];
   char line[MAXLINE],*ptr;
   int eof = 0;
 
@@ -422,6 +422,8 @@ void PairSW::read_file(char *file)
 
     nparams++;
   }
+
+  delete [] words;
 }
 
 /* ---------------------------------------------------------------------- */
diff --git a/src/MANYBODY/pair_tersoff.cpp b/src/MANYBODY/pair_tersoff.cpp
index 85a0d22836..996ce9f859 100755
--- a/src/MANYBODY/pair_tersoff.cpp
+++ b/src/MANYBODY/pair_tersoff.cpp
@@ -340,6 +340,7 @@ void PairTersoff::init_style()
 void PairTersoff::read_file(char *file)
 {
   int params_per_line = 15;
+  char **words = new char*[params_per_line];
 
   if (params) delete [] params;
   params = NULL;
@@ -361,7 +362,6 @@ void PairTersoff::read_file(char *file)
   // store line of params if all 3 element tags are in element list
 
   int i,n,nwords,ielement,jelement,kelement;
-  char *words[params_per_line];
   char line[MAXLINE],*ptr;
   int eof = 0;
 
@@ -462,6 +462,8 @@ void PairTersoff::read_file(char *file)
 
     nparams++;
   }
+
+  delete [] words;
 }
 
 /* ---------------------------------------------------------------------- */
diff --git a/src/fix_momentum.cpp b/src/fix_momentum.cpp
index fab96b9429..87fa9b1821 100644
--- a/src/fix_momentum.cpp
+++ b/src/fix_momentum.cpp
@@ -49,7 +49,7 @@ FixMomentum::FixMomentum(int narg, char **arg) : Fix(narg, arg)
   }
 
   if (linear == 0 && angular == 0)
-    error->all("Illegal run_style respa command");
+    error->all("Illegal fix momentum command");
 
   if (linear)
     if (xflag < 0 || xflag > 1 || yflag < 0 || yflag > 1 || 
@@ -132,7 +132,7 @@ void FixMomentum::end_of_step()
 	dy = (x[i][1] + ybox*yprd) - xcm[1];
 	dz = (x[i][2] + zbox*zprd) - xcm[2];
 	v[i][0] -= omega[1]*dz - omega[2]*dy;
-	v[i][1] -= omega[2]*dx - omega[0]*dy;
+	v[i][1] -= omega[2]*dx - omega[0]*dz;
 	v[i][2] -= omega[0]*dy - omega[1]*dx;
       }
   }
diff --git a/src/fix_recenter.cpp b/src/fix_recenter.cpp
index b369f23f3b..7627544e4b 100644
--- a/src/fix_recenter.cpp
+++ b/src/fix_recenter.cpp
@@ -61,7 +61,7 @@ FixRecenter::FixRecenter(int narg, char **arg) : Fix(narg, arg)
       if (strcmp(arg[iarg+1],"box") == 0) scaleflag = 0;
       else if (strcmp(arg[iarg+1],"lattice") == 0) scaleflag = 1;
       else if (strcmp(arg[iarg+1],"fraction") == 0) scaleflag = 2;
-      else error->all("Illegal fix indent command");
+      else error->all("Illegal fix recenter command");
       iarg += 2;
     } else error->all("Illegal fix recenter command");
   }
diff --git a/src/velocity.cpp b/src/velocity.cpp
index 16108899ce..2fbdd7cabe 100644
--- a/src/velocity.cpp
+++ b/src/velocity.cpp
@@ -582,7 +582,7 @@ void Velocity::zero_rotation()
       dy = (x[i][1] + ybox*yprd) - xcm[1];
       dz = (x[i][2] + zbox*zprd) - xcm[2];
       v[i][0] -= omega[1]*dz - omega[2]*dy;
-      v[i][1] -= omega[2]*dx - omega[0]*dy;
+      v[i][1] -= omega[2]*dx - omega[0]*dz;
       v[i][2] -= omega[0]*dy - omega[1]*dx;
     }
 }