From 228caa3fabe8755bb673ba9d05db1ec6eee1260e Mon Sep 17 00:00:00 2001
From: Stan Moore <stamoor@sandia.gov>
Date: Fri, 6 Jul 2018 11:59:25 -0600
Subject: [PATCH] Remove randomread from radius to prevent Kokkos runtime error
when radius isn't defined
---
src/KOKKOS/npair_kokkos.cpp | 1 -
src/KOKKOS/npair_kokkos.h | 6 +++---
2 files changed, 3 insertions(+), 4 deletions(-)
diff --git a/src/KOKKOS/npair_kokkos.cpp b/src/KOKKOS/npair_kokkos.cpp
index c50d6305e7..6ea2cebefc 100644
--- a/src/KOKKOS/npair_kokkos.cpp
+++ b/src/KOKKOS/npair_kokkos.cpp
@@ -686,7 +686,6 @@ void NeighborKokkosExecute<DeviceType>::
{
/* if necessary, goto next page and add pages */
int n = 0;
- int which = 0;
int moltemplate;
if (molecular == 2) moltemplate = 1;
else moltemplate = 0;
diff --git a/src/KOKKOS/npair_kokkos.h b/src/KOKKOS/npair_kokkos.h
index a8837fa9f3..970e40c9fc 100644
--- a/src/KOKKOS/npair_kokkos.h
+++ b/src/KOKKOS/npair_kokkos.h
@@ -182,7 +182,7 @@ class NeighborKokkosExecute
// data from Atom class
const typename AT::t_x_array_randomread x;
- const typename AT::t_float_1d_randomread radius;
+ const typename AT::t_float_1d radius;
const typename AT::t_int_1d_const type,mask;
const typename AT::t_tagint_1d_const molecule;
const typename AT::t_tagint_1d_const tag;
@@ -223,7 +223,7 @@ class NeighborKokkosExecute
const typename AT::t_int_1d_3 &_d_stencilxyz,
const int _nlocal,
const typename AT::t_x_array_randomread &_x,
- const typename AT::t_float_1d_randomread &_radius,
+ const typename AT::t_float_1d &_radius,
const typename AT::t_int_1d_const &_type,
const typename AT::t_int_1d_const &_mask,
const typename AT::t_tagint_1d_const &_molecule,
@@ -251,7 +251,7 @@ class NeighborKokkosExecute
const X_FLOAT *_bboxhi, const X_FLOAT* _bboxlo,
const int & _xperiodic, const int & _yperiodic, const int & _zperiodic,
const int & _xprd_half, const int & _yprd_half, const int & _zprd_half,
- const X_FLOAT _skin):
+ const X_FLOAT _skin):
neigh_list(_neigh_list), cutneighsq(_cutneighsq),
bincount(_bincount),c_bincount(_bincount),bins(_bins),c_bins(_bins),
atom2bin(_atom2bin),c_atom2bin(_atom2bin),
--
GitLab