Commit 2d78e1a2 authored by sjplimp's avatar sjplimp
Browse files

git-svn-id: svn://svn.icms.temple.edu/lammps-ro/trunk@14493 f3b2605a-c512-4ea7-a41b-209d697bcdaa
parent 0fbc4872
Loading
Loading
Loading
Loading
+2 −2
Original line number Diff line number Diff line
@@ -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

+1 −1
Original line number Diff line number Diff line
@@ -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;
+2 −2
Original line number Diff line number Diff line
@@ -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;
+1 −1
Original line number Diff line number Diff line
@@ -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();
+2 −2
Original line number Diff line number Diff line
@@ -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;
Loading