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

Merge branch 'develop' into amoeba-ak

Browse Source
This commit is contained in:
Axel Kohlmeyer
2022-05-28 05:24:02 -04:00
parent d4904dd5fc e91d1dba98
commit 97fab45f7e
1087 changed files with 121298 additions and 27084 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
src/atom.cpp
View File

@ -1734,7 +1734,7 @@ void Atom::set_mass(const char *file, int line, const char *str, int type_offset
void Atom::set_mass(const char *file, int line, int itype, double value)
{
if (mass == nullptr) error->all(file,line,"Cannot set mass for atom style {}", atom_style);
if (mass == nullptr) error->all(file,line, "Cannot set mass for atom style {}", atom_style);
if (itype < 1 || itype > ntypes)
error->all(file,line,"Invalid type {} for atom mass {}", itype, value);
if (value <= 0.0) error->all(file,line,"Invalid atom mass value {}", value);
@ -1750,7 +1750,7 @@ void Atom::set_mass(const char *file, int line, int itype, double value)
void Atom::set_mass(const char *file, int line, int /*narg*/, char **arg)
{
if (mass == nullptr) error->all(file,line,"Cannot set atom mass for atom style", atom_style);
if (mass == nullptr) error->all(file,line, "Cannot set atom mass for atom style {}", atom_style);
int lo,hi;
utils::bounds(file,line,arg[0],1,ntypes,lo,hi,error);