ICODE-ADC/lammps
4
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Merge branch 'master' into math_eigen

Browse Source
This commit is contained in:
Axel Kohlmeyer
2020-09-15 21:37:05 -04:00
parent ed14793c69 d611b85d7d
commit f5998692d0
1663 changed files with 20567 additions and 19420 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
src/BODY/body_rounded_polyhedron.cpp
View File

@ -123,7 +123,7 @@ int BodyRoundedPolyhedron::nfaces(AtomVecBody::Bonus *bonus)
double *BodyRoundedPolyhedron::faces(AtomVecBody::Bonus *bonus)
{
int nvertices = bonus->ivalue[0];
if (nvertices == 1 || nvertices == 2) return NULL;
if (nvertices == 1 || nvertices == 2) return nullptr;
return bonus->dvalue+3*nsub(bonus)+2*nedges(bonus);
}
@ -374,7 +374,7 @@ void BodyRoundedPolyhedron::data_body(int ibonus, int ninteger, int ndouble,
/* ----------------------------------------------------------------------
pack data struct for one body into buf for writing to data file
if buf is NULL, just return buffer size
if buf is a null pointer, just return buffer size
------------------------------------------------------------------------- */
int BodyRoundedPolyhedron::pack_data_body(tagint atomID, int ibonus, double *buf)