Merge branch 'master' (21893539cb Aug 25) into USER-DPD_kokkos_merge

Resolved conflicts in src/KOKKOS/npair_kokkos.cpp
2017-08-28 14:26:31 -05:00
parent e52a28f8af 21893539cb
commit 736e063971
75 changed files with 227 additions and 186 deletions
--- a/src/neighbor.cpp
+++ b/src/neighbor.cpp
@ -22,6 +22,10 @@
 #include "neighbor.h"
 #include "neigh_list.h"
 #include "neigh_request.h"
+#include "nbin.h"
+#include "nstencil.h"
+#include "npair.h"
+#include "ntopo.h"
 #include "style_nbin.h"
 #include "style_nstencil.h"
 #include "style_npair.h"