Homec4science

Merge branch 'lammps-icms' of bitbucket.org:akohlmey/lammps-icms into lammps…

Authored by Axel Kohlmeyer <akohlmey@gmail.com> on Apr 4 2014, 12:16.

Description

Merge branch 'lammps-icms' of bitbucket.org:akohlmey/lammps-icms into lammps-icms

Event Timeline

Axel Kohlmeyer <akohlmey@gmail.com> committed rLAMMPS5021d94bc4fe: Merge branch 'lammps-icms' of bitbucket.org:akohlmey/lammps-icms into lammps… (authored by Axel Kohlmeyer <akohlmey@gmail.com>).Apr 4 2014, 12:16

Merged Changes

CommitAuthorDetailsCommitted
c3d4c196d6b6Axel Kohlmeyer
import simpler solution for the bond/create issue from steve 
Apr 3 2014
34389413124eAxel Kohlmeyer
update comment 
Apr 2 2014
7dacdb7490a1Axel Kohlmeyer
solve the problem with multiple created bonds for newton_bond off 
Apr 2 2014
2b66cf7e4bb8Axel Kohlmeyer
fully re-instate pre-kokkos patch logic 
Apr 2 2014
56188302835bAxel Kohlmeyer
Merge remote branch 'lammps-ro/master' into lammps-icms 
Apr 2 2014
b46de6ef1dbfAxel Kohlmeyer
fix bugs introduced when maxtouch was made dynamic 
Apr 2 2014
85e1f84e82b7sjplimp
git-svn-id: svn://svn.icms.temple.edu/lammps-ro/trunk@11680 f3b2605a-c512-4ea7… 
Apr 2 2014
1a47555d881csjplimp
git-svn-id: svn://svn.icms.temple.edu/lammps-ro/trunk@11679 f3b2605a-c512-4ea7… 
Apr 2 2014
56ace5649945sjplimp
git-svn-id: svn://svn.icms.temple.edu/lammps-ro/trunk@11678 f3b2605a-c512-4ea7… 
Apr 2 2014
fb0ae8629bd8sjplimp
git-svn-id: svn://svn.icms.temple.edu/lammps-ro/trunk@11677 f3b2605a-c512-4ea7… 
Apr 2 2014
bd537e077e92sjplimp
git-svn-id: svn://svn.icms.temple.edu/lammps-ro/trunk@11676 f3b2605a-c512-4ea7… 
Apr 2 2014
4046e95b0da9sjplimp
git-svn-id: svn://svn.icms.temple.edu/lammps-ro/trunk@11673 f3b2605a-c512-4ea7… 
Apr 1 2014
29c0d8be3d18sjplimp
git-svn-id: svn://svn.icms.temple.edu/lammps-ro/trunk@11672 f3b2605a-c512-4ea7… 
Apr 1 2014