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

Merge branch 'master' into cslib

Browse Source
This commit is contained in:
Steve Plimpton
2018-08-31 16:30:28 -06:00
parent f66ce801ad 8f5512eafe
commit 78301e5e93
445 changed files with 1954 additions and 1065 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
src/atom.cpp
View File

@ -99,7 +99,7 @@ Atom::Atom(LAMMPS *lmp) : Pointers(lmp)
// SPIN package
sp = fm = NULL;
// USER-DPD
uCond = uMech = uChem = uCG = uCGnew = NULL;
@ -1516,7 +1516,7 @@ void Atom::set_mass(const char *file, int line, int itype, double value)
called from reading of input script
------------------------------------------------------------------------- */
void Atom::set_mass(const char *file, int line, int narg, char **arg)
void Atom::set_mass(const char *file, int line, int /*narg*/, char **arg)
{
if (mass == NULL) error->all(file,line,"Cannot set mass for this atom style");