Commit 59de1a71 authored by Axel Kohlmeyer's avatar Axel Kohlmeyer
Browse files

Merge branch 'history' of github.com:lammps/lammps into history

parents 5fb5f70e f6ddc8c7

src/KOKKOS/neigh_list_kokkos.cpp

+0 −9
Original line number Diff line number Diff line
@@ -49,15 +49,6 @@ void NeighListKokkos<Device>::grow(int nmax) 
  d_neighbors =

    typename ArrayTypes<Device>::t_neighbors_2d("neighlist:neighbors",

                                                maxatoms,maxneighs);



  memory->sfree(firstneigh);

  memory->sfree(firstdouble);



  firstneigh = (int **) memory->smalloc(maxatoms*sizeof(int *),

                                        "neighlist:firstneigh");

  if (dnum)

    firstdouble = (double **) memory->smalloc(maxatoms*sizeof(double *),

                                              "neighlist:firstdouble");

}



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

src/KOKKOS/npair_copy_kokkos.cpp

+0 −3
Original line number Diff line number Diff line
@@ -41,10 +41,7 @@ void NPairCopyKokkos<DeviceType>::build(NeighList *list) 
  list->gnum = listcopy->gnum;

  list->ilist = listcopy->ilist;

  list->numneigh = listcopy->numneigh;

  list->firstneigh = listcopy->firstneigh;

  list->firstdouble = listcopy->firstdouble;

  list->ipage = listcopy->ipage;

  list->dpage = listcopy->dpage;



  NeighListKokkos<DeviceType>* list_kk = (NeighListKokkos<DeviceType>*) list;

  NeighListKokkos<DeviceType>* listcopy_kk = (NeighListKokkos<DeviceType>*) list->listcopy;

CRA Git | Maintained and supported by SUSTech CRA and CCSE