Commit 756724c9 authored by Stan Moore's avatar Stan Moore
Browse files

Merge branch 'kk_compute_orientorder_atom' of...

Merge branch 'kk_compute_orientorder_atom' of ssh://github.com/stanmoore1/lammps into kk_compute_coord_atom
parents 85f1cb6a 261b826c
Loading
Loading
Loading
Loading
+3 −3
Original line number Diff line number Diff line
@@ -91,10 +91,10 @@ void ComputeOrientOrderAtomKokkos<DeviceType>::init()
  int irequest = neighbor->nrequest - 1;

  neighbor->requests[irequest]->
    kokkos_host = Kokkos::Impl::is_same<DeviceType,LMPHostType>::value &&
    !Kokkos::Impl::is_same<DeviceType,LMPDeviceType>::value;
    kokkos_host = std::is_same<DeviceType,LMPHostType>::value &&
    std::is_same<DeviceType,LMPDeviceType>::value;
  neighbor->requests[irequest]->
    kokkos_device = Kokkos::Impl::is_same<DeviceType,LMPDeviceType>::value;
    kokkos_device = std::is_same<DeviceType,LMPDeviceType>::value;
}

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