jianmu
/
lammps
forked from lijiext/lammps
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Merge commit 'refs/pull/1893/head' of github.com:lammps/lammps into release-preparation

This commit is contained in:
Axel Kohlmeyer 2020-02-23 13:38:26 -05:00
parent 31165082c1 607604d38c
commit d9a7edcf1a
No known key found for this signature in database
GPG Key ID: D9B44E93BF0C375A
1 changed files with 6 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

11
doc/src/Packages_details.rst
View File

@ -1275,11 +1275,10 @@ USER-CGDNA package
**Contents:** **Contents:**
Several pair styles, a bond style, and integration fixes for Several pair styles, bond styles, and integration fixes for coarse-grained
coarse-grained models of single- and double-stranded DNA based on the modelling of single- and double-stranded DNA and RNA based on the oxDNA and
oxDNA model of Doye, Louis and Ouldridge at the University of Oxford. oxRNA model of Doye, Louis and Ouldridge. The package includes Langevin-type
This includes Langevin-type rigid-body integrators with improved rigid-body integrators with improved stability.
stability.
**Author:** Oliver Henrich (University of Strathclyde, Glasgow). **Author:** Oliver Henrich (University of Strathclyde, Glasgow).
@ -1289,8 +1288,10 @@ stability.
* /src/USER-CGDNA/README * /src/USER-CGDNA/README
* :doc:`pair_style oxdna/\* <pair_oxdna>` * :doc:`pair_style oxdna/\* <pair_oxdna>`
* :doc:`pair_style oxdna2/\* <pair_oxdna2>` * :doc:`pair_style oxdna2/\* <pair_oxdna2>`
* :doc:`pair_style oxrna2/\* <pair_oxrna2>`
* :doc:`bond_style oxdna/\* <bond_oxdna>` * :doc:`bond_style oxdna/\* <bond_oxdna>`
* :doc:`bond_style oxdna2/\* <bond_oxdna>` * :doc:`bond_style oxdna2/\* <bond_oxdna>`
* :doc:`bond_style oxrna2/\* <bond_oxdna>`
* :doc:`fix nve/dotc/langevin <fix_nve_dotc_langevin>` * :doc:`fix nve/dotc/langevin <fix_nve_dotc_langevin>`