Merge branch 'master' into improve-include-consistency

# Conflicts:
#	src/USER-MESO/atom_vec_tdpd.cpp
This commit is contained in:
Axel Kohlmeyer
2019-07-09 14:50:00 -04:00
610 changed files with 39096 additions and 8292 deletions

View File

@ -18,6 +18,7 @@
#include "force.h"
#include "domain.h"
#include "error.h"
#include "utils.h"
using namespace LAMMPS_NS;
@ -113,9 +114,9 @@ int AtomVec::grow_nmax_bonus(int nmax_bonus)
void AtomVec::data_vel(int m, char **values)
{
double **v = atom->v;
v[m][0] = atof(values[0]);
v[m][1] = atof(values[1]);
v[m][2] = atof(values[2]);
v[m][0] = utils::numeric(FLERR,values[0],true,lmp);
v[m][1] = utils::numeric(FLERR,values[1],true,lmp);
v[m][2] = utils::numeric(FLERR,values[2],true,lmp);
}
/* ----------------------------------------------------------------------