Commit 9e776506 authored by Steve Plimpton's avatar Steve Plimpton
Browse files

Merge branch 'atomvec-custom' of github.com:lammps/lammps into atomvec-custom

parents 1225f7d1 ab1ecdcc

doc/utils/sphinx-config/false_positives.txt

+3 −0
Original line number Diff line number Diff line
@@ -327,6 +327,7 @@ ccache 
ccachepiecewise

ccl

ccmake

ccN

ccNspecies

CCu

cd
@@ -593,6 +594,7 @@ Derjaguin 
Derlet

Deserno

Destree

destructor

detils

Devanathan

devel
@@ -833,6 +835,7 @@ Espanol 
Eshelby

eshelby

eskm

esph

esu

esub

esw

src/atom.cpp

+1 −1
Original line number Diff line number Diff line
@@ -596,7 +596,7 @@ void Atom::add_peratom(const char *name, void *address, 
}



/* ----------------------------------------------------------------------

   change the column count fof an existing peratom array entry

   change the column count of an existing peratom array entry

   allows atom_style to specify column count as an argument

   see atom_style tdpd as an example

------------------------------------------------------------------------- */

doc/src/atom_style.rst

+2 −2

File changed.

Contains only whitespace changes.

CRA Git | Maintained and supported by SUSTech CRA and CCSE