Skip to content
Snippets Groups Projects
Commit 13b6196b authored by Stan Moore's avatar Stan Moore
Browse files

Fixing Kokkos compile error

parent baf55c90
No related branches found
No related tags found
No related merge requests found
;/* ---------------------------------------------------------------------- /* ----------------------------------------------------------------------
LAMMPS - Large-scale Atomic/Molecular Massively Parallel Simulator LAMMPS - Large-scale Atomic/Molecular Massively Parallel Simulator
http://lammps.sandia.gov, Sandia National Laboratories http://lammps.sandia.gov, Sandia National Laboratories
Steve Plimpton, sjplimp@sandia.gov Steve Plimpton, sjplimp@sandia.gov
...@@ -21,6 +21,11 @@ ...@@ -21,6 +21,11 @@
#include "atom_masks.h" #include "atom_masks.h"
#include "error.h" #include "error.h"
#include "kokkos.h" #include "kokkos.h"
#include "force.h"
#include "bond.h"
#include "angle.h"
#include "dihedral.h"
#include "improper.h"
#include "style_nbin.h" #include "style_nbin.h"
#include "style_nstencil.h" #include "style_nstencil.h"
#include "style_npair.h" #include "style_npair.h"
...@@ -74,19 +79,6 @@ void NeighborKokkos::init() ...@@ -74,19 +79,6 @@ void NeighborKokkos::init()
atomKK = (AtomKokkos *) atom; atomKK = (AtomKokkos *) atom;
Neighbor::init(); Neighbor::init();
// 1st time allocation of xhold // 1st time allocation of xhold
if (dist_check) if (dist_check)
...@@ -371,8 +363,8 @@ void NeighborKokkos::init_topology() { ...@@ -371,8 +363,8 @@ void NeighborKokkos::init_topology() {
normally built with pair lists, but USER-CUDA separates them normally built with pair lists, but USER-CUDA separates them
------------------------------------------------------------------------- */ ------------------------------------------------------------------------- */
void NeighborKokkos::build_topology_kokkos() { void NeighborKokkos::build_topology() {
if (nlist_device) { if (device_flag) {
neighbond_device.build_topology_kk(); neighbond_device.build_topology_kk();
k_bondlist = neighbond_device.k_bondlist; k_bondlist = neighbond_device.k_bondlist;
...@@ -419,4 +411,4 @@ void NeighborKokkos::build_topology_kokkos() { ...@@ -419,4 +411,4 @@ void NeighborKokkos::build_topology_kokkos() {
k_dihedrallist.modify<LMPHostType>(); k_dihedrallist.modify<LMPHostType>();
k_improperlist.modify<LMPHostType>(); k_improperlist.modify<LMPHostType>();
} }
} }
\ No newline at end of file
0% Loading or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment