jianmu
/
lammps
forked from lijiext/lammps
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Fix issue in npair_skip_kokkos

This commit is contained in:
Stan Moore 2018-01-12 15:45:24 -07:00
parent 6e3acce3be
commit 52d3e98f3b
2 changed files with 9 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
src/KOKKOS/npair_skip_kokkos.cpp
View File

@ -133,9 +133,8 @@ void NPairSkipKokkos<DeviceType>::operator()(TagNPairSkipCompute, const int &ii)
template<class DeviceType>
KOKKOS_INLINE_FUNCTION
void NPairSkipKokkos<DeviceType>::operator()(TagNPairSkipCountLocal, const int &i, int num) const {
void NPairSkipKokkos<DeviceType>::operator()(TagNPairSkipCountLocal, const int &i, int &num) const {
if (d_ilist[i] < nlocal) num++;
else return;
}

12
src/KOKKOS/npair_skip_kokkos.h
View File

@ -69,7 +69,7 @@ class NPairSkipKokkos : public NPair {
void operator()(TagNPairSkipCompute, const int&) const;
KOKKOS_INLINE_FUNCTION
void operator()(TagNPairSkipCountLocal, const int&, int) const;
void operator()(TagNPairSkipCountLocal, const int&, int&) const;
private:
int nlocal;
@ -78,9 +78,13 @@ class NPairSkipKokkos : public NPair {
typename AT::t_int_scalar d_inum;
typename AT::t_neighbors_2d d_neighbors,d_neighbors_skip;
typename AT::t_int_1d d_ilist,d_ilist_skip;
typename AT::t_int_1d d_numneigh,d_numneigh_skip;
typename AT::t_neighbors_2d_const d_neighbors_skip;
typename AT::t_int_1d_const d_ilist_skip;
typename AT::t_int_1d_const d_numneigh_skip;
typename AT::t_neighbors_2d d_neighbors;
typename AT::t_int_1d d_ilist;
typename AT::t_int_1d d_numneigh;
DAT::tdual_int_1d k_iskip;
DAT::tdual_int_2d k_ijskip;