Homec4science

Merge branch 'master' of https://github.com/lammps/lammps into USER-DPD_kokkos

Authored by Stan Moore <stamoor@sandia.gov> on Mar 20 2017, 19:13.

Description

Merge branch 'master' of https://github.com/lammps/lammps into USER-DPD_kokkos

Event Timeline

Stan Moore <stamoor@sandia.gov> committed rLAMMPS2c93065786a1: Merge branch 'master' of https://github.com/lammps/lammps into USER-DPD_kokkos (authored by Stan Moore <stamoor@sandia.gov>).Mar 20 2017, 19:13

Merged Changes

CommitAuthorDetailsCommitted
d496c0fdfa9fsjplimp/GitHub
Merge pull request #426 from dstelter92/master 
Mar 20 2017
5c39dfd74089dstelter92
re-ran example with fixed exchanges 
Mar 20 2017
5b842f0010a7dstelter92
Teff and exchange bugfix, as per Greg Dignon to match python examples 
Mar 20 2017