Commit 950300c8 authored by Steve Plimpton's avatar Steve Plimpton
Browse files

Merge branch 'atomvec-custom' of github.com:lammps/lammps into atomvec-custom

parents d34f9af2 34778c49

src/KOKKOS/atom_kokkos.cpp

+1 −1
Original line number Diff line number Diff line
@@ -237,7 +237,7 @@ void AtomKokkos::grow(unsigned int mask){ 
    sync(Device, mask);

    modified(Device, mask);

    memoryKK->grow_kokkos(k_special,special,nmax,maxspecial,"atom:special");

    avec->grow_reset();

    avec->grow_pointers();

    sync(Host, mask);

  }

}

src/KOKKOS/atom_vec_angle_kokkos.cpp

+2 −2
Original line number Diff line number Diff line
@@ -98,7 +98,7 @@ void AtomVecAngleKokkos::grow(int n) 
  memoryKK->grow_kokkos(atomKK->k_angle_atom3,atomKK->angle_atom3,nmax,atomKK->angle_per_atom,

                      "atom:angle_atom3");



  grow_reset();

  grow_pointers();

  atomKK->sync(Host,ALL_MASK);



  if (atom->nextra_grow)
@@ -110,7 +110,7 @@ void AtomVecAngleKokkos::grow(int n) 
   reset local array ptrs

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



void AtomVecAngleKokkos::grow_reset()

void AtomVecAngleKokkos::grow_pointers()

{

  tag = atomKK->tag;

  d_tag = atomKK->k_tag.d_view;

src/KOKKOS/atom_vec_angle_kokkos.h

+1 −1
Original line number Diff line number Diff line
@@ -58,7 +58,7 @@ class AtomVecAngleKokkos : public AtomVecKokkos { 
  int write_data_hybrid(FILE *, double *);

  bigint memory_usage();



  void grow_reset();

  void grow_pointers();

  int pack_comm_kokkos(const int &n, const DAT::tdual_int_2d &k_sendlist,

                       const int & iswap,

                       const DAT::tdual_xfloat_2d &buf,

src/KOKKOS/atom_vec_atomic_kokkos.cpp

+2 −2
Original line number Diff line number Diff line
@@ -74,7 +74,7 @@ void AtomVecAtomicKokkos::grow(int n) 
  memoryKK->grow_kokkos(atomKK->k_v,atomKK->v,nmax,3,"atom:v");

  memoryKK->grow_kokkos(atomKK->k_f,atomKK->f,nmax,3,"atom:f");



  grow_reset();

  grow_pointers();

  atomKK->sync(Host,ALL_MASK);



  if (atom->nextra_grow)
@@ -86,7 +86,7 @@ void AtomVecAtomicKokkos::grow(int n) 
   reset local array ptrs

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



void AtomVecAtomicKokkos::grow_reset()

void AtomVecAtomicKokkos::grow_pointers()

{

  tag = atomKK->tag;

  d_tag = atomKK->k_tag.d_view;

src/KOKKOS/atom_vec_atomic_kokkos.h

+1 −1
Original line number Diff line number Diff line
@@ -48,7 +48,7 @@ class AtomVecAtomicKokkos : public AtomVecKokkos { 
  void write_data(FILE *, int, double **);

  bigint memory_usage();



  void grow_reset();

  void grow_pointers();

  int pack_border_kokkos(int n, DAT::tdual_int_2d k_sendlist,

                         DAT::tdual_xfloat_2d buf,int iswap,

                         int pbc_flag, int *pbc, ExecutionSpace space);

CRA Git | Maintained and supported by SUSTech CRA and CCSE