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

replace ATOTAGINT() calls with utils::tnumeric() in AtomVec classes

Browse Source
This commit is contained in:
Axel Kohlmeyer
2019-07-10 00:27:31 -04:00
parent 691fc357a4
commit 054ff97a51
27 changed files with 42 additions and 42 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
src/atom_vec_tri.cpp
View File

@ -1435,8 +1435,8 @@ void AtomVecTri::data_atom(double *coord, imageint imagetmp, char **values)
int nlocal = atom->nlocal;
if (nlocal == nmax) grow(0);
tag[nlocal] = ATOTAGINT(values[0]);
molecule[nlocal] = ATOTAGINT(values[1]);
tag[nlocal] = utils::tnumeric(FLERR,values[0],true,lmp);
molecule[nlocal] = utils::tnumeric(FLERR,values[1],true,lmp);
type[nlocal] = utils::inumeric(FLERR,values[2],true,lmp);
if (type[nlocal] <= 0 || type[nlocal] > atom->ntypes)
error->one(FLERR,"Invalid atom type in Atoms section of data file");
@ -1483,7 +1483,7 @@ void AtomVecTri::data_atom(double *coord, imageint imagetmp, char **values)
int AtomVecTri::data_atom_hybrid(int nlocal, char **values)
{
molecule[nlocal] = ATOTAGINT(values[0]);
molecule[nlocal] = utils::tnumeric(FLERR,values[0],true,lmp);
tri[nlocal] = utils::inumeric(FLERR,values[1],true,lmp);
if (tri[nlocal] == 0) tri[nlocal] = -1;