Commit a223338b authored by Stan Moore's avatar Stan Moore
Browse files

Fix hang with Kokkos and USER-DPD examples

parent 8eb74d8f

src/KOKKOS/atom_vec_dpd_kokkos.cpp

+3 −1
Original line number Diff line number Diff line
@@ -37,7 +37,7 @@ AtomVecDPDKokkos::AtomVecDPDKokkos(LAMMPS *lmp) : AtomVecKokkos(lmp) 
  size_forward = 7;

  size_reverse = 3;

  size_border = 12;

  size_velocity = 3;

  size_velocity = 10;

  size_data_atom = 6;

  size_data_vel = 4;

  xcol_data = 4;
@@ -48,6 +48,8 @@ AtomVecDPDKokkos::AtomVecDPDKokkos(LAMMPS *lmp) : AtomVecKokkos(lmp) 
  k_count = DAT::tdual_int_1d("atom::k_count",1);

  atomKK = (AtomKokkos *) atom;

  commKK = (CommKokkos *) comm;



  no_comm_vel_flag = 1;

}



/* ----------------------------------------------------------------------

src/KOKKOS/atom_vec_hybrid_kokkos.cpp

+4 −1
Original line number Diff line number Diff line
@@ -26,7 +26,10 @@ using namespace LAMMPS_NS; 


/* ---------------------------------------------------------------------- */



AtomVecHybridKokkos::AtomVecHybridKokkos(LAMMPS *lmp) : AtomVecKokkos(lmp) {}

AtomVecHybridKokkos::AtomVecHybridKokkos(LAMMPS *lmp) : AtomVecKokkos(lmp) {

  no_comm_vel_flag = 1;

  no_border_vel_flag = 1;

}



/* ---------------------------------------------------------------------- */

src/KOKKOS/atom_vec_kokkos.cpp

+3 −0
Original line number Diff line number Diff line
@@ -26,6 +26,9 @@ AtomVecKokkos::AtomVecKokkos(LAMMPS *lmp) : AtomVec(lmp) 
  kokkosable = 1;

  buffer = NULL;

  buffer_size = 0;



  no_comm_vel_flag = 0;

  no_border_vel_flag = 1;

}



/* ---------------------------------------------------------------------- */

src/KOKKOS/atom_vec_kokkos.h

+2 −0
Original line number Diff line number Diff line
@@ -113,6 +113,8 @@ class AtomVecKokkos : public AtomVec { 
                           ExecutionSpace space) = 0;





  int no_comm_vel_flag,no_border_vel_flag;



 protected:



  HAT::t_x_array h_x;

src/KOKKOS/atom_vec_sphere_kokkos.cpp

+2 −0
Original line number Diff line number Diff line
@@ -57,6 +57,8 @@ AtomVecSphereKokkos::AtomVecSphereKokkos(LAMMPS *lmp) : AtomVecKokkos(lmp) 
  k_count = DAT::tdual_int_1d("atom::k_count",1);

  atomKK = (AtomKokkos *) atom;

  commKK = (CommKokkos *) comm;



  no_border_vel_flag = 0;

}



/* ---------------------------------------------------------------------- */

CRA Git | Maintained and supported by SUSTech CRA and CCSE