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

doc/Eqs/fix_wall_colloid.tex

@@ -0,0 +1,14 @@
+\documentstyle[12pt]{article}
+
+\begin{document}
+
+\begin{eqnarray}
+E &=& 144 \phi^2 \epsilon \left[ \frac{\sigma^{6}}{7560} 
+  \left(\frac{D-6R}{D^{7}} + \frac{D+8R}{(D+2R)^{7}} \right) - 
+  \frac{}{} \right. \nonumber \\
+  &&\qquad \left. \frac{1}{6} \left(\frac{2R(D+R) + D(D+2R)
+    \left[ \ln D - \ln (D+2R) \right]}{D(D+2R)} \right) \right] 
+\qquad r < r_c \nonumber
+\end{eqnarray}
+
+\end{document}

doc/Eqs/pair_colloid_cc.tex

@@ -4,25 +4,25 @@
 
 \begin{eqnarray}
 U_A &=& - \frac{A_{cc}}{6} \left[
-	\frac{2 a_1 a_2}{r^2-\left(a_1+a_2\right)^2}
-	+ \frac{2 a_1 a_2}{r^2 - \left(a_1 - a_2\right)^2}
-	+ \mathrm{ln}
-				\left( 
-					\frac{r^2-\left(a_1+a_2\right)^2}{r^2-\left(a_1-a_2\right)^2}
-				\right)
-\right] \nonumber \\
+  \frac{2 a_1 a_2}{r^2-\left(a_1+a_2\right)^2}
+  + \frac{2 a_1 a_2}{r^2 - \left(a_1 - a_2\right)^2}
+  + \mathrm{ln}
+  \left( 
+  \frac{r^2-\left(a_1+a_2\right)^2}{r^2-\left(a_1-a_2\right)^2}
+  \right)
+  \right] \nonumber \\
 \nonumber \\
 U_R &=& \frac{A_{cc}}{37800}  \frac{\sigma^6}{r}
 \left[ \frac{}{} \right. \nonumber \\
-	&&\qquad		\frac{r^2-7r\left(a_1+a_2\right)+6\left(a_1^2+7a_1a_2+a_2^2\right)}
-					{\left(r-a_1-a_2\right)^7} \nonumber \\
-	&&\qquad		+\frac{r^2+7r\left(a_1+a_2\right)+6\left(a_1^2+7a_1a_2+a_2^2\right)}
-					{\left(r+a_1+a_2\right)^7} \nonumber \\
-	&&\qquad		-\frac{r^2+7r\left(a_1-a_2\right)+6\left(a_1^2-7a_1a_2+a_2^2\right)}
-					{\left(r+a_1-a_2\right)^7} \nonumber \\
-	&&\qquad	\left.	-\frac{r^2-7r\left(a_1-a_2\right)+6\left(a_1^2-7a_1a_2+a_2^2\right)}
-					{\left(r-a_1+a_2\right)^7}
-\right] \nonumber \\
+  &&\qquad		\frac{r^2-7r\left(a_1+a_2\right)+6\left(a_1^2+7a_1a_2+a_2^2\right)}
+  {\left(r-a_1-a_2\right)^7} \nonumber \\
+  &&\qquad		+\frac{r^2+7r\left(a_1+a_2\right)+6\left(a_1^2+7a_1a_2+a_2^2\right)}
+  {\left(r+a_1+a_2\right)^7} \nonumber \\
+  &&\qquad		-\frac{r^2+7r\left(a_1-a_2\right)+6\left(a_1^2-7a_1a_2+a_2^2\right)}
+  {\left(r+a_1-a_2\right)^7} \nonumber \\
+  &&\qquad	\left.	-\frac{r^2-7r\left(a_1-a_2\right)+6\left(a_1^2-7a_1a_2+a_2^2\right)}
+  {\left(r-a_1+a_2\right)^7}
+  \right] \nonumber \\
 \nonumber \\
 U &=& U_A + U_R, \qquad r < r_c \nonumber
 \end{eqnarray}

doc/pair_yukawa_colloid.html

@@ -113,9 +113,9 @@ LAMMPS</A> section for more info.
 <P>Because this potential uses the radii of the particles, the atom style
 must support particles whose size is set via the <A HREF = "shape.html">shape</A>
 command.  For example <A HREF = "atom_style.html">atom_style</A> colloid or
-ellipsoid.  Only spherical mono-disperse particles are currently
-allowed for pair_style yukawa/colloid, which means the 3 shape
-diameters for all particle types must be the same.
+ellipsoid.  Only spherical particles are currently allowed for
+pair_style yukawa/colloid, which means that for each particle type,
+its 3 shape diameters must be equal to each other.
 </P>
 <P><B>Related commands:</B>
 </P>

doc/pair_yukawa_colloid.txt

@@ -110,9 +110,9 @@ LAMMPS"_Section_start.html#2_3 section for more info.
 Because this potential uses the radii of the particles, the atom style
 must support particles whose size is set via the "shape"_shape.html
 command.  For example "atom_style"_atom_style.html colloid or
-ellipsoid.  Only spherical mono-disperse particles are currently
-allowed for pair_style yukawa/colloid, which means the 3 shape
-diameters for all particle types must be the same.
+ellipsoid.  Only spherical particles are currently allowed for
+pair_style yukawa/colloid, which means that for each particle type,
+its 3 shape diameters must be equal to each other.
 
 [Related commands:]