From d9815fd9771ac6d0ab8a7b66b194e0424e1285e1 Mon Sep 17 00:00:00 2001 From: sjplimp Date: Tue, 10 Jan 2012 20:20:17 +0000 Subject: [PATCH] git-svn-id: svn://svn.icms.temple.edu/lammps-ro/trunk@7521 f3b2605a-c512-4ea7-a41b-209d697bcdaa --- doc/Section_commands.html | 15 ++++++++------- doc/Section_commands.txt | 1 + doc/pair_lj_smooth_linear.html | 24 ++++++++++++++++++++++++ doc/pair_lj_smooth_linear.txt | 23 +++++++++++++++++++++++ 4 files changed, 56 insertions(+), 7 deletions(-) diff --git a/doc/Section_commands.html b/doc/Section_commands.html index 60bad72c09..a86bf09e23 100644 --- a/doc/Section_commands.html +++ b/doc/Section_commands.html @@ -475,13 +475,14 @@ package. lj/cut/optlj/expand/cudalj/expand/gpulj/expand/omp lj/gromacs/coul/gromacs/cudalj/gromacs/coul/gromacs/omplj/gromacs/cudalj/gromacs/omp lj/sdk/gpulj/sdk/omplj/sdk/coul/long/gpulj/sdk/coul/long/omp -lj/sf/omplj/smooth/cudalj/smooth/omplj96/cut/cuda -lj96/cut/gpulj96/cut/omplubricate/omplubricate/poly/omp -morse/cudamorse/gpumorse/ompmorse/opt -peri/lps/ompperi/pmb/omprebo/ompresquared/gpu -resquared/ompsoft/ompsw/cudasw/omp -table/omptersoff/cudatersoff/omptersoff/table/omp -tersoff/zbl/omptri/lj/ompyukawa/ompyukawa/colloid/omp +lj/sf/omplj/smooth/cudalj/smooth/omplj/smooth/linear/omp +lj96/cut/cudalj96/cut/gpulj96/cut/omplubricate/omp +lubricate/poly/ompmorse/cudamorse/gpumorse/omp +morse/optperi/lps/ompperi/pmb/omprebo/omp +resquared/gpuresquared/ompsoft/ompsw/cuda +sw/omptable/omptersoff/cudatersoff/omp +tersoff/table/omptersoff/zbl/omptri/lj/ompyukawa/omp +yukawa/colloid/omp
diff --git a/doc/Section_commands.txt b/doc/Section_commands.txt index 484ef7175b..a1093b8e85 100644 --- a/doc/Section_commands.txt +++ b/doc/Section_commands.txt @@ -814,6 +814,7 @@ package"_Section_accelerate.html. "lj/sf/omp"_pair_lj_sf.html, "lj/smooth/cuda"_pair_lj_smooth.html, "lj/smooth/omp"_pair_lj_smooth.html, +"lj/smooth/linear/omp"_pair_lj_smooth_linear.html, "lj96/cut/cuda"_pair_lj96.html, "lj96/cut/gpu"_pair_lj96.html, "lj96/cut/omp"_pair_lj96.html, diff --git a/doc/pair_lj_smooth_linear.html b/doc/pair_lj_smooth_linear.html index 5a43b896d9..48de111cac 100644 --- a/doc/pair_lj_smooth_linear.html +++ b/doc/pair_lj_smooth_linear.html @@ -11,6 +11,8 @@

pair_style lj/smooth/linear command

+

pair_style lj/smooth/linear/omp command +

Syntax: 

pair_style lj/smooth/linear Rc 
@@ -48,6 +50,28 @@ for Rc is used.
 

 

 
+
Styles with a cuda, gpu, omp, or opt suffix are functionally
+the same as the corresponding style without the suffix.  They have
+been optimized to run faster, depending on your available hardware, as
+discussed in Section_accelerate of the
+manual.  The accelerated styles take the same arguments and should
+produce the same results, except for round-off and precision issues.
+

+
These accelerated styles are part of the USER-CUDA, GPU, USER-OMP and OPT
+packages, respectively.  They are only enabled if LAMMPS was built with
+those packages.  See the Making LAMMPS
+section for more info.
+

+
You can specify the accelerated styles explicitly in your input script
+by including their suffix, or you can use the -suffix command-line
+switch when you invoke LAMMPS, or you can
+use the suffix command in your input script.
+

+
See Section_accelerate of the manual for
+more instructions on how to use the accelerated styles effectively.
+

+

+
 
Mixing, shift, table, tail correction, restart, rRESPA info:
 

 
For atom type pairs I,J and I != J, the epsilon and sigma coefficients
diff --git a/doc/pair_lj_smooth_linear.txt b/doc/pair_lj_smooth_linear.txt
index 81899d8a5a..4b3db57607 100644
--- a/doc/pair_lj_smooth_linear.txt
+++ b/doc/pair_lj_smooth_linear.txt
@@ -7,6 +7,7 @@
 :line
 
 pair_style lj/smooth/linear command :h3
+pair_style lj/smooth/linear/omp command :h3
 
 [Syntax:]
 
@@ -45,6 +46,28 @@ for Rc is used.
 
 :line
 
+Styles with a {cuda}, {gpu}, {omp}, or {opt} suffix are functionally
+the same as the corresponding style without the suffix.  They have
+been optimized to run faster, depending on your available hardware, as
+discussed in "Section_accelerate"_Section_accelerate.html of the
+manual.  The accelerated styles take the same arguments and should
+produce the same results, except for round-off and precision issues.
+
+These accelerated styles are part of the USER-CUDA, GPU, USER-OMP and OPT
+packages, respectively.  They are only enabled if LAMMPS was built with
+those packages.  See the "Making LAMMPS"_Section_start.html#start_3
+section for more info.
+
+You can specify the accelerated styles explicitly in your input script
+by including their suffix, or you can use the "-suffix command-line
+switch"_Section_start.html#start_6 when you invoke LAMMPS, or you can
+use the "suffix"_suffix.html command in your input script.
+
+See "Section_accelerate"_Section_accelerate.html of the manual for
+more instructions on how to use the accelerated styles effectively.
+
+:line
+
 [Mixing, shift, table, tail correction, restart, rRESPA info]:
 
 For atom type pairs I,J and I != J, the epsilon and sigma coefficients