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

add member variables from PairTableRX

Browse Source
This commit is contained in:
Dan Ibanez
2017-01-09 12:29:15 -07:00
parent f995bb4335
commit 21cde6261a
2 changed files with 12 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

5
src/KOKKOS/pair_table_rx_kokkos.cpp
View File

@ -527,7 +527,10 @@ void PairTableRXKokkos<DeviceType>::cleanup_copy() {
template<class DeviceType>
KOKKOS_INLINE_FUNCTION
void PairTableRXKokkos<DeviceType>::getMixingWeights(typename DAT::t_float_2d_randomread dvector, int, double &, double &, double &, double &) {
void PairTableRXKokkos<DeviceType>::getMixingWeights(
typename DAT::t_float_2d_randomread dvector, int id,
double &mixWtSite1old, double &mixWtSite2old,
double &mixWtSite1, double &mixWtSite2) {
double fractionOFAold, fractionOFA;
double fractionOld1, fraction1;
double fractionOld2, fraction2;

9
src/KOKKOS/pair_table_rx_kokkos.h
View File

@ -153,8 +153,15 @@ class PairTableRXKokkos : public PairTable {
friend void pair_virial_fdotr_compute<PairTableRXKokkos>(PairTableRXKokkos*);
/* PairTableRX members */
int nspecies;
char *site1, *site2;
int isite1, isite2;
bool fractionalWeighting;
KOKKOS_INLINE_FUNCTION
void getMixingWeights(typename DAT::t_float_2d_randomread dvector, int, double &, double &, double &, double &);
void getMixingWeights(typename DAT::t_float_2d_randomread, int, double &, double &, double &, double &);
};
}