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

58
src/atom_vec_tri.cpp
View File

@ -1436,16 +1436,16 @@ void AtomVecTri::data_atom(double *coord, imageint imagetmp, char **values)
tag[nlocal] = ATOTAGINT(values[0]);
molecule[nlocal] = ATOTAGINT(values[1]);
type[nlocal] = atoi(values[2]);
type[nlocal] = force->inumeric(FLERR,values[2]);
if (type[nlocal] <= 0 || type[nlocal] > atom->ntypes)
error->one(FLERR,"Invalid atom type in Atoms section of data file");
tri[nlocal] = atoi(values[3]);
tri[nlocal] = force->inumeric(FLERR,values[3]);
if (tri[nlocal] == 0) tri[nlocal] = -1;
else if (tri[nlocal] == 1) tri[nlocal] = 0;
else error->one(FLERR,"Invalid triflag in Atoms section of data file");
rmass[nlocal] = atof(values[4]);
rmass[nlocal] = force->numeric(FLERR,values[4]);
if (rmass[nlocal] <= 0.0)
error->one(FLERR,"Invalid density in Atoms section of data file");
@ -1484,12 +1484,12 @@ int AtomVecTri::data_atom_hybrid(int nlocal, char **values)
{
molecule[nlocal] = ATOTAGINT(values[0]);
tri[nlocal] = atoi(values[1]);
tri[nlocal] = force->inumeric(FLERR,values[1]);
if (tri[nlocal] == 0) tri[nlocal] = -1;
else if (tri[nlocal] == 1) tri[nlocal] = 0;
else error->one(FLERR,"Invalid atom type in Atoms section of data file");
rmass[nlocal] = atof(values[2]);
rmass[nlocal] = force->numeric(FLERR,values[2]);
if (rmass[nlocal] <= 0.0)
error->one(FLERR,"Invalid density in Atoms section of data file");
@ -1513,15 +1513,15 @@ void AtomVecTri::data_atom_bonus(int m, char **values)
if (nlocal_bonus == nmax_bonus) grow_bonus();
double c1[3],c2[3],c3[3];
c1[0] = atof(values[0]);
c1[1] = atof(values[1]);
c1[2] = atof(values[2]);
c2[0] = atof(values[3]);
c2[1] = atof(values[4]);
c2[2] = atof(values[5]);
c3[0] = atof(values[6]);
c3[1] = atof(values[7]);
c3[2] = atof(values[8]);
c1[0] = force->numeric(FLERR,values[0]);
c1[1] = force->numeric(FLERR,values[1]);
c1[2] = force->numeric(FLERR,values[2]);
c2[0] = force->numeric(FLERR,values[3]);
c2[1] = force->numeric(FLERR,values[4]);
c2[2] = force->numeric(FLERR,values[5]);
c3[0] = force->numeric(FLERR,values[6]);
c3[1] = force->numeric(FLERR,values[7]);
c3[2] = force->numeric(FLERR,values[8]);
// check for duplicate points
@ -1641,15 +1641,15 @@ void AtomVecTri::data_atom_bonus(int m, char **values)
void AtomVecTri::data_vel(int m, char **values)
{
v[m][0] = atof(values[0]);
v[m][1] = atof(values[1]);
v[m][2] = atof(values[2]);
omega[m][0] = atof(values[3]);
omega[m][1] = atof(values[4]);
omega[m][2] = atof(values[5]);
angmom[m][0] = atof(values[6]);
angmom[m][1] = atof(values[7]);
angmom[m][2] = atof(values[8]);
v[m][0] = force->numeric(FLERR,values[0]);
v[m][1] = force->numeric(FLERR,values[1]);
v[m][2] = force->numeric(FLERR,values[2]);
omega[m][0] = force->numeric(FLERR,values[3]);
omega[m][1] = force->numeric(FLERR,values[4]);
omega[m][2] = force->numeric(FLERR,values[5]);
angmom[m][0] = force->numeric(FLERR,values[6]);
angmom[m][1] = force->numeric(FLERR,values[7]);
angmom[m][2] = force->numeric(FLERR,values[8]);
}
/* ----------------------------------------------------------------------
@ -1658,12 +1658,12 @@ void AtomVecTri::data_vel(int m, char **values)
int AtomVecTri::data_vel_hybrid(int m, char **values)
{
omega[m][0] = atof(values[0]);
omega[m][1] = atof(values[1]);
omega[m][2] = atof(values[2]);
angmom[m][0] = atof(values[3]);
angmom[m][1] = atof(values[4]);
angmom[m][2] = atof(values[5]);
omega[m][0] = force->numeric(FLERR,values[0]);
omega[m][1] = force->numeric(FLERR,values[1]);
omega[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]);
return 6;
}