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

10
src/atom_vec_tri.cpp
View File

@ -35,7 +35,7 @@ using namespace MathConst;
AtomVecTri::AtomVecTri(LAMMPS *lmp) : AtomVec(lmp)
{
molecular = 0;
molecular = Atom::ATOMIC;
bonus_flag = 1;
size_forward_bonus = 4;
@ -50,7 +50,7 @@ AtomVecTri::AtomVecTri(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
@ -602,9 +602,9 @@ void AtomVecTri::data_atom_bonus(int m, char **values)
return # of bytes of allocated bonus memory
------------------------------------------------------------------------- */
bigint AtomVecTri::memory_usage_bonus()
double AtomVecTri::memory_usage_bonus()
{
bigint bytes = 0;
double bytes = 0;
bytes += nmax_bonus*sizeof(Bonus);
return bytes;
}
@ -689,7 +689,7 @@ void AtomVecTri::pack_data_post(int ilocal)
/* ----------------------------------------------------------------------
pack bonus tri info for writing to data file
if buf is NULL, just return buffer size
if buf is nullptr, just return buffer size
------------------------------------------------------------------------- */
int AtomVecTri::pack_data_bonus(double *buf, int /*flag*/)