Merge branch 'master' as of patch 6Jan17 into USER-DPD_kokkos

2017-01-09 13:12:02 -05:00
parent 49d644ec3a 51fa33a407
commit 26d50853e9
196 changed files with 4623 additions and 2885 deletions
--- a/src/atom.cpp
+++ b/src/atom.cpp
@ -392,6 +392,8 @@ void Atom::create_avec(const char *style, int narg, char **arg, int trysuffix)
 {
  delete [] atom_style;
  if (avec) delete avec;
+  atom_style = NULL;
+  avec = NULL;

  // unset atom style and array existence flags
  // may have been set by old avec