Homec4science

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

Authored by Tim Mattox <timothy.mattox@engilitycorp.com> on Dec 21 2016, 22:50.

Description

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

Details

Event Timeline

Tim Mattox <timothy.mattox@engilitycorp.com> committed rLAMMPS26c21da45b1e: Merge branch 'master' into USER-DPD_kokkos as of 21Dec16 patch (authored by Tim Mattox <timothy.mattox@engilitycorp.com>).Dec 21 2016, 22:50

Merged Changes

CommitAuthorDetailsCommitted
62dea1bb6345Steve Plimpton
21Dec16 patch 
Dec 21 2016
800ff4341384sjplimp/GitHub
Merge pull request #304 from timattox/USER-DPD_whitespace 
Dec 21 2016
9161bd98bf09Steve Plimpton
fixed bug with pair hybrid/overaly and manybody potentials finding the right… 
Dec 21 2016