Commit 2321c8ff authored by Richard Berger's avatar Richard Berger
Browse files

Merge remote-tracking branch 'origin/master' into doc-reorg-intro-howto

parents 9cc75792 1b0a8fdc

.github/CODEOWNERS

+1 −0
Original line number Diff line number Diff line
@@ -45,6 +45,7 @@ src/USER-MISC/*_grem.* @dstelter92 


# tools

tools/msi2lmp/*       @akohlmey

tools/emacs/*         @HaoZeke



# cmake

cmake/*               @junghans @rbberger

cmake/CMakeLists.txt

+0 −1
Original line number Diff line number Diff line
@@ -181,7 +181,6 @@ endmacro() 
pkg_depends(MPIIO MPI)

pkg_depends(USER-ATC MANYBODY)

pkg_depends(USER-LB MPI)

pkg_depends(USER-MISC MANYBODY)

pkg_depends(USER-PHONON KSPACE)



######################################################

doc/src/Howto_body.txt

+2 −2
Original line number Diff line number Diff line
@@ -151,8 +151,8 @@ center-of-mass position of the particle is specified by the x,y,z 
values in the {Atoms} section of the data file, as is the total mass

of the body particle.



The "pair_style body"_pair_body.html command can be used with this

body style to compute body/body and body/non-body interactions.

The "pair_style body/nparticle"_pair_body_nparticle.html command can be used

with this body style to compute body/body and body/non-body interactions.



For output purposes via the "compute

body/local"_compute_body_local.html and "dump local"_dump.html

doc/src/Howto_spherical.txt

+2 −2
Original line number Diff line number Diff line
@@ -129,7 +129,7 @@ styles"_pair_style.html that generate torque: 
"pair_style lubricate"_pair_lubricate.html

"pair_style line/lj"_pair_line_lj.html

"pair_style tri/lj"_pair_tri_lj.html

"pair_style body"_pair_body.html :ul

"pair_style body/nparticle"_pair_body_nparticle.html :ul



The granular pair styles are used with spherical particles.  The

dipole pair style is used with the dipole atom style, which could be
@@ -240,4 +240,4 @@ list of sub-particles. Individual body partices are typically treated 
as rigid bodies, and their motion integrated with a command like "fix

nve/body"_fix_nve_body.html.  Interactions between pairs of body

particles are computed via a command like "pair_style

body"_pair_body.html.
 
body/nparticle"_pair_body_nparticle.html.

doc/src/Manual.txt

+2 −2
Original line number Diff line number Diff line 
<!-- HTML_ONLY -->

<HEAD>

<TITLE>LAMMPS Users Manual</TITLE>

<META NAME="docnumber" CONTENT="16 Jul 2018 version">

<META NAME="docnumber" CONTENT="2 Aug 2018 version">

<META NAME="author" CONTENT="http://lammps.sandia.gov - Sandia National Laboratories">

<META NAME="copyright" CONTENT="Copyright (2003) Sandia Corporation. This software and manual is distributed under the GNU General Public License.">

</HEAD>
@@ -21,7 +21,7 @@ 
<H1></H1>



LAMMPS Documentation :c,h1

16 Jul 2018 version :c,h2

2 Aug 2018 version :c,h2



"What is a LAMMPS version?"_Manual_version.html

CRA Git | Maintained and supported by SUSTech CRA and CCSE