Merge branch 'master' into symbolic-atom-constants

2020-09-15 17:44:31 -04:00
parent 618b08dcfc cebf6d33ba
commit 0f6a34775c
1186 changed files with 8448 additions and 8360 deletions
--- a/src/replicate.cpp
+++ b/src/replicate.cpp
@ -154,7 +154,7 @@ void Replicate::command(int narg, char **arg)
  // also set atomKK for Kokkos version of Atom class

  Atom *old = atom;
-  atomKK = NULL;
+  atomKK = nullptr;
  if (lmp->kokkos) atom = atomKK = new AtomKokkos(lmp);
  else atom = new Atom(lmp);