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

Merge branch 'master' into improve-include-consistency

Browse Source
This commit is contained in:
Axel Kohlmeyer
2019-07-10 14:18:42 -04:00
parent c5044d6484 a1a7754961
commit 2ca2d053fd
28 changed files with 45 additions and 42 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
src/atom_vec_line.cpp
View File

@ -1034,8 +1034,8 @@ void AtomVecLine::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");
@ -1079,7 +1079,7 @@ void AtomVecLine::data_atom(double *coord, imageint imagetmp, char **values)
int AtomVecLine::data_atom_hybrid(int nlocal, char **values)
{
molecule[nlocal] = ATOTAGINT(values[0]);
molecule[nlocal] = utils::tnumeric(FLERR,values[0],true,lmp);
line[nlocal] = utils::inumeric(FLERR,values[1],true,lmp);
if (line[nlocal] == 0) line[nlocal] = -1;