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

Merge remote-tracking branch 'lammps-ro/master' into lammps-icms

Browse Source 
# Conflicts:
#	doc/Manual.html
#	doc/Manual.txt
#	potentials/AlCu.bop.table
#	potentials/CCu_v1.bop.table
#	potentials/CuH.bop.table
#	src/atom.cpp
This commit is contained in:
Axel Kohlmeyer
2015-07-09 06:45:53 -04:00
parent 1cc16bdf9b 616e95e1e8
commit e552ffbb5a
20 changed files with 35328 additions and 46 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
src/atom.cpp
View File

@ -566,9 +566,6 @@ void Atom::modify_params(int narg, char **arg)
void Atom::tag_check()
{
int nlocal = atom->nlocal;
tagint *tag = atom->tag;
tagint min = MAXTAGINT;
tagint max = 0;
@ -584,6 +581,7 @@ void Atom::tag_check()
if (minall < 0) error->all(FLERR,"Atom ID is negative");
if (maxall >= MAXTAGINT) error->all(FLERR,"Atom ID is too big");
if (maxall > 0 && minall == 0) error->all(FLERR,"Atom ID is zero");
// this last message is wrong
if (maxall == 0 && tag_enable && natoms)
error->all(FLERR,"Not all atom IDs are 0");
}