Merge branch 'master' into symbolic-atom-constants

This commit is contained in:
Axel Kohlmeyer
2020-09-15 17:44:31 -04:00
1186 changed files with 8448 additions and 8360 deletions

View File

@ -47,7 +47,7 @@ AtomVecLine::AtomVecLine(LAMMPS *lmp) : AtomVec(lmp)
atom->sphere_flag = 1;
nlocal_bonus = nghost_bonus = nmax_bonus = 0;
bonus = NULL;
bonus = nullptr;
// strings with peratom variables to include in each AtomVec method
// strings cannot contain fields in corresponding AtomVec default strings
@ -457,7 +457,7 @@ void AtomVecLine::pack_data_post(int ilocal)
/* ----------------------------------------------------------------------
pack bonus line info for writing to data file
if buf is NULL, just return buffer size
if buf is nullptr, just return buffer size
------------------------------------------------------------------------- */
int AtomVecLine::pack_data_bonus(double *buf, int /*flag*/)