From 7930d8b34f8d547adad3602ee63cd877e89ad730 Mon Sep 17 00:00:00 2001 From: sjplimp Date: Mon, 21 Jan 2013 16:35:54 +0000 Subject: [PATCH] git-svn-id: svn://svn.icms.temple.edu/lammps-ro/trunk@9306 f3b2605a-c512-4ea7-a41b-209d697bcdaa --- doc/Section_commands.html | 111 +++++++++++++++++++------------------- doc/Section_commands.txt | 14 +++-- doc/kspace_style.html | 4 +- doc/kspace_style.txt | 4 +- doc/pair_born.html | 43 +++++++++------ doc/pair_born.txt | 41 ++++++++------ doc/pair_buck.html | 36 ++++++++----- doc/pair_buck.txt | 34 +++++++----- doc/pair_charmm.html | 28 +++++++--- doc/pair_charmm.txt | 26 ++++++--- doc/pair_coul.html | 28 ++++++---- doc/pair_coul.txt | 26 +++++---- doc/pair_lj.html | 37 ++++++++----- doc/pair_lj.txt | 35 +++++++----- 14 files changed, 289 insertions(+), 178 deletions(-) diff --git a/doc/Section_commands.html b/doc/Section_commands.html index c78886303c..4a8ea4e525 100644 --- a/doc/Section_commands.html +++ b/doc/Section_commands.html @@ -419,25 +419,26 @@ potentials. Click on the style itself for a full description:
- - - - - - - - - + + + + + + + + + + - - - - - - - - + + + + + + +
nonehybridhybrid/overlayadp
airebobeckbopborn
born/coul/longborn/coul/wolfbrownianbrownian/poly
buckbuck/coul/cutbuck/coul/longbuck/long/coul/long
colloidcombcoul/cutcoul/debye
coul/dsfcoul/longcoul/wolfdipole/cut
dpddpd/tstatdsmceam
eam/alloyeam/fseimgauss
gaybernegran/hertz/historygran/hookegran/hooke/history
hbond/dreiding/ljhbond/dreiding/morsekimlcbop
line/ljlj/charmm/coul/charmmlj/charmm/coul/charmm/implicitlj/charmm/coul/long
born/coul/longborn/coul/msmborn/coul/wolfbrownian
brownian/polybuckbuck/coul/cutbuck/coul/long
buck/coul/msmbuck/long/coul/longcolloidcomb
coul/cutcoul/debyecoul/dsfcoul/long
coul/msmcoul/wolfdipole/cutdpd
dpd/tstatdsmceameam/alloy
eam/fseimgaussgayberne
gran/hertz/historygran/hookegran/hooke/historyhbond/dreiding/lj
hbond/dreiding/morsekimlcbopline/lj
lj/charmm/coul/charmmlj/charmm/coul/charmm/implicitlj/charmm/coul/longlj/charmm/coul/msm
lj/class2lj/class2/coul/cutlj/class2/coul/longlj/cut
lj/cut/coul/cutlj/cut/coul/debyelj/cut/coul/dsflj/cut/coul/long
lj/long/coul/longlj/cut/tip4p/longlj/long/tip4p/longlj/expand
lj/gromacslj/gromacs/coul/gromacslj/smoothlj/smooth/linear
lj96/cutlubricatelubricate/polylubricateU
lubricateU/polymeammie/cutmorse
peri/lpsperi/pmbreaxrebo
resquaredsoftswtable
tersofftersoff/zbltri/ljyukawa
yukawa/colloid +
lj/cut/coul/msmlj/long/coul/longlj/cut/tip4p/longlj/long/tip4p/long
lj/expandlj/gromacslj/gromacs/coul/gromacslj/smooth
lj/smooth/linearlj96/cutlubricatelubricate/poly
lubricateUlubricateU/polymeammie/cut
morseperi/lpsperi/pmbreax
reboresquaredsoftsw
tabletersofftersoff/zbltri/lj
yukawayukawa/colloid

These are pair styles contributed by users, which can be used if @@ -458,42 +459,42 @@ package.

- - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + +
adp/ompairebo/ompbeck/ompborn/coul/long/cuda
born/coul/long/gpuborn/coul/long/ompborn/coul/wolf/gpuborn/coul/wolf/omp
born/gpuborn/ompbrownian/ompbrownian/poly/omp
buck/coul/cut/cudabuck/coul/cut/gpubuck/coul/cut/ompbuck/coul/long/cuda
buck/coul/long/gpubuck/coul/long/ompbuck/cudabuck/long/coul/long/omp
buck/gpubuck/ompcolloid/gpucolloid/omp
comb/ompcoul/cut/ompcoul/debye/ompcoul/dsf/gpu
coul/long/gpucoul/long/ompcoul/wolfdipole/cut/gpu
dipole/cut/ompdipole/sf/gpudipole/sf/ompdpd/omp
dpd/tstat/ompeam/alloy/cudaeam/alloy/gpueam/alloy/omp
eam/alloy/opteam/cd/ompeam/cudaeam/fs/cuda
eam/fs/gpueam/fs/ompeam/fs/opteam/gpu
eam/ompeam/optedip/ompeim/omp
gauss/gpugauss/ompgayberne/gpugayberne/omp
gran/hertz/history/ompgran/hooke/cudagran/hooke/history/ompgran/hooke/omp
hbond/dreiding/lj/omphbond/dreiding/morse/ompline/lj/omplj/charmm/coul/charmm/cuda
lj/charmm/coul/charmm/omplj/charmm/coul/charmm/implicit/cudalj/charmm/coul/charmm/implicit/omplj/charmm/coul/long/cuda
lj/charmm/coul/long/gpulj/charmm/coul/long/omplj/charmm/coul/long/optlj/charmm/coul/pppm/omp
lj/class2/coul/cut/cudalj/class2/coul/cut/omplj/class2/coul/long/cudalj/class2/coul/long/gpu
lj/class2/coul/pppm/omplj/class2/coul/long/omplj/class2/cudalj/class2/gpu
lj/class2/omplj/long/coul/long/omplj/cut/coul/cut/cudalj/cut/coul/cut/gpu
lj/cut/coul/cut/omplj/cut/coul/debye/cudalj/cut/coul/debye/gpulj/cut/coul/debye/omp
lj/cut/coul/dsf/gpulj/cut/coul/long/cudalj/cut/coul/long/gpulj/cut/coul/long/omp
lj/cut/coul/long/optlj/cut/coul/pppm/omplj/cut/cudalj/cut/experimental/cuda
lj/cut/gpulj/cut/omplj/cut/optlj/cut/tip4p/long/omp
lj/cut/tip4p/long/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/omplj/smooth/linear/omp
lj96/cut/cudalj96/cut/gpulj96/cut/omplubricate/omp
lubricate/poly/ompmeam/spline/ompmorse/cudamorse/gpu
morse/ompmorse/optperi/lps/ompperi/pmb/omp
rebo/ompresquared/gpuresquared/ompsoft/omp
sw/cudasw/omptable/gputable/omp
tersoff/cudatersoff/omptersoff/table/omptersoff/zbl/omp
tri/lj/ompyukawa/gpuyukawa/ompyukawa/colloid/gpu
yukawa/colloid/omp +
born/coul/long/gpuborn/coul/long/ompborn/coul/msm/ompborn/coul/wolf/gpu
born/coul/wolf/ompborn/gpuborn/ompbrownian/omp
brownian/poly/ompbuck/coul/cut/cudabuck/coul/cut/gpubuck/coul/cut/omp
buck/coul/long/cudabuck/coul/long/gpubuck/coul/long/ompbuck/coul/msm/omp
buck/cudabuck/long/coul/long/ompbuck/gpubuck/omp
colloid/gpucolloid/ompcomb/ompcoul/cut/omp
coul/debye/ompcoul/dsf/gpucoul/long/gpucoul/long/omp
coul/msm/ompcoul/wolfdipole/cut/gpudipole/cut/omp
dipole/sf/gpudipole/sf/ompdpd/ompdpd/tstat/omp
eam/alloy/cudaeam/alloy/gpueam/alloy/ompeam/alloy/opt
eam/cd/ompeam/cudaeam/fs/cudaeam/fs/gpu
eam/fs/ompeam/fs/opteam/gpueam/omp
eam/optedip/ompeim/ompgauss/gpu
gauss/ompgayberne/gpugayberne/ompgran/hertz/history/omp
gran/hooke/cudagran/hooke/history/ompgran/hooke/omphbond/dreiding/lj/omp
hbond/dreiding/morse/ompline/lj/omplj/charmm/coul/charmm/cudalj/charmm/coul/charmm/omp
lj/charmm/coul/charmm/implicit/cudalj/charmm/coul/charmm/implicit/omplj/charmm/coul/long/cudalj/charmm/coul/long/gpu
lj/charmm/coul/long/omplj/charmm/coul/long/optlj/class2/coul/cut/cudalj/class2/coul/cut/omp
lj/class2/coul/long/cudalj/class2/coul/long/gpulj/class2/coul/long/omplj/class2/coul/msm/omp
lj/class2/cudalj/class2/gpulj/class2/omplj/long/coul/long/omp
lj/cut/coul/cut/cudalj/cut/coul/cut/gpulj/cut/coul/cut/omplj/cut/coul/debye/cuda
lj/cut/coul/debye/gpulj/cut/coul/debye/omplj/cut/coul/dsf/gpulj/cut/coul/long/cuda
lj/cut/coul/long/gpulj/cut/coul/long/omplj/cut/coul/long/optlj/cut/coul/msm/opt
lj/cut/cudalj/cut/experimental/cudalj/cut/gpulj/cut/omp
lj/cut/optlj/cut/tip4p/long/omplj/cut/tip4p/long/optlj/expand/cuda
lj/expand/gpulj/expand/omplj/gromacs/coul/gromacs/cudalj/gromacs/coul/gromacs/omp
lj/gromacs/cudalj/gromacs/omplj/sdk/gpulj/sdk/omp
lj/sdk/coul/long/gpulj/sdk/coul/long/omplj/sf/omplj/smooth/cuda
lj/smooth/omplj/smooth/linear/omplj96/cut/cudalj96/cut/gpu
lj96/cut/omplubricate/omplubricate/poly/ompmeam/spline/omp
morse/cudamorse/gpumorse/ompmorse/opt
peri/lps/ompperi/pmb/omprebo/ompresquared/gpu
resquared/ompsoft/ompsw/cudasw/omp
table/gputable/omptersoff/cudatersoff/omp
tersoff/table/omptersoff/zbl/omptri/lj/ompyukawa/gpu
yukawa/ompyukawa/colloid/gpuyukawa/colloid/omp

@@ -637,8 +638,8 @@ built with the appropriate accelerated package.

- - +
ewald/omppppm/cudapppm/gpupppm/omp
pppm/cg/omppppm/tip4p/omp +
ewald/ompmsm/omppppm/cudapppm/gpu
pppm/omppppm/cg/omppppm/tip4p/omp
diff --git a/doc/Section_commands.txt b/doc/Section_commands.txt index 22b70d6d6b..ceb459d4cc 100644 --- a/doc/Section_commands.txt +++ b/doc/Section_commands.txt @@ -636,12 +636,14 @@ potentials. Click on the style itself for a full description: "bop"_pair_bop.html, "born"_pair_born.html, "born/coul/long"_pair_born.html, +"born/coul/msm"_pair_born.html, "born/coul/wolf"_pair_born.html, "brownian"_pair_brownian.html, "brownian/poly"_pair_brownian.html, "buck"_pair_buck.html, "buck/coul/cut"_pair_buck.html, "buck/coul/long"_pair_buck.html, +"buck/coul/msm"_pair_buck.html, "buck/long/coul/long"_pair_buck_long.html, "colloid"_pair_colloid.html, "comb"_pair_comb.html, @@ -649,6 +651,7 @@ potentials. Click on the style itself for a full description: "coul/debye"_pair_coul.html, "coul/dsf"_pair_coul.html, "coul/long"_pair_coul.html, +"coul/msm"_pair_coul.html, "coul/wolf"_pair_coul.html, "dipole/cut"_pair_dipole.html, "dpd"_pair_dpd.html, @@ -671,6 +674,7 @@ potentials. Click on the style itself for a full description: "lj/charmm/coul/charmm"_pair_charmm.html, "lj/charmm/coul/charmm/implicit"_pair_charmm.html, "lj/charmm/coul/long"_pair_charmm.html, +"lj/charmm/coul/msm"_pair_charmm.html, "lj/class2"_pair_class2.html, "lj/class2/coul/cut"_pair_class2.html, "lj/class2/coul/long"_pair_class2.html, @@ -679,6 +683,7 @@ potentials. Click on the style itself for a full description: "lj/cut/coul/debye"_pair_lj.html, "lj/cut/coul/dsf"_pair_lj.html, "lj/cut/coul/long"_pair_lj.html, +"lj/cut/coul/msm"_pair_lj.html, "lj/long/coul/long"_pair_lj_long.html, "lj/cut/tip4p/long"_pair_lj.html, "lj/long/tip4p/long"_pair_lj_long.html, @@ -744,6 +749,7 @@ package"_Section_accelerate.html. "born/coul/long/cuda"_pair_born.html, "born/coul/long/gpu"_pair_born.html, "born/coul/long/omp"_pair_born.html, +"born/coul/msm/omp"_pair_born.html, "born/coul/wolf/gpu"_pair_born.html, "born/coul/wolf/omp"_pair_born.html, "born/gpu"_pair_born.html, @@ -756,6 +762,7 @@ package"_Section_accelerate.html. "buck/coul/long/cuda"_pair_buck.html, "buck/coul/long/gpu"_pair_buck.html, "buck/coul/long/omp"_pair_buck.html, +"buck/coul/msm/omp"_pair_buck.html, "buck/cuda"_pair_buck.html, "buck/long/coul/long/omp"_pair_buck_long.html, "buck/gpu"_pair_buck.html, @@ -768,6 +775,7 @@ package"_Section_accelerate.html. "coul/dsf/gpu"_pair_coul.html, "coul/long/gpu"_pair_coul.html, "coul/long/omp"_pair_coul.html, +"coul/msm/omp"_pair_coul.html, "coul/wolf"_pair_coul.html, "dipole/cut/gpu"_pair_dipole.html, "dipole/cut/omp"_pair_dipole.html, @@ -809,13 +817,12 @@ package"_Section_accelerate.html. "lj/charmm/coul/long/gpu"_pair_charmm.html, "lj/charmm/coul/long/omp"_pair_charmm.html, "lj/charmm/coul/long/opt"_pair_charmm.html, -"lj/charmm/coul/pppm/omp"_pair_charmm.html, "lj/class2/coul/cut/cuda"_pair_class2.html, "lj/class2/coul/cut/omp"_pair_class2.html, "lj/class2/coul/long/cuda"_pair_class2.html, "lj/class2/coul/long/gpu"_pair_class2.html, -"lj/class2/coul/pppm/omp"_pair_class2.html, "lj/class2/coul/long/omp"_pair_class2.html, +"lj/class2/coul/msm/omp"_pair_class2.html, "lj/class2/cuda"_pair_class2.html, "lj/class2/gpu"_pair_class2.html, "lj/class2/omp"_pair_class2.html, @@ -831,7 +838,7 @@ package"_Section_accelerate.html. "lj/cut/coul/long/gpu"_pair_lj.html, "lj/cut/coul/long/omp"_pair_lj.html, "lj/cut/coul/long/opt"_pair_lj.html, -"lj/cut/coul/pppm/omp"_pair_lj.html, +"lj/cut/coul/msm/opt"_pair_lj.html, "lj/cut/cuda"_pair_lj.html, "lj/cut/experimental/cuda"_pair_lj.html, "lj/cut/gpu"_pair_lj.html, @@ -1065,6 +1072,7 @@ built with the "appropriate accelerated package"_Section_accelerate.html. "ewald/omp"_kspace_style.html, +"msm/omp"_kspace_style.html, "pppm/cuda"_kspace_style.html, "pppm/gpu"_kspace_style.html, "pppm/omp"_kspace_style.html, diff --git a/doc/kspace_style.html b/doc/kspace_style.html index c1f33d20c1..0042ff4e95 100644 --- a/doc/kspace_style.html +++ b/doc/kspace_style.html @@ -15,7 +15,7 @@

kspace_style style value 
 
-