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

validate more numbers read from data files through using force->numeric()/force->inumeric() instead of atof()/atoi()

Browse Source
This commit is contained in:
Axel Kohlmeyer
2019-07-07 15:52:21 -04:00
parent b727f0b126
commit 15e1b39531
34 changed files with 247 additions and 247 deletions
Download Patch File Download Diff File Expand all files Collapse all files

28
src/atom_vec_body.cpp
View File

@ -1280,16 +1280,16 @@ void AtomVecBody::data_atom(double *coord, imageint imagetmp, char **values)
if (nlocal == nmax) grow(0);
tag[nlocal] = ATOTAGINT(values[0]);
type[nlocal] = atoi(values[1]);
type[nlocal] = force->inumeric(FLERR,values[1]);
if (type[nlocal] <= 0 || type[nlocal] > atom->ntypes)
error->one(FLERR,"Invalid atom type in Atoms section of data file");
body[nlocal] = atoi(values[2]);
body[nlocal] = force->inumeric(FLERR,values[2]);
if (body[nlocal] == 0) body[nlocal] = -1;
else if (body[nlocal] == 1) body[nlocal] = 0;
else error->one(FLERR,"Invalid bodyflag in Atoms section of data file");
rmass[nlocal] = atof(values[3]);
rmass[nlocal] = force->numeric(FLERR,values[3]);
if (rmass[nlocal] <= 0.0)
error->one(FLERR,"Invalid density in Atoms section of data file");
@ -1318,12 +1318,12 @@ void AtomVecBody::data_atom(double *coord, imageint imagetmp, char **values)
int AtomVecBody::data_atom_hybrid(int nlocal, char **values)
{
body[nlocal] = atoi(values[0]);
body[nlocal] = force->inumeric(FLERR,values[0]);
if (body[nlocal] == 0) body[nlocal] = -1;
else if (body[nlocal] == 1) body[nlocal] = 0;
else error->one(FLERR,"Invalid atom type in Atoms section of data file");
rmass[nlocal] = atof(values[1]);
rmass[nlocal] = force->numeric(FLERR,values[1]);
if (rmass[nlocal] <= 0.0)
error->one(FLERR,"Invalid density in Atoms section of data file");
@ -1350,12 +1350,12 @@ void AtomVecBody::data_body(int m, int ninteger, int ndouble,
void AtomVecBody::data_vel(int m, char **values)
{
v[m][0] = atof(values[0]);
v[m][1] = atof(values[1]);
v[m][2] = atof(values[2]);
angmom[m][0] = atof(values[3]);
angmom[m][1] = atof(values[4]);
angmom[m][2] = atof(values[5]);
v[m][0] = force->numeric(FLERR,values[0]);
v[m][1] = force->numeric(FLERR,values[1]);
v[m][2] = force->numeric(FLERR,values[2]);
angmom[m][0] = force->numeric(FLERR,values[3]);
angmom[m][1] = force->numeric(FLERR,values[4]);
angmom[m][2] = force->numeric(FLERR,values[5]);
}
/* ----------------------------------------------------------------------
@ -1364,9 +1364,9 @@ void AtomVecBody::data_vel(int m, char **values)
int AtomVecBody::data_vel_hybrid(int m, char **values)
{
angmom[m][0] = atof(values[0]);
angmom[m][1] = atof(values[1]);
angmom[m][2] = atof(values[2]);
angmom[m][0] = force->numeric(FLERR,values[0]);
angmom[m][1] = force->numeric(FLERR,values[1]);
angmom[m][2] = force->numeric(FLERR,values[2]);
return 3;
}