Merge branch 'master' into USER-DPD_kokkos_testing

2017-07-25 12:12:30 -06:00
parent ea4d11fc5e a59b7e4d56
commit bc446bb8b0
480 changed files with 20786 additions and 7755 deletions
--- a/src/neighbor.cpp
+++ b/src/neighbor.cpp
@ -197,7 +197,7 @@ Neighbor::~Neighbor()
  delete [] slist;
  delete [] plist;

-  for (int i = 0; i < nlist; i++) 
+  for (int i = 0; i < nrequest; i++) 
    if (requests[i]) delete requests[i];
  memory->sfree(requests);
  for (int i = 0; i < old_nrequest; i++)