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

Merge branch 'master' of github.com:lammps/lammps into granular-kokkos

Browse Source
This commit is contained in:
Stan Moore
2018-10-10 10:43:54 -06:00
parent 747f72aca2 1b76e14224
commit 3d0722b974
1022 changed files with 49678 additions and 3465 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
src/fix_neigh_history.cpp
View File

@ -35,7 +35,7 @@ enum{DEFAULT,NPARTNER,PERPARTNER}; // also set in fix neigh/history/omp
FixNeighHistory::FixNeighHistory(LAMMPS *lmp, int narg, char **arg) :
Fix(lmp, narg, arg),
npartner(NULL), partner(NULL), valuepartner(NULL), pair(NULL),
pair(NULL), npartner(NULL), partner(NULL), valuepartner(NULL),
ipage_atom(NULL), dpage_atom(NULL), ipage_neigh(NULL), dpage_neigh(NULL)
{
if (narg != 4) error->all(FLERR,"Illegal fix NEIGH_HISTORY command");
@ -688,7 +688,7 @@ void FixNeighHistory::grow_arrays(int nmax)
copy values within local atom-based arrays
------------------------------------------------------------------------- */
void FixNeighHistory::copy_arrays(int i, int j, int delflag)
void FixNeighHistory::copy_arrays(int i, int j, int /*delflag*/)
{
// just copy pointers for partner and valuepartner
// b/c can't overwrite chunk allocation inside ipage_atom,dpage_atom