Homec4science

Merge remote-tracking branch 'lammps-ro/master' into lammps-icms

Authored by Axel Kohlmeyer <akohlmey@gmail.com> on Aug 20 2015, 13:42.

Description

Merge remote-tracking branch 'lammps-ro/master' into lammps-icms

  1. Conflicts:
  2. doc/Manual.html
  3. doc/Manual.txt
  4. doc/Section_start.txt
  5. doc/dump_h5md.html
  6. doc/dump_h5md.txt
  7. doc/package.txt
  8. src/COMPRESS/dump_atom_gz.cpp
  9. src/Makefile
  10. src/USER-H5MD/README
  11. src/pair.cpp

Event Timeline

Axel Kohlmeyer <akohlmey@gmail.com> committed rLAMMPSe5f316ecf1f8: Merge remote-tracking branch 'lammps-ro/master' into lammps-icms (authored by Axel Kohlmeyer <akohlmey@gmail.com>).Aug 20 2015, 13:42

Merged Changes

CommitAuthorDetailsCommitted
e4e52616dd89stamoor
Adding optimizations to Kokkos EAM pair style 
Aug 20 2015
494ee3b26c32stamoor
Updating Kokkos library--adding new folder 
Aug 20 2015
e2ac7b23523bstamoor
Updating Kokkos library--first deleting old folder 
Aug 20 2015
27b474293567sjplimp
git-svn-id: svn://svn.icms.temple.edu/lammps-ro/trunk@13919 f3b2605a-c512-4ea7… 
Aug 19 2015
8dae768dcf52sjplimp
git-svn-id: svn://svn.icms.temple.edu/lammps-ro/trunk@13918 f3b2605a-c512-4ea7… 
Aug 19 2015
fbaff8ec0f32sjplimp
'' 
Aug 19 2015
e3cfdfd49183sjplimp
'' 
Aug 19 2015
3e90c3eeabdbsjplimp
git-svn-id: svn://svn.icms.temple.edu/lammps-ro/trunk@13913 f3b2605a-c512-4ea7… 
Aug 19 2015
7e8fff980e4bsjplimp
'' 
Aug 19 2015
06f25e66082fsjplimp
'' 
Aug 19 2015
cd861535f0d9sjplimp
git-svn-id: svn://svn.icms.temple.edu/lammps-ro/trunk@13910 f3b2605a-c512-4ea7… 
Aug 19 2015
56d0caefcb66sjplimp
git-svn-id: svn://svn.icms.temple.edu/lammps-ro/trunk@13909 f3b2605a-c512-4ea7… 
Aug 19 2015
185e746ccb0dsjplimp
git-svn-id: svn://svn.icms.temple.edu/lammps-ro/trunk@13908 f3b2605a-c512-4ea7… 
Aug 19 2015
071ded95fcd2sjplimp
git-svn-id: svn://svn.icms.temple.edu/lammps-ro/trunk@13907 f3b2605a-c512-4ea7… 
Aug 19 2015
21f8abda248csjplimp
git-svn-id: svn://svn.icms.temple.edu/lammps-ro/trunk@13906 f3b2605a-c512-4ea7… 
Aug 19 2015
c85a42ab6d62sjplimp
git-svn-id: svn://svn.icms.temple.edu/lammps-ro/trunk@13905 f3b2605a-c512-4ea7… 
Aug 19 2015
1c3e0dbfe9e7sjplimp
git-svn-id: svn://svn.icms.temple.edu/lammps-ro/trunk@13904 f3b2605a-c512-4ea7… 
Aug 19 2015
2f55b6da36a3sjplimp
git-svn-id: svn://svn.icms.temple.edu/lammps-ro/trunk@13903 f3b2605a-c512-4ea7… 
Aug 19 2015
16eed7a05366sjplimp
git-svn-id: svn://svn.icms.temple.edu/lammps-ro/trunk@13902 f3b2605a-c512-4ea7… 
Aug 19 2015
7be9bc38a26csjplimp
git-svn-id: svn://svn.icms.temple.edu/lammps-ro/trunk@13900 f3b2605a-c512-4ea7… 
Aug 19 2015