Merge branch 'USER-DPD_kokkos' into USER-DPD_GBhacks
Description
Description
Details
Details
- Committed
Stan Moore <stamoor@sandia.gov> Mar 20 2017, 19:16 - Pushed
junge Oct 19 2017, 09:53 - Parents
- rLAMMPS2c93065786a1: Merge branch 'master' of https://github.com/lammps/lammps into USER-DPD_kokkos
rLAMMPS20de98e898f0: Merge branch 'USER-DPD_kokkos' into USER-DPD_GBhacks, bring in bugfix - Branches
- Unknown
- Tags
Merged Changes
Merged Changes
| Commit | Author | Details | Committed | |||
|---|---|---|---|---|---|---|
| 2c93065786a1 | Stan Moore | Merge branch 'master' of https://github.com/lammps/lammps into USER-DPD_kokkos | Mar 20 2017 | |||
| d496c0fdfa9f | sjplimp/GitHub | Merge pull request #426 from dstelter92/master | Mar 20 2017 | |||
| 5c39dfd74089 | dstelter92 | re-ran example with fixed exchanges | Mar 20 2017 | |||
| 5b842f0010a7 | dstelter92 | Teff and exchange bugfix, as per Greg Dignon to match python examples | Mar 20 2017 |