Skip to content
Snippets Groups Projects
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
No related branches found
No related tags found
No related merge requests found
......@@ -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");
}
/* ---------------------------------------------------------------------- */
......
......@@ -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;
......
0% Loading or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment