From 6f746c8118fb63dd943dbb62db84d2ea5b7a8990 Mon Sep 17 00:00:00 2001 From: sjplimp Date: Tue, 2 Oct 2012 17:05:30 +0000 Subject: [PATCH] git-svn-id: svn://svn.icms.temple.edu/lammps-ro/trunk@8857 f3b2605a-c512-4ea7-a41b-209d697bcdaa --- doc/Section_commands.html | 56 ++++++++----------- doc/Section_commands.txt | 15 +++-- ...air_buck_coul.html => pair_buck_disp.html} | 0 ...{pair_buck_coul.txt => pair_buck_disp.txt} | 0 doc/{pair_lj_coul.html => pair_lj_disp.html} | 0 doc/{pair_lj_coul.txt => pair_lj_disp.txt} | 0 6 files changed, 31 insertions(+), 40 deletions(-) rename doc/{pair_buck_coul.html => pair_buck_disp.html} (100%) rename doc/{pair_buck_coul.txt => pair_buck_disp.txt} (100%) rename doc/{pair_lj_coul.html => pair_lj_disp.html} (100%) rename doc/{pair_lj_coul.txt => pair_lj_disp.txt} (100%) diff --git a/doc/Section_commands.html b/doc/Section_commands.html index 9cafabb1c6..a73d1d641b 100644 --- a/doc/Section_commands.html +++ b/doc/Section_commands.html @@ -420,23 +420,23 @@ potentials. Click on the style itself for a full description: nonehybridhybrid/overlayadp airebobeckbopborn born/coul/longborn/coul/wolfbrownianbrownian/poly -buckbuck/coul/cutbuck/coul/longcolloid -combcoul/cutcoul/debyecoul/dsf -coul/longcoul/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/class2 -lj/class2/coul/cutlj/class2/coul/longlj/cutlj/cut/coul/cut -lj/cut/coul/debyelj/cut/coul/dsflj/cut/coul/longlj/cut/coul/long/tip4p -lj/expandlj/gromacslj/gromacs/coul/gromacslj/smooth -lj/smooth/linearlj96/cutlubricatelubricate/poly -lubricateUlubricateU/polymeammorse -peri/lpsperi/pmbreaxrebo -resquaredsoftswtable -tersofftersoff/zbltri/ljyukawa -yukawa/colloid +buckbuck/coul/cutbuck/coul/longbuck/disp/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 +lj/class2lj/class2/coul/cutlj/class2/coul/longlj/cut +lj/cut/coul/cutlj/cut/coul/debyelj/cut/coul/dsflj/cut/coul/long +lj/cut/coul/long/tip4plj/disp/coul/longlj/disp/coul/long/tip4plj/expand +lj/gromacslj/gromacs/coul/gromacslj/smoothlj/smooth/linear +lj96/cutlubricatelubricate/polylubricateU +lubricateU/polymeammorseperi/lps +peri/pmbreaxreboresquared +softswtabletersoff +tersoff/zbltri/ljyukawayukawa/colloid

These are pair styles contributed by users, which can be used if @@ -444,12 +444,11 @@ potentials. Click on the style itself for a full description: package.

- - - - - - + + + +
awpmd/cutbuck/coulcoul/dieldipole/sf
eam/cdedipeff/cutgauss/cut
lj/coullj/sdklj/sdk/coul/longlj/sf
meam/splinereax/csph/heatconductionsph/idealgas
sph/ljsph/rhosumsph/taitwatersph/taitwater/morris
tersoff/table +
awpmd/cutcoul/dieldipole/sfeam/cd
edipeff/cutgauss/cutlj/sdk
lj/sdk/coul/longlj/sfmeam/splinereax/c
sph/heatconductionsph/idealgassph/ljsph/rhosum
sph/taitwatersph/taitwater/morristersoff/table

These are accelerated pair styles, which can be used if LAMMPS is @@ -626,15 +625,8 @@ package. Kspace solvers. Click on the style itself for a full description:

-
ewaldpppmpppm/cgpppm/tip4p -
- -

These are Kspace solvers contributed by users, which can be used if -LAMMPS is built with the appropriate -package. -

-
- +
ewald/n +
ewaldewald/dispmsmpppm
pppm/cgpppm/disppppm/disp/tip4ppppm/tip4p

These are accelerated Kspace solvers, which can be used if LAMMPS is diff --git a/doc/Section_commands.txt b/doc/Section_commands.txt index 78a8075f0f..8e60faab70 100644 --- a/doc/Section_commands.txt +++ b/doc/Section_commands.txt @@ -641,6 +641,7 @@ potentials. Click on the style itself for a full description: "buck"_pair_buck.html, "buck/coul/cut"_pair_buck.html, "buck/coul/long"_pair_buck.html, +"buck/disp/coul/long"_pair_buck_disp.html, "colloid"_pair_colloid.html, "comb"_pair_comb.html, "coul/cut"_pair_coul.html, @@ -678,6 +679,8 @@ potentials. Click on the style itself for a full description: "lj/cut/coul/dsf"_pair_lj.html, "lj/cut/coul/long"_pair_lj.html, "lj/cut/coul/long/tip4p"_pair_lj.html, +"lj/disp/coul/long"_pair_lj_disp.html, +"lj/disp/coul/long/tip4p"_pair_lj_disp.html, "lj/expand"_pair_lj_expand.html, "lj/gromacs"_pair_gromacs.html, "lj/gromacs/coul/gromacs"_pair_gromacs.html, @@ -709,14 +712,12 @@ These are pair styles contributed by users, which can be used if package"_Section_start.html#start_3. "awpmd/cut"_pair_awpmd.html, -"buck/coul"_pair_buck_coul.html, "coul/diel"_pair_coul_diel.html, "dipole/sf"_pair_dipole.html, "eam/cd"_pair_eam.html, "edip"_pair_edip.html, "eff/cut"_pair_eff.html, "gauss/cut"_pair_gauss.html, -"lj/coul"_pair_lj_coul.html, "lj/sdk"_pair_sdk.html, "lj/sdk/coul/long"_pair_sdk.html, "lj/sf"_pair_lj_sf.html, @@ -1042,16 +1043,14 @@ See the "kspace_style"_kspace_style.html command for an overview of Kspace solvers. Click on the style itself for a full description: "ewald"_kspace_style.html, +"ewald/disp"_kspace_style.html, +"msm"_kspace_style.html, "pppm"_kspace_style.html, "pppm/cg"_kspace_style.html, +"pppm/disp"_kspace_style.html, +"pppm/disp/tip4p"_kspace_style.html, "pppm/tip4p"_kspace_style.html :tb(c=4,ea=c,w=100) -These are Kspace solvers contributed by users, which can be used if -"LAMMPS is built with the appropriate -package"_Section_start.html#start_3. - -"ewald/n"_kspace_style.html :tb(c=4,ea=c,w=100) - These are accelerated Kspace solvers, which can be used if LAMMPS is built with the "appropriate accelerated package"_Section_accelerate.html. diff --git a/doc/pair_buck_coul.html b/doc/pair_buck_disp.html similarity index 100% rename from doc/pair_buck_coul.html rename to doc/pair_buck_disp.html diff --git a/doc/pair_buck_coul.txt b/doc/pair_buck_disp.txt similarity index 100% rename from doc/pair_buck_coul.txt rename to doc/pair_buck_disp.txt diff --git a/doc/pair_lj_coul.html b/doc/pair_lj_disp.html similarity index 100% rename from doc/pair_lj_coul.html rename to doc/pair_lj_disp.html diff --git a/doc/pair_lj_coul.txt b/doc/pair_lj_disp.txt similarity index 100% rename from doc/pair_lj_coul.txt rename to doc/pair_lj_disp.txt