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

Fix compile error in pair_yukawa_kokkos

This commit is contained in:
Stan Moore 2017-12-07 08:42:17 -07:00
parent d7e5d60f90
commit c4e83be533
1 changed files with 8 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

16
src/KOKKOS/pair_yukawa_kokkos.cpp
View File

@ -28,7 +28,7 @@
#include "integrate.h" #include "integrate.h"
#include "respa.h" #include "respa.h"
#include "math_const.h" #include "math_const.h"
#include "memory.h" #include "memory_kokkos.h"
#include "error.h" #include "error.h"
#include "atom_masks.h" #include "atom_masks.h"
@ -58,8 +58,8 @@ template<class DeviceType>
PairYukawaKokkos<DeviceType>::~PairYukawaKokkos() PairYukawaKokkos<DeviceType>::~PairYukawaKokkos()
{ {
if (allocated) { if (allocated) {
memory->destroy_kokkos(k_eatom,eatom); memoryKK->destroy_kokkos(k_eatom,eatom);
memory->destroy_kokkos(k_vatom,vatom); memoryKK->destroy_kokkos(k_vatom,vatom);
k_cutsq = DAT::tdual_ffloat_2d(); k_cutsq = DAT::tdual_ffloat_2d();
memory->sfree(cutsq); memory->sfree(cutsq);
eatom = NULL; eatom = NULL;
@ -90,7 +90,7 @@ void PairYukawaKokkos<DeviceType>::allocate()
int n = atom->ntypes; int n = atom->ntypes;
memory->destroy(cutsq); memory->destroy(cutsq);
memory->create_kokkos(k_cutsq,cutsq,n+1,n+1,"pair:cutsq"); memoryKK->create_kokkos(k_cutsq,cutsq,n+1,n+1,"pair:cutsq");
d_cutsq = k_cutsq.template view<DeviceType>(); d_cutsq = k_cutsq.template view<DeviceType>();
k_params = Kokkos::DualView<params_yukawa**, k_params = Kokkos::DualView<params_yukawa**,
Kokkos::LayoutRight,DeviceType>( Kokkos::LayoutRight,DeviceType>(
@ -183,13 +183,13 @@ void PairYukawaKokkos<DeviceType>::compute(int eflag_in, int vflag_in)
// reallocate per-atom arrays if necessary // reallocate per-atom arrays if necessary
if (eflag_atom) { if (eflag_atom) {
memory->destroy_kokkos(k_eatom,eatom); memoryKK->destroy_kokkos(k_eatom,eatom);
memory->create_kokkos(k_eatom,eatom,maxeatom,"pair:eatom"); memoryKK->create_kokkos(k_eatom,eatom,maxeatom,"pair:eatom");
d_eatom = k_eatom.view<DeviceType>(); d_eatom = k_eatom.view<DeviceType>();
} }
if (vflag_atom) { if (vflag_atom) {
memory->destroy_kokkos(k_vatom,vatom); memoryKK->destroy_kokkos(k_vatom,vatom);
memory->create_kokkos(k_vatom,vatom,maxvatom,6,"pair:vatom"); memoryKK->create_kokkos(k_vatom,vatom,maxvatom,6,"pair:vatom");
d_vatom = k_vatom.view<DeviceType>(); d_vatom = k_vatom.view<DeviceType>();
} }