Commit 9eb8702f authored by stamoor's avatar stamoor
Browse files

Fixing Kokkos bugs 

git-svn-id: svn://svn.icms.temple.edu/lammps-ro/trunk@14488 f3b2605a-c512-4ea7-a41b-209d697bcdaa
parent 775b163e

src/KOKKOS/atom_kokkos.cpp

+8 −0
Original line number Diff line number Diff line
@@ -253,3 +253,11 @@ void AtomKokkos::sync_modify(ExecutionSpace execution_space, 
  sync(execution_space,datamask_read);

  modified(execution_space,datamask_modify);

}



AtomVec *AtomKokkos::new_avec(const char *style, int trysuffix, int &sflag)

{

  AtomVec* avec = Atom::new_avec(style,trysuffix,sflag);

  if (!avec->kokkosable)

    error->all(FLERR,"KOKKOS package requires a kokkos enabled atom_style");

  return avec;

}
 
 No newline at end of file

src/KOKKOS/atom_kokkos.h

+2 −0
Original line number Diff line number Diff line
@@ -61,6 +61,8 @@ class AtomKokkos : public Atom { 
  virtual void grow(unsigned int mask);

  virtual void deallocate_topology();

  void sync_modify(ExecutionSpace, unsigned int, unsigned int);

 private:

   class AtomVec *new_avec(const char *, int, int &);

};



template<class ViewType, class IndexView>

src/KOKKOS/neighbor_kokkos.cpp

+1 −1
Original line number Diff line number Diff line
@@ -518,7 +518,7 @@ void NeighborKokkos::setup_bins_kokkos(int i) 
    (this->*stencil_create[slist[i]])(lists_device[slist[i]],sx,sy,sz);

  }



  if (i < nslist-1) return;

  //if (i < nslist-1) return; // this won't work if a non-kokkos neighbor list is last



  if (maxhead > k_bins.d_view.dimension_0()) {

    k_bins = DAT::tdual_int_2d("Neighbor::d_bins",maxhead,atoms_per_bin);

src/atom.h

+1 −1
Original line number Diff line number Diff line
@@ -195,7 +195,7 @@ class Atom : protected Pointers { 


  void settings(class Atom *);

  void create_avec(const char *, int, char **, int);

  class AtomVec *new_avec(const char *, int, int &);

  virtual class AtomVec *new_avec(const char *, int, int &);

  void init();

  void setup();

CRA Git | Maintained and supported by SUSTech CRA and CCSE