Commit Graph

14631 Commits

Author SHA1 Message Date
e08ccd0a7c Forgot to include change in fix_enforce2d to access fixlist in kokkos port. 2018-06-29 11:58:27 -04:00
14c4aea32d Merge branch 'master' into port-enforce2d-kokkos 2018-06-13 14:59:07 -04:00
666a13ea8a Merge branch 'master' of https://www.github.com/lammps/lammps 2018-06-13 14:58:58 -04:00
661848139c Merge pull request #926 from ndtrung81/gpu-updates
some updates to the GPU package
2018-06-13 12:57:01 -06:00
3c781afa6c Switched to standard C++ header files for pair lj/expand/coul/long in USER-MISC 2018-06-09 09:41:03 -05:00
29e555213c Merge pull request #924 from junghans/cmake_misc
miscellaneous CMake Fixes
2018-06-08 17:34:58 -06:00
965ac3cedd cmake: lower cmake requirement to 2.8.12 2018-06-08 16:18:02 -06:00
30e3e9ab88 cmake: simplify Fortran linkage 2018-06-08 16:14:28 -06:00
6cb0c2e9c5 Merge pull request #937 from stanmoore1/kk_bonds
Fix issues in Kokkos topology files
2018-06-08 15:42:40 -06:00
ebd93cac69 Merge pull request #930 from stanmoore1/kk_update
Update Kokkos library to v2.7.00
2018-06-08 15:42:05 -06:00
142de878f9 Kokkos doesn't yet support map_style hash, so use may_style array by default if Kokkos is enabled 2018-06-08 09:38:16 -06:00
4bf9a93c11 Removed x dependency from enforce2d_kokkos. 2018-06-06 10:47:07 -04:00
824a21a661 Removed debug printing from setup. 2018-06-04 12:28:06 -04:00
5a383aa518 Reverted fix nve/manifold/rattle to upstream. 2018-06-04 12:26:26 -04:00
a4a3133b76 Switched to standard C++ header files for consistency with other source files 2018-06-01 23:13:49 -05:00
0e96918313 Made enforce2d_kokkos actually set data masks. 2018-06-01 17:22:25 -04:00
031077b4fa Made enforce2d also set rotations to in-plane. 2018-06-01 17:19:53 -04:00
962946ee45 Ported fix enforce2d to Kokkos. 2018-06-01 14:52:34 -04:00
1ee85e59c3 Removed obsolete changes to fix_nve-manifold_rattle 2018-06-01 14:50:41 -04:00
c386bdddf9 Merge branch 'master' of https://www.github.com/lammps/lammps 2018-06-01 10:44:11 -04:00
e3e040227b Fix issues in Kokkos topology files 2018-05-30 12:31:20 -06:00
c27e617fd8 Add logic to Makefile.kokkos 2018-05-29 11:33:18 -06:00
0368202d12 Merge pull request #929 from stanmoore1/snap_fix
Small bugfixes for Pair Snap
2018-05-26 14:07:19 -06:00
1422b0413b Update Kokkos library to v2.7.00 2018-05-25 15:00:53 -06:00
18c6d7f289 Fix possible MPI deadlock in pair_snap 2018-05-24 15:31:49 -06:00
1b4068b575 Restore workaround for compiler bug in pair_snap.h 2018-05-24 15:31:22 -06:00
341fa160fe Updated UCL_Device built with OpenCL to use platforms that support accelerators by default 2018-05-23 16:11:55 -05:00
6c42c9b378 Add missing OCL_TUNE define to CMake build 2018-05-22 20:21:58 -04:00
ce4a446cea Merge pull request #911 from akohlmey/collected-small-changes
Collected small changes and bugfixes
2018-05-22 10:11:12 -06:00
933cf92e36 Merge pull request #923 from akohlmey/remove-register
Remove deprecated 'register' keyword
2018-05-22 10:02:32 -06:00
69903cb4aa Merge pull request #921 from lammps/doctweaks
tweaks to doc pages
2018-05-22 10:02:01 -06:00
ad5cfb5ae6 Switched member variables from private to protected for lj/cut/dipole/long 2018-05-22 09:55:16 -05:00
2f9e6d4566 Fixed bugs in lal_device.cpp with node_names dynamically allocated and dipole/long/gpu 2018-05-21 23:32:25 -05:00
4ec31564fe fix preprocessor directive bug in lib/atc 2018-05-21 16:50:16 -04:00
f5b7419108 fix typo reported in #915 2018-05-21 16:49:00 -04:00
1f193e02e0 update to c++ style include header syntax 2018-05-21 16:49:00 -04:00
838a1938bb Added pair styles lj/expand/coul/long to USER-MISC and its gpu version to GPU package, added lj/cut/dipole/long/gpu; and added an example Makfile to build GPU package for multi-arch 2018-05-20 17:03:12 -05:00
df3eb36519 cmake: KOKKOS enables C++-11 internally 2018-05-20 08:22:20 -06:00
bb6dcb8ebd cmake: make CORESHELL depend on KSPACE 2018-05-20 07:54:00 -06:00
e6f76451eb cmake: fix pkg_depend macro 2018-05-20 07:27:22 -06:00
cfb350d40b cmake: QMMM and H5MD need C 2018-05-19 11:07:19 -06:00
5daf1fe0d4 remove deprecated 'register' keyword. closes #922 2018-05-18 17:43:18 -04:00
cab602045e tweaks to doc pages 2018-05-18 08:37:29 -06:00
e1361a9dca Merge branch 'master' of https://www.github.com/lammps/lammps 2018-05-17 10:42:18 -04:00
94c6d2d546 Merge pull request #918 from stanmoore1/kk_atomics
Fix performance regression in KOKKOS package
2018-05-16 16:46:02 -06:00
585a164e78 Merge pull request #901 from timattox/bugfix_atom_vec_dpd
USER-DPD: bugfix for AtomVecDPD::unpack_restart() and the Kokkos version
2018-05-16 16:45:35 -06:00
5a4a7cebc1 Fix performance regression in KOKKOS package 2018-05-16 16:12:05 -06:00
133f0922b3 Merge branch 'master' of https://www.github.com/lammps/lammps 2018-05-15 12:58:40 -04:00
1a88ffd5ab Updated fix_nve_manifold_rattle.cpp 2018-05-15 12:58:32 -04:00
307e471456 Merge pull request #914 from jrgissing/bond-react-restart
smooth restarts with bond/react
2018-05-14 16:16:58 -06:00