Unverified Commit 4a58d356 authored by Axel Kohlmeyer's avatar Axel Kohlmeyer
Browse files

Merge branch 'post-patch-tweaks' into doc-styles-check

parents 1d838dad 05b68d9e

doc/src/Commands_bond.rst

+4 −4
Original line number Diff line number Diff line
@@ -13,7 +13,7 @@ 


.. _bond:



bond_style potentials

Bond_style potentials

=====================



All LAMMPS :doc:`bond_style <bond_style>` commands.  Some styles have
@@ -51,7 +51,7 @@ OPT. 


.. _angle:



angle_style potentials

Angle_style potentials

======================



All LAMMPS :doc:`angle_style <angle_style>` commands.  Some styles have
@@ -93,7 +93,7 @@ OPT. 


.. _dihedral:



dihedral_style potentials

Dihedral_style potentials

=========================



All LAMMPS :doc:`dihedral_style <dihedral_style>` commands.  Some styles
@@ -132,7 +132,7 @@ OPT. 


.. _improper:



improper_style potentials

Improper_style potentials

=========================



All LAMMPS :doc:`improper\_style <improper_style>` commands.  Some styles

doc/src/Commands_kspace.rst

+7 −3
Original line number Diff line number Diff line
@@ -24,12 +24,16 @@ OPT. 


   * :doc:`ewald (o) <kspace_style>`

   * :doc:`ewald/disp <kspace_style>`

   * :doc:`ewald/dipole <kspace_style>`

   * :doc:`ewald/dipole/spin <kspace_style>`

   * :doc:`msm (o) <kspace_style>`

   * :doc:`msm/cg (o) <kspace_style>`

   * :doc:`pppm (gok) <kspace_style>`

   * :doc:`pppm (giko) <kspace_style>`

   * :doc:`pppm/cg (o) <kspace_style>`

   * :doc:`pppm/disp (i) <kspace_style>`

   * :doc:`pppm/disp/tip4p <kspace_style>`

   * :doc:`pppm/dipole <kspace_style>`

   * :doc:`pppm/dipole/spin <kspace_style>`

   * :doc:`pppm/disp (io) <kspace_style>`

   * :doc:`pppm/disp/tip4p (o) <kspace_style>`

   * :doc:`pppm/stagger <kspace_style>`

   * :doc:`pppm/tip4p (o) <kspace_style>`

   * :doc:`scafacos <kspace_style>`

doc/src/Commands_pair.rst

+8 −0
Original line number Diff line number Diff line
@@ -198,10 +198,17 @@ OPT. 
   * :doc:`oxdna2/hbond <pair_oxdna2>`

   * :doc:`oxdna2/stk <pair_oxdna2>`

   * :doc:`oxdna2/xstk <pair_oxdna2>`

   * :doc:`oxrna2/excv <pair_oxrna2>`

   * :doc:`oxrna2/hbond <pair_oxrna2>`

   * :doc:`oxrna2/dh <pair_oxrna2>`

   * :doc:`oxrna2/stk <pair_oxrna2>`

   * :doc:`oxrna2/xstk <pair_oxrna2>`

   * :doc:`oxrna2/coaxstk <pair_oxrna2>`

   * :doc:`peri/eps <pair_peri>`

   * :doc:`peri/lps (o) <pair_peri>`

   * :doc:`peri/pmb (o) <pair_peri>`

   * :doc:`peri/ves <pair_peri>`

   * :doc:`polymorphic <pair_polymorphic>`

   * :doc:`python <pair_python>`

   * :doc:`quip <pair_quip>`

   * :doc:`reax/c (ko) <pair_reaxc>`
@@ -250,3 +257,4 @@ OPT. 
   * :doc:`yukawa/colloid (go) <pair_yukawa_colloid>`

   * :doc:`zbl (gko) <pair_zbl>`

   *

   *

doc/src/kspace_style.rst

+16 −11
Original line number Diff line number Diff line
@@ -11,26 +11,30 @@ Syntax 


   kspace_style style value



* style = *none* or *ewald* or *ewald/disp* or *ewald/omp* or *pppm* or *pppm/cg* or *pppm/disp* or *pppm/tip4p* or *pppm/stagger* or *pppm/disp/tip4p* or *pppm/gpu* or *pppm/kk* or *pppm/omp* or *pppm/cg/omp* or *pppm/tip4p/omp* or *msm* or *msm/cg* or *msm/omp* or *msm/cg/omp* or *scafacos*

* style = *none* or *ewald* or *ewald/dipole* or *ewald/dipole/spin* or *ewald/disp* or *ewald/omp* or *pppm* or *pppm/cg* or *pppm/disp* or *pppm/tip4p* or *pppm/stagger* or *pppm/disp/tip4p* or *pppm/gpu* or *pppm/intel* or *pppm/disp/intel* or *pppm/kk* or *pppm/omp* or *pppm/cg/omp* or *pppm/disp/tip4p/omp* or *pppm/tip4p/omp* or *msm* or *msm/cg* or *msm/omp* or *msm/cg/omp* or *scafacos*

  

  .. parsed-literal::

  

       *none* value = none

       *ewald* value = accuracy

         accuracy = desired relative error in forces

       *ewald/disp* value = accuracy

         accuracy = desired relative error in forces

       *ewald/omp* value = accuracy

         accuracy = desired relative error in forces

       *ewald/dipole* value = accuracy

         accuracy = desired relative error in forces

       *ewald/dipole/spin* value = accuracy

         accuracy = desired relative error in forces

       *ewald/disp* value = accuracy

         accuracy = desired relative error in forces

       *ewald/omp* value = accuracy

         accuracy = desired relative error in forces

       *pppm* value = accuracy

         accuracy = desired relative error in forces

       *pppm/cg* values = accuracy (smallq)

         accuracy = desired relative error in forces

         smallq = cutoff for charges to be considered (optional) (charge units)

       *pppm/dipole* value = accuracy

         accuracy = desired relative error in forces

       *pppm/dipole/spin* value = accuracy

         accuracy = desired relative error in forces

       *pppm/disp* value = accuracy

         accuracy = desired relative error in forces

       *pppm/tip4p* value = accuracy
@@ -41,21 +45,22 @@ Syntax 
         accuracy = desired relative error in forces

       *pppm/intel* value = accuracy

         accuracy = desired relative error in forces

       *pppm/disp/intel* value = accuracy

         accuracy = desired relative error in forces

       *pppm/kk* value = accuracy

         accuracy = desired relative error in forces

       *pppm/omp* value = accuracy

         accuracy = desired relative error in forces

       *pppm/cg/omp* value = accuracy

       *pppm/cg/omp* values = accuracy (smallq)

         accuracy = desired relative error in forces

       *pppm/disp/intel* value = accuracy

         smallq = cutoff for charges to be considered (optional) (charge units)

       *pppm/disp/omp* value = accuracy

         accuracy = desired relative error in forces

       *pppm/tip4p/omp* value = accuracy

         accuracy = desired relative error in forces

       *pppm/stagger* value = accuracy

         accuracy = desired relative error in forces

       *pppm/dipole* value = accuracy

       *pppm/disp/tip4p/omp* value = accuracy

         accuracy = desired relative error in forces

       *pppm/dipole/spin* value = accuracy

       *pppm/stagger* value = accuracy

         accuracy = desired relative error in forces

       *msm* value = accuracy

         accuracy = desired relative error in forces

doc/src/pair_style.rst

+1 −1
Original line number Diff line number Diff line
@@ -245,7 +245,7 @@ accelerated styles exist. 
* :doc:`meam/sw/spline <pair_meam_sw_spline>` - splined version of MEAM with a Stillinger-Weber term

* :doc:`mgpt <pair_mgpt>` - simplified model generalized pseudopotential theory (MGPT) potential

* :doc:`mie/cut <pair_mie>` - Mie potential

* :doc:`mm3/switch3/coulgauss/long <pair_mm3_switch3_coulgauss_long>`_ - smoothed MM3 vdW potential with Gaussian electrostatics

* :doc:`mm3/switch3/coulgauss/long <pair_mm3_switch3_coulgauss_long>` - smoothed MM3 vdW potential with Gaussian electrostatics

* :doc:`momb <pair_momb>` - Many-Body Metal-Organic (MOMB) force field

* :doc:`morse <pair_morse>` - Morse potential

* :doc:`morse/smooth/linear <pair_morse>` - linear smoothed Morse potential

CRA Git | Maintained and supported by SUSTech CRA and CCSE