Merge branch 'master' into USER-DPD_kokkos
Description
Description
Details
Details
- Committed
Tim Mattox <timothy.mattox@engilitycorp.com> Jan 30 2017, 18:04 - Pushed
junge Oct 19 2017, 09:53 - Parents
- rLAMMPSa1f4551ac20e: Adding missing sync/modified in atom_vec_dpd_kokkos
rLAMMPS997142a4c1d4: Merge pull request #364 from stanmoore1/kk_triclinic_neighlist - Branches
- Unknown
- Tags
Merged Changes
Merged Changes
| Commit | Author | Details | Committed | |||
|---|---|---|---|---|---|---|
| 997142a4c1d4 | sjplimp/GitHub | Merge pull request #364 from stanmoore1/kk_triclinic_neighlist | Jan 30 2017 | |||
| 033b07fdb79f | sjplimp/GitHub | Merge pull request #363 from ibaned/obey-datamask | Jan 30 2017 | |||
| 59f4a77dd509 | Stan Moore | Whitespace change to npair_kokkos | Jan 27 2017 | |||
| 579cc6d7aab5 | Stan Moore | More tweaks to npair_kokkos for triclinic | Jan 27 2017 | |||
| 5afd3e995b74 | Stan Moore | Adding support to npair_kokkos for triclinic-newton-on neighborlists | Jan 27 2017 | |||
| 2a6f5e651ce6 | Dan Ibanez | more preference of datamask over custom sync | Jan 27 2017 | |||
| 09fc8b0bd731 | Dan Ibanez | kspace & dihedral can't do their own sync/modify | Jan 27 2017 |