Unverified Commit 2913d3da authored by Steve Plimpton's avatar Steve Plimpton Committed by GitHub
Browse files

Merge pull request #777 from lammps/fix_prop_atom

Fix bug in FixPropertyAtom
parents 4af14bec 415a55bc
Loading
Loading
Loading
Loading
+1 −0
Changes for src/KOKKOS/fix_property_atom_kokkos.cpp: 1 added line, 0 removed lines.
Original line number Diff line number Diff line
@@ -31,6 +31,7 @@ FixPropertyAtomKokkos::FixPropertyAtomKokkos(LAMMPS *lmp, int narg, char **arg)
  FixPropertyAtom(lmp, narg, arg)
{
  atomKK = (AtomKokkos *) atom;
  grow_arrays(atom->nmax);
}

/* ----------------------------------------------------------------------
+2 −2
Changes for src/fix_property_atom.cpp: 2 added lines, 2 removed lines.
Original line number Diff line number Diff line
@@ -134,6 +134,8 @@ FixPropertyAtom::FixPropertyAtom(LAMMPS *lmp, int narg, char **arg) :
  // register with Atom class

  nmax_old = 0;
  if (!lmp->kokkos)
    grow_arrays(atom->nmax);
  atom->add_callback(0);
  atom->add_callback(1);
  if (border) atom->add_callback(2);
@@ -189,8 +191,6 @@ int FixPropertyAtom::setmask()

void FixPropertyAtom::init()
{
  grow_arrays(atom->nmax);

  // error if atom style has changed since fix was defined
  // don't allow this b/c user could change to style that defines molecule,q