From e6ba3ccd33332429a498030089fe6bfa3b01f52f Mon Sep 17 00:00:00 2001 From: stamoor Date: Tue, 26 Apr 2016 16:12:44 +0000 Subject: [PATCH] Fixing Kokkos compile errors git-svn-id: svn://svn.icms.temple.edu/lammps-ro/trunk@14873 f3b2605a-c512-4ea7-a41b-209d697bcdaa --- src/KOKKOS/pair_sw_kokkos.cpp | 4 ++-- src/KOKKOS/pair_tersoff_kokkos.cpp | 2 -- src/KOKKOS/pair_tersoff_mod_kokkos.cpp | 2 -- src/KOKKOS/pair_tersoff_zbl_kokkos.cpp | 2 -- 4 files changed, 2 insertions(+), 8 deletions(-) diff --git a/src/KOKKOS/pair_sw_kokkos.cpp b/src/KOKKOS/pair_sw_kokkos.cpp index 9864066fc2..bb81a29c0a 100755 --- a/src/KOKKOS/pair_sw_kokkos.cpp +++ b/src/KOKKOS/pair_sw_kokkos.cpp @@ -33,8 +33,10 @@ #include "memory.h" #include "error.h" #include "atom_masks.h" +#include "math_const.h" using namespace LAMMPS_NS; +using namespace MathConst; #define MAXLINE 1024 #define DELTA 4 @@ -44,8 +46,6 @@ using namespace LAMMPS_NS; template PairSWKokkos::PairSWKokkos(LAMMPS *lmp) : PairSW(lmp) { - THIRD = 1.0/3.0; - respa_enable = 0; diff --git a/src/KOKKOS/pair_tersoff_kokkos.cpp b/src/KOKKOS/pair_tersoff_kokkos.cpp index a87c856304..cf9b510ed6 100755 --- a/src/KOKKOS/pair_tersoff_kokkos.cpp +++ b/src/KOKKOS/pair_tersoff_kokkos.cpp @@ -46,8 +46,6 @@ using namespace MathConst; template PairTersoffKokkos::PairTersoffKokkos(LAMMPS *lmp) : PairTersoff(lmp) { - THIRD = 1.0/3.0; - respa_enable = 0; atomKK = (AtomKokkos *) atom; diff --git a/src/KOKKOS/pair_tersoff_mod_kokkos.cpp b/src/KOKKOS/pair_tersoff_mod_kokkos.cpp index 9e18058a8f..8cfaa63e7a 100755 --- a/src/KOKKOS/pair_tersoff_mod_kokkos.cpp +++ b/src/KOKKOS/pair_tersoff_mod_kokkos.cpp @@ -46,8 +46,6 @@ using namespace MathConst; template PairTersoffMODKokkos::PairTersoffMODKokkos(LAMMPS *lmp) : PairTersoffMOD(lmp) { - THIRD = 1.0/3.0; - respa_enable = 0; atomKK = (AtomKokkos *) atom; diff --git a/src/KOKKOS/pair_tersoff_zbl_kokkos.cpp b/src/KOKKOS/pair_tersoff_zbl_kokkos.cpp index 5f6a95130d..382cff8ef5 100755 --- a/src/KOKKOS/pair_tersoff_zbl_kokkos.cpp +++ b/src/KOKKOS/pair_tersoff_zbl_kokkos.cpp @@ -46,8 +46,6 @@ using namespace MathConst; template PairTersoffZBLKokkos::PairTersoffZBLKokkos(LAMMPS *lmp) : PairTersoffZBL(lmp) { - THIRD = 1.0/3.0; - respa_enable = 0; atomKK = (AtomKokkos *) atom;