initialze omega and angmom when read data file

This commit is contained in:
Steve Plimpton
2020-05-15 13:07:34 -06:00
parent 20ad924a54
commit f1a9eab5da
6 changed files with 14 additions and 2 deletions

View File

@ -64,7 +64,7 @@ AtomVecPeri::AtomVecPeri(LAMMPS *lmp) : AtomVec(lmp)
fields_restart = (char *) "rmass vfrac s0 x0"; fields_restart = (char *) "rmass vfrac s0 x0";
fields_create = (char *) "rmass vfrac s0 x0"; fields_create = (char *) "rmass vfrac s0 x0";
fields_data_atom = (char *) "id type vfrac rmass x"; fields_data_atom = (char *) "id type vfrac rmass x";
fields_data_vel = (char *) "id v omega"; fields_data_vel = (char *) "id v";
setup_fields(); setup_fields();
} }

View File

@ -56,7 +56,7 @@ AtomVecSpin::AtomVecSpin(LAMMPS *lmp) : AtomVec(lmp)
fields_restart = (char *) "sp"; fields_restart = (char *) "sp";
fields_create = (char *) "sp"; fields_create = (char *) "sp";
fields_data_atom = (char *) "id type x sp"; fields_data_atom = (char *) "id type x sp";
fields_data_vel = (char *) "id v omega"; fields_data_vel = (char *) "id v";
setup_fields(); setup_fields();
} }

View File

@ -84,6 +84,7 @@ void AtomVecEllipsoid::grow_pointers()
{ {
ellipsoid = atom->ellipsoid; ellipsoid = atom->ellipsoid;
rmass = atom->rmass; rmass = atom->rmass;
angmom = atom->angmom;
} }
/* ---------------------------------------------------------------------- /* ----------------------------------------------------------------------
@ -444,6 +445,10 @@ void AtomVecEllipsoid::data_atom_post(int ilocal)
if (rmass[ilocal] <= 0.0) if (rmass[ilocal] <= 0.0)
error->one(FLERR,"Invalid density in Atoms section of data file"); error->one(FLERR,"Invalid density in Atoms section of data file");
angmom[ilocal][0] = 0.0;
angmom[ilocal][1] = 0.0;
angmom[ilocal][2] = 0.0;
} }
/* ---------------------------------------------------------------------- /* ----------------------------------------------------------------------

View File

@ -65,6 +65,7 @@ class AtomVecEllipsoid : public AtomVec {
private: private:
int *ellipsoid; int *ellipsoid;
double *rmass; double *rmass;
double **angmom;
int nghost_bonus,nmax_bonus; int nghost_bonus,nmax_bonus;
int ellipsoid_flag; int ellipsoid_flag;

View File

@ -109,6 +109,7 @@ void AtomVecSphere::grow_pointers()
{ {
radius = atom->radius; radius = atom->radius;
rmass = atom->rmass; rmass = atom->rmass;
omega = atom->omega;
} }
/* ---------------------------------------------------------------------- /* ----------------------------------------------------------------------
@ -135,6 +136,10 @@ void AtomVecSphere::data_atom_post(int ilocal)
if (rmass[ilocal] <= 0.0) if (rmass[ilocal] <= 0.0)
error->one(FLERR,"Invalid density in Atoms section of data file"); error->one(FLERR,"Invalid density in Atoms section of data file");
omega[ilocal][0] = 0.0;
omega[ilocal][1] = 0.0;
omega[ilocal][2] = 0.0;
} }
/* ---------------------------------------------------------------------- /* ----------------------------------------------------------------------

View File

@ -38,6 +38,7 @@ class AtomVecSphere : public AtomVec {
private: private:
double *radius,*rmass; double *radius,*rmass;
double **omega;
int radvary; int radvary;
double radius_one,rmass_one; double radius_one,rmass_one;