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

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

This commit is contained in:
sjplimp 2016-01-25 23:04:42 +00:00
parent 0fbc48723e
commit 2d78e1a215
8 changed files with 12 additions and 12 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
src/KOKKOS/pair_sw_kokkos.cpp
View File

@ -574,9 +574,9 @@ void PairSWKokkos<DeviceType>::init_style()
/* ---------------------------------------------------------------------- */
template<class DeviceType>
void PairSWKokkos<DeviceType>::setup()
void PairSWKokkos<DeviceType>::setup_params()
{
PairSW::setup();
PairSW::setup_params();
// sync elem2param and params

2
src/KOKKOS/pair_sw_kokkos.h
View File

@ -106,7 +106,7 @@ class PairSWKokkos : public PairSW {
t_param_1d d_params;
virtual void setup();
virtual void setup_params();
void twobody(const Param&, const F_FLOAT&, F_FLOAT&, const int&, F_FLOAT&) const;
void threebody(const Param&, const Param&, const Param&, const F_FLOAT&, const F_FLOAT&, F_FLOAT *, F_FLOAT *,
F_FLOAT *, F_FLOAT *, const int&, F_FLOAT&) const;

4
src/KOKKOS/pair_tersoff_kokkos.cpp
View File

@ -118,9 +118,9 @@ void PairTersoffKokkos<DeviceType>::init_style()
/* ---------------------------------------------------------------------- */
template<class DeviceType>
void PairTersoffKokkos<DeviceType>::setup()
void PairTersoffKokkos<DeviceType>::setup_params()
{
PairTersoff::setup();
PairTersoff::setup_params();
int i,j,k,m;
int n = atom->ntypes;

2
src/KOKKOS/pair_tersoff_kokkos.h
View File

@ -172,7 +172,7 @@ class PairTersoffKokkos : public PairTersoff {
F_FLOAT *fj, F_FLOAT *fk, F_FLOAT *drji, F_FLOAT *drjk) const;
void allocate();
void setup();
void setup_params();
protected:
void cleanup_copy();

4
src/KOKKOS/pair_tersoff_mod_kokkos.cpp
View File

@ -117,9 +117,9 @@ void PairTersoffMODKokkos<DeviceType>::init_style()
/* ---------------------------------------------------------------------- */
template<class DeviceType>
void PairTersoffMODKokkos<DeviceType>::setup()
void PairTersoffMODKokkos<DeviceType>::setup_params()
{
PairTersoffMOD::setup();
PairTersoffMOD::setup_params();
int i,j,k,m;
int n = atom->ntypes;

2
src/KOKKOS/pair_tersoff_mod_kokkos.h
View File

@ -172,7 +172,7 @@ class PairTersoffMODKokkos : public PairTersoffMOD {
F_FLOAT *fj, F_FLOAT *fk, F_FLOAT *drji, F_FLOAT *drjk) const;
void allocate();
void setup();
void setup_params();
protected:
void cleanup_copy();

4
src/KOKKOS/pair_tersoff_zbl_kokkos.cpp
View File

@ -128,9 +128,9 @@ void PairTersoffZBLKokkos<DeviceType>::init_style()
/* ---------------------------------------------------------------------- */
template<class DeviceType>
void PairTersoffZBLKokkos<DeviceType>::setup()
void PairTersoffZBLKokkos<DeviceType>::setup_params()
{
PairTersoffZBL::setup();
PairTersoffZBL::setup_params();
int i,j,k,m;
int n = atom->ntypes;

2
src/KOKKOS/pair_tersoff_zbl_kokkos.h
View File

@ -172,7 +172,7 @@ class PairTersoffZBLKokkos : public PairTersoffZBL {
F_FLOAT *fj, F_FLOAT *fk, F_FLOAT *drji, F_FLOAT *drjk) const;
void allocate();
void setup();
void setup_params();
KOKKOS_INLINE_FUNCTION
double fermi_k(const int &i, const int &j, const int &k, const F_FLOAT &r) const;