sync with Git

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

doc/src/fix_nve_manifold_rattle.txt

@@ -76,10 +76,6 @@ This fix is part of the USER-MANIFOLD package. It is only enabled if LAMMPS
 was built with that package. See the "Making LAMMPS"_Section_start.html#start_3
 section for more info.
 
-Only use this with {min_style hftn} or {min_style quickmin}. If not, the constraints
-will not be satisfied very well at all. A warning is generated if the {min_style} is
-incompatible but no error.
-
 :line
 
 [Related commands:]
@@ -94,7 +90,7 @@ incompatible but no error.
 [(Andersen)] Andersen, J. Comp. Phys. 52, 24, (1983).
 
 :link(Paquay)
-[(Paquay)] Paquay and Kusters, Biophys. J., 110, ???, (2016), to be published,
+[(Paquay)] Paquay and Kusters, Biophys. J., 110, 6, (2016).
 preprint available at "arXiv:1411.3019"_http://arxiv.org/abs/1411.3019/.
 
 

doc/src/fix_nvt_manifold_rattle.txt

@@ -62,10 +62,6 @@ This fix is part of the USER-MANIFOLD package. It is only enabled if LAMMPS
 was built with that package. See the "Making LAMMPS"_Section_start.html#start_3
 section for more info.
 
-Only use this with {min_style hftn} or {min_style quickmin}. If not, the constraints
-will not be satisfied very well at all. A warning is generated if the {min_style} is
-incompatible but no error.
-
 :line
 
 
@@ -80,6 +76,6 @@ incompatible but no error.
 [(Andersen)] Andersen, J. Comp. Phys. 52, 24, (1983).
 
 :link(Paquay)
-[(Paquay)] Paquay and Kusters, Biophys. J., 110, ???, (2016), to be published,
+[(Paquay)] Paquay and Kusters, Biophys. J., 110, 6, (2016).
 preprint available at "arXiv:1411.3019"_http://arxiv.org/abs/1411.3019/.
 

src/USER-MISC/fix_flow_gauss.cpp

@@ -47,7 +47,7 @@ static const char cite_flow_gauss[] =
   "pages = {1907--1912}\n"
   "}\n\n";
 
-FixFlowGauss::FixFlowGauss(LAMMPS *lmp, int narg, char **arg) : 
+FixFlowGauss::FixFlowGauss(LAMMPS *lmp, int narg, char **arg) :
   Fix(lmp, narg, arg)
 {
   if (lmp->citeme) lmp->citeme->add(cite_flow_gauss);
@@ -77,7 +77,7 @@ FixFlowGauss::FixFlowGauss(LAMMPS *lmp, int narg, char **arg) :
       error->all(FLERR,"Constraint flags must be 1 or 0");
   }
 
-  //by default, do not compute work done
+  // by default, do not compute work done
   workflag=0;
 
   // process optional keyword
@@ -86,7 +86,7 @@ FixFlowGauss::FixFlowGauss(LAMMPS *lmp, int narg, char **arg) :
     if ( strcmp(arg[iarg],"energy") == 0 ) {
       if ( iarg+2 > narg ) error->all(FLERR,"Illegal energy keyword");
       if ( strcmp(arg[iarg+1],"yes") == 0 ) workflag = 1;
-      else if ( strcmp(arg[iarg+1],"no") == 1 ) 
+      else if ( strcmp(arg[iarg+1],"no") != 0 )
         error->all(FLERR,"Illegal energy keyword");
       iarg += 2;
     } else error->all(FLERR,"Illegal fix flow/gauss command");
@@ -136,7 +136,6 @@ void FixFlowGauss::setup(int vflag)
 void FixFlowGauss::post_force(int vflag)
 {
   double **f   = atom->f;
-  double **x   = atom->x;
   double **v   = atom->v;
 
   int *mask    = atom->mask;