From 880ba18d387096786fa700eea65c74480a399f0b Mon Sep 17 00:00:00 2001 From: sjplimp Date: Thu, 12 Sep 2013 21:57:21 +0000 Subject: [PATCH] git-svn-id: svn://svn.icms.temple.edu/lammps-ro/trunk@10774 f3b2605a-c512-4ea7-a41b-209d697bcdaa --- doc/pair_lj_smooth_linear.html | 2 +- doc/pair_lj_smooth_linear.txt | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/doc/pair_lj_smooth_linear.html b/doc/pair_lj_smooth_linear.html index 5780bf97a8..05fb3e21e1 100644 --- a/doc/pair_lj_smooth_linear.html +++ b/doc/pair_lj_smooth_linear.html @@ -31,7 +31,7 @@ pair_coeff 1 1 20.0 1.3 9.0 standard 12/6 Lennard-Jones function and subtracts a linear term that includes the cutoff distance Rc, as in this formula:

-
+

At the cutoff Rc, the energy and force (its 1st derivative) will be 0.0.

diff --git a/doc/pair_lj_smooth_linear.txt b/doc/pair_lj_smooth_linear.txt index 4aad8f6bd2..a250d48f39 100644 --- a/doc/pair_lj_smooth_linear.txt +++ b/doc/pair_lj_smooth_linear.txt @@ -27,7 +27,7 @@ Style {lj/smooth/linear} computes a LJ interaction that combines the standard 12/6 Lennard-Jones function and subtracts a linear term that includes the cutoff distance Rc, as in this formula: -:c,image(Eqs/pair_lj_cut_smooth_linear.jpg) +:c,image(Eqs/pair_lj_smooth_linear.jpg) At the cutoff Rc, the energy and force (its 1st derivative) will be 0.0.