tx258/lammps-gran-kokkos
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Merge pull request #7 from ibaned/pair-dpd-energy-kokkos-warnings

Browse Source 
fix many warnings in pair_dpd_fdt_energy_kokkos
This commit is contained in:
Stan Moore
2017-01-05 16:46:04 -07:00
committed by GitHub
parent 332372dec2 19f2d2d1ec
commit 49d644ec3a
2 changed files with 4 additions and 11 deletions
Download Patch File Download Diff File Expand all files Collapse all files

14
src/KOKKOS/pair_dpd_fdt_energy_kokkos.cpp
View File

@ -49,6 +49,7 @@ PairDPDfdtEnergyKokkos<DeviceType>::PairDPDfdtEnergyKokkos(LAMMPS *lmp) :
execution_space = ExecutionSpaceFromDevice<DeviceType>::space;
datamask_read = EMPTY_MASK;
datamask_modify = EMPTY_MASK;
STACKPARAMS = 0;
}
/* ---------------------------------------------------------------------- */
@ -164,8 +165,6 @@ void PairDPDfdtEnergyKokkos<DeviceType>::compute(int eflag_in, int vflag_in)
boltz = force->boltz;
ftm2v = force->ftm2v;
int STACKPARAMS = 0; // optimize
// loop over neighbors of my atoms
EV_FLOAT ev;
@ -278,14 +277,7 @@ void PairDPDfdtEnergyKokkos<DeviceType>::operator()(TagPairDPDfdtEnergyComputeSp
int i,j,jj,inum,jnum,itype,jtype;
double xtmp,ytmp,ztmp,delx,dely,delz,evdwl,fpair;
double vxtmp,vytmp,vztmp,delvx,delvy,delvz;
double rsq,r,rinv,wd,wr,factor_dpd,uTmp;
double dot,randnum;
double kappa_ij, alpha_ij, theta_ij, gamma_ij;
double mass_i, mass_j;
double massinv_i, massinv_j;
double randPair, mu_ij;
double rsq,r,rinv,wd,wr,factor_dpd;
i = d_ilist[ii];
xtmp = x(i,0);
@ -369,7 +361,7 @@ void PairDPDfdtEnergyKokkos<DeviceType>::operator()(TagPairDPDfdtEnergyComputeNo
Kokkos::View<E_FLOAT*, typename DAT::t_efloat_1d::array_layout,DeviceType,Kokkos::MemoryTraits<AtomicF<NEIGHFLAG>::value> > a_duCond = d_duCond;
Kokkos::View<E_FLOAT*, typename DAT::t_efloat_1d::array_layout,DeviceType,Kokkos::MemoryTraits<AtomicF<NEIGHFLAG>::value> > a_duMech = d_duMech;
int i,j,jj,inum,jnum,itype,jtype;
int i,j,jj,jnum,itype,jtype;
double xtmp,ytmp,ztmp,delx,dely,delz,evdwl,fpair;
double vxtmp,vytmp,vztmp,delvx,delvy,delvz;
double rsq,r,rinv,wd,wr,factor_dpd,uTmp;

1
src/KOKKOS/pair_dpd_fdt_energy_kokkos.h
View File

@ -51,6 +51,7 @@ class PairDPDfdtEnergyKokkos : public PairDPDfdtEnergy {
void init_style();
double init_one(int, int);
KOKKOS_INLINE_FUNCTION
void operator()(TagPairDPDfdtEnergyZero, const int&) const;
template<int NEIGHFLAG, int NEWTON_PAIR, int EVFLAG>