Commit Graph

16 Commits

Author SHA1 Message Date
ceb2ce5814 Merge branch 'master' into improve-include-consistency
# Conflicts:
#	src/USER-CGDNA/pair_oxdna2_stk.cpp
2019-07-19 13:26:00 -04:00
2b5a6d3b7f clean up (some) includes in KOKKOS package 2019-07-15 18:05:20 -04:00
a51479a62b Fix bug in fix_setforce_kokkos 2019-07-12 11:53:32 -06:00
5b3a15bd94 putting implementation header first in package folder sources 2019-07-03 19:58:25 -04:00
f0e48931e4 Remove deprecated KOKKO_HAVE macros 2019-03-07 10:17:32 -07:00
e4071d7f46 replace C-style include files with their C++ equivalents 2018-04-27 18:00:24 -04:00
5d2e097b27 Need dynamic cast for multiple inheritance 2017-12-01 12:53:40 -07:00
31eb12920c Use multiple inheritance to remove accelerator_kokkos.h out of region.h and kspace.h 2017-12-01 10:18:22 -07:00
15a3364c2c Make memory_kokkos its own class 2017-12-01 09:13:31 -07:00
557e5b964a Fixing Kokkos execution space issue with regions 2017-07-25 13:37:01 -06:00
ed50bd2254 Removing unnecessary fences 2017-06-05 13:54:13 -06:00
b3d2fb91bb new fix wall/gran/region command, REBO bug fix, new example log files 2016-10-06 15:47:41 -06:00
9b2d5ff3e7 remove executable permissions on non-executables and non-scripts 2016-09-08 14:45:07 -04:00
876b033ea8 git-svn-id: svn://svn.icms.temple.edu/lammps-ro/trunk@15083 f3b2605a-c512-4ea7-a41b-209d697bcdaa 2016-05-31 16:33:07 +00:00
042f50ac9c Christian's kokkos patch that allows concurrent host and device threading
git-svn-id: svn://svn.icms.temple.edu/lammps-ro/trunk@14752 f3b2605a-c512-4ea7-a41b-209d697bcdaa
2016-03-18 14:50:28 +00:00
704f170053 git-svn-id: svn://svn.icms.temple.edu/lammps-ro/trunk@14335 f3b2605a-c512-4ea7-a41b-209d697bcdaa 2015-12-09 22:31:34 +00:00