Homec4science

Merge branch 'master' into USER-DPD_kokkos as of patch 21Feb17

Authored by Tim Mattox <timothy.mattox@engilitycorp.com> on Feb 22 2017, 17:29.

Description

Merge branch 'master' into USER-DPD_kokkos as of patch 21Feb17

Event Timeline

Tim Mattox <timothy.mattox@engilitycorp.com> committed rLAMMPS83988a1026f4: Merge branch 'master' into USER-DPD_kokkos as of patch 21Feb17 (authored by Tim Mattox <timothy.mattox@engilitycorp.com>).Feb 22 2017, 17:29

Merged Changes

CommitAuthorDetailsCommitted
49e83b434800Steve Plimpton
patch 21Feb17 sync with GHub 
Feb 22 2017
6e89ccd522f5sjplimp/GitHub
Merge pull request #385 from akohlmey/collected-small-bugfixes 
Feb 21 2017
53f3df5bfc94sjplimp/GitHub
Merge pull request #384 from lammps/another_neigh_refactor 
Feb 21 2017
3dbbea342a3bSteve Plimpton
remove a debug print line 
Feb 21 2017
b70c670aac56sjplimp/GitHub
Merge pull request #383 from stanmoore1/rshan_class2_kk 
Feb 21 2017
1d17cae407ffsjplimp/GitHub
Merge pull request #382 from timattox/master_kokkos_neigh_bugfix 
Feb 21 2017
429264a12bacsjplimp/GitHub
Merge pull request #380 from hheenen/core_shell_documentation 
Feb 21 2017
d001a093455bsjplimp/GitHub
Merge pull request #379 from ndtrung81/pppm-gpu-compute-group-group 
Feb 21 2017
cb9d42da0896sjplimp/GitHub
Merge pull request #378 from timattox/USER-DPD_ssa_update 
Feb 21 2017
7185ec92b3f0sjplimp/GitHub
Merge pull request #377 from stanmoore1/kokkos_update 
Feb 21 2017
1cd4c48cccdbSteve Plimpton
new SNAP potential for W 
Feb 21 2017
a88136c3f50dAxel Kohlmeyer
correct a logic bug in fix wall/gran/region 
Feb 17 2017
ce20c7ffe911Axel Kohlmeyer
remove debug code 
Feb 17 2017
4a80df3a99b8Steve Plimpton
more neighbor list changes, some new options 
Feb 16 2017
5f93fad012d8Stan Moore
Add copymode protection to class2 styles 
Feb 15 2017
ccaec315db31Stan Moore
Updating docs for Kokkos class2 
Feb 15 2017
c6c1852b3b1aStan Moore
Fix a few issues with Kokkos class2 files 
Feb 15 2017
69a8e19dc5ebStan Moore
Add files from Ray Shan for Kokkos version of class2 angle, bond, etc. 
Feb 15 2017
928947dcea24Tim Mattox
neighbor_kokkos.cpp: Don't call grow() on neighbor lists that are copies. This… 
Feb 15 2017
48070011d9b7Axel Kohlmeyer/GitHub
update names in example, too 
Feb 14 2017
0fb8dacc00f8Axel Kohlmeyer/GitHub
one more Finchham to Fincham change 
Feb 14 2017
6b923476b96cHendrik Heenen
updated documentation and examples for coreshell 
Feb 14 2017
20806dd86acfTrung Nguyen
Fixed bugs with pppm/gpu when used with compute group/group 
Feb 14 2017
90e5ae965d7fStan Moore
Add missing flags to Kokkos Makefile 
Feb 13 2017
33af7ab24874Stan Moore
Remove merge line 
Feb 13 2017
8f9b2aca06e7Stan Moore
Removing unused files in Kokkos lib 
Feb 13 2017
383da816c221Stan Moore
Updating Kokkos lib 
Feb 13 2017