From f20c63d6c898e0744145d2e10cc8bf41d56d3943 Mon Sep 17 00:00:00 2001 From: sjplimp Date: Thu, 15 May 2008 20:48:06 +0000 Subject: [PATCH] git-svn-id: svn://svn.icms.temple.edu/lammps-ro/trunk@1804 f3b2605a-c512-4ea7-a41b-209d697bcdaa --- doc/Section_commands.html | 7 ++++--- doc/Section_commands.txt | 2 ++ doc/pair_coeff.html | 2 ++ doc/pair_coeff.txt | 2 ++ doc/pair_gromacs.html | 2 +- doc/pair_gromacs.txt | 2 +- doc/pair_style.html | 2 ++ doc/pair_style.txt | 2 ++ 8 files changed, 16 insertions(+), 5 deletions(-) diff --git a/doc/Section_commands.html b/doc/Section_commands.html index a716bc5559..6bb244ae95 100644 --- a/doc/Section_commands.html +++ b/doc/Section_commands.html @@ -363,9 +363,10 @@ full description: lj/charmm/coul/charmm/implicitlj/charmm/coul/longlj/charmm/coul/long/optlj/class2 lj/class2/coul/cutlj/class2/coul/longlj/cutlj/cut/opt lj/cut/coul/cutlj/cut/coul/debyelj/cut/coul/longlj/cut/coul/long/tip4p -lj/expandlj/smoothlubricatemeam -morsemorse/optresquaredsoft -swtabletersoffyukawa +lj/expandlj/gromacslj/gromacs/coul/gromacslj/smooth +lubricatemeammorsemorse/opt +resquaredsoftswtable +tersoffyukawa

These are pair styles contributed by users, which can be used if diff --git a/doc/Section_commands.txt b/doc/Section_commands.txt index b6f3ac81e2..da06a35161 100644 --- a/doc/Section_commands.txt +++ b/doc/Section_commands.txt @@ -512,6 +512,8 @@ full description: "lj/cut/coul/long"_pair_lj.html, "lj/cut/coul/long/tip4p"_pair_lj.html, "lj/expand"_pair_lj_expand.html, +"lj/gromacs"_pair_gromacs.html, +"lj/gromacs/coul/gromacs"_pair_gromacs.html, "lj/smooth"_pair_lj_smooth.html, "lubricate"_pair_lubricate.html, "meam"_pair_meam.html, diff --git a/doc/pair_coeff.html b/doc/pair_coeff.html index 52882778f6..1364171b34 100644 --- a/doc/pair_coeff.html +++ b/doc/pair_coeff.html @@ -122,6 +122,8 @@ the pair_style command, and coefficients specified by the associated

  • pair_style lj/cut/coul/long - LJ with long-range Coulomb
  • pair_style lj/cut/coul/long/tip4p - LJ with long-range Coulomb for TIP4P water
  • pair_style lj/expand - Lennard-Jones for variable size particles +
  • pair_style lj/gromacs - GROMACS-style Lennard-Jones potential +
  • pair_style lj/gromacs/coul/gromacs - GROMACS-style LJ and Coulombic potential
  • pair_style lj/smooth - smoothed Lennard-Jones potential
  • pair_style lubricate - hydrodynamic lubrication forces
  • pair_style meam - modified embedded atom method (MEAM) diff --git a/doc/pair_coeff.txt b/doc/pair_coeff.txt index 5818886fd2..27b144b01e 100644 --- a/doc/pair_coeff.txt +++ b/doc/pair_coeff.txt @@ -118,6 +118,8 @@ the pair_style command, and coefficients specified by the associated "pair_style lj/cut/coul/long"_pair_lj.html - LJ with long-range Coulomb "pair_style lj/cut/coul/long/tip4p"_pair_lj.html - LJ with long-range Coulomb for TIP4P water "pair_style lj/expand"_pair_lj_expand.html - Lennard-Jones for variable size particles +"pair_style lj/gromacs"_pair_gromacs.html - GROMACS-style Lennard-Jones potential +"pair_style lj/gromacs/coul/gromacs"_pair_gromacs.html - GROMACS-style LJ and Coulombic potential "pair_style lj/smooth"_pair_lj_smooth.html - smoothed Lennard-Jones potential "pair_style lubricate"_pair_lubricate.html - hydrodynamic lubrication forces "pair_style meam"_pair_meam.html - modified embedded atom method (MEAM) diff --git a/doc/pair_gromacs.html b/doc/pair_gromacs.html index 3ac65a4cbc..f9ea7b3f9c 100644 --- a/doc/pair_gromacs.html +++ b/doc/pair_gromacs.html @@ -42,7 +42,7 @@ pair_coeff * * 100.0 2.0 additional switching function S(r) that ramps the energy and force smoothly to zero between an inner and outer cutoff. It is a commonly used potential in the GROMACS MD code and for -the coarse-grained models of "(Marrink")_#Marrink. +the coarse-grained models of (Marrink).

    diff --git a/doc/pair_gromacs.txt b/doc/pair_gromacs.txt index 6505684f4c..b544f61dbd 100644 --- a/doc/pair_gromacs.txt +++ b/doc/pair_gromacs.txt @@ -37,7 +37,7 @@ The {lj/gromacs} styles compute LJ and Coulombic interactions with an additional switching function S(r) that ramps the energy and force smoothly to zero between an inner and outer cutoff. It is a commonly used potential in the "GROMACS"_http://www.gromacs.org MD code and for -the coarse-grained models of "(Marrink")_#Marrink. +the coarse-grained models of "(Marrink)"_#Marrink. :c,image(Eqs/pair_gromacs.jpg) diff --git a/doc/pair_style.html b/doc/pair_style.html index 8c9f241d70..1364ac6cb3 100644 --- a/doc/pair_style.html +++ b/doc/pair_style.html @@ -124,6 +124,8 @@ the pair_style command, and coefficients specified by the associated
  • pair_style lj/cut/coul/long - LJ with long-range Coulomb
  • pair_style lj/cut/coul/long/tip4p - LJ with long-range Coulomb for TIP4P water
  • pair_style lj/expand - Lennard-Jones for variable size particles +
  • pair_style lj/gromacs - GROMACS-style Lennard-Jones potential +
  • pair_style lj/gromacs/coul/gromacs - GROMACS-style LJ and Coulombic potential
  • pair_style lj/smooth - smoothed Lennard-Jones potential
  • pair_style lubricate - hydrodynamic lubrication forces
  • pair_style meam - modified embedded atom method (MEAM) diff --git a/doc/pair_style.txt b/doc/pair_style.txt index ff3b62ea67..b9e5437f9f 100644 --- a/doc/pair_style.txt +++ b/doc/pair_style.txt @@ -120,6 +120,8 @@ the pair_style command, and coefficients specified by the associated "pair_style lj/cut/coul/long"_pair_lj.html - LJ with long-range Coulomb "pair_style lj/cut/coul/long/tip4p"_pair_lj.html - LJ with long-range Coulomb for TIP4P water "pair_style lj/expand"_pair_lj_expand.html - Lennard-Jones for variable size particles +"pair_style lj/gromacs"_pair_gromacs.html - GROMACS-style Lennard-Jones potential +"pair_style lj/gromacs/coul/gromacs"_pair_gromacs.html - GROMACS-style LJ and Coulombic potential "pair_style lj/smooth"_pair_lj_smooth.html - smoothed Lennard-Jones potential "pair_style lubricate"_pair_lubricate.html - hydrodynamic lubrication forces "pair_style meam"_pair_meam.html - modified embedded atom method (MEAM)