Merge branch 'master' into USER-DPD_kokkos as of patch 21Feb17
Description
Description
Details
Details
- Committed
Tim Mattox <timothy.mattox@engilitycorp.com> Feb 22 2017, 17:29 - Pushed
junge Oct 19 2017, 09:53 - Parents
- rLAMMPSdc16228a602d: Merge branch 'USER-DPD_ssa_update' into USER-DPD_kokkos
rLAMMPS49e83b434800: patch 21Feb17 sync with GHub - Branches
- Unknown
- Tags
Merged Changes
Merged Changes
Commit | Author | Details | Committed | |||
---|---|---|---|---|---|---|
49e83b434800 | Steve Plimpton | patch 21Feb17 sync with GHub | Feb 22 2017 | |||
6e89ccd522f5 | sjplimp/GitHub | Merge pull request #385 from akohlmey/collected-small-bugfixes | Feb 21 2017 | |||
53f3df5bfc94 | sjplimp/GitHub | Merge pull request #384 from lammps/another_neigh_refactor | Feb 21 2017 | |||
3dbbea342a3b | Steve Plimpton | remove a debug print line | Feb 21 2017 | |||
b70c670aac56 | sjplimp/GitHub | Merge pull request #383 from stanmoore1/rshan_class2_kk | Feb 21 2017 | |||
1d17cae407ff | sjplimp/GitHub | Merge pull request #382 from timattox/master_kokkos_neigh_bugfix | Feb 21 2017 | |||
429264a12bac | sjplimp/GitHub | Merge pull request #380 from hheenen/core_shell_documentation | Feb 21 2017 | |||
d001a093455b | sjplimp/GitHub | Merge pull request #379 from ndtrung81/pppm-gpu-compute-group-group | Feb 21 2017 | |||
cb9d42da0896 | sjplimp/GitHub | Merge pull request #378 from timattox/USER-DPD_ssa_update | Feb 21 2017 | |||
7185ec92b3f0 | sjplimp/GitHub | Merge pull request #377 from stanmoore1/kokkos_update | Feb 21 2017 | |||
1cd4c48cccdb | Steve Plimpton | new SNAP potential for W | Feb 21 2017 | |||
a88136c3f50d | Axel Kohlmeyer | correct a logic bug in fix wall/gran/region | Feb 17 2017 | |||
ce20c7ffe911 | Axel Kohlmeyer | remove debug code | Feb 17 2017 | |||
4a80df3a99b8 | Steve Plimpton | more neighbor list changes, some new options | Feb 16 2017 | |||
5f93fad012d8 | Stan Moore | Add copymode protection to class2 styles | Feb 15 2017 | |||
ccaec315db31 | Stan Moore | Updating docs for Kokkos class2 | Feb 15 2017 | |||
c6c1852b3b1a | Stan Moore | Fix a few issues with Kokkos class2 files | Feb 15 2017 | |||
69a8e19dc5eb | Stan Moore | Add files from Ray Shan for Kokkos version of class2 angle, bond, etc. | Feb 15 2017 | |||
928947dcea24 | Tim Mattox | neighbor_kokkos.cpp: Don't call grow() on neighbor lists that are copies. This… | Feb 15 2017 | |||
48070011d9b7 | Axel Kohlmeyer/GitHub | update names in example, too | Feb 14 2017 | |||
0fb8dacc00f8 | Axel Kohlmeyer/GitHub | one more Finchham to Fincham change | Feb 14 2017 | |||
6b923476b96c | Hendrik Heenen | updated documentation and examples for coreshell | Feb 14 2017 | |||
20806dd86acf | Trung Nguyen | Fixed bugs with pppm/gpu when used with compute group/group | Feb 14 2017 | |||
90e5ae965d7f | Stan Moore | Add missing flags to Kokkos Makefile | Feb 13 2017 | |||
33af7ab24874 | Stan Moore | Remove merge line | Feb 13 2017 | |||
8f9b2aca06e7 | Stan Moore | Removing unused files in Kokkos lib | Feb 13 2017 | |||
383da816c221 | Stan Moore | Updating Kokkos lib | Feb 13 2017 |