Commit bd1c701a authored by sjplimp's avatar sjplimp
Browse files

git-svn-id: svn://svn.icms.temple.edu/lammps-ro/trunk@5433 f3b2605a-c512-4ea7-a41b-209d697bcdaa
parent 47309e66
Loading
Loading
Loading
Loading
+3 −2
Original line number Diff line number Diff line
@@ -119,8 +119,9 @@ the pair_style command.
</P>
<P>For atom type pairs I,J and I != J, the epsilon, sigma, epsilon_14,
and sigma_14 coefficients for all of the lj/charmm pair styles can be
mixed.  They are always mixed with the value <I>arithmetic</I>.  See the
"pair_modify" command for details.
mixed.  The default mix value is <I>arithmetic</I> to coincide with the
usual settings for the CHARMM force field.  See the "pair_modify"
command for details.
</P>
<P>None of the lj/charmm pair styles support the
<A HREF = "pair_modify.html">pair_modify</A> shift option, since the Lennard-Jones
+3 −2
Original line number Diff line number Diff line
@@ -112,8 +112,9 @@ the pair_style command.

For atom type pairs I,J and I != J, the epsilon, sigma, epsilon_14,
and sigma_14 coefficients for all of the lj/charmm pair styles can be
mixed.  They are always mixed with the value {arithmetic}.  See the
"pair_modify" command for details.
mixed.  The default mix value is {arithmetic} to coincide with the
usual settings for the CHARMM force field.  See the "pair_modify"
command for details.

None of the lj/charmm pair styles support the
"pair_modify"_pair_modify.html shift option, since the Lennard-Jones