Merge branch 'master' into USER-DPD_kokkos as of 3af4b3c28 on 18 Jan. 2017 Includes a critical bugfix for using USER-DPD and MOLECULE together.
Description
Description
Details
Details
- Committed
Tim Mattox <timothy.mattox@engilitycorp.com> Jan 18 2017, 21:08 - Pushed
junge Oct 19 2017, 09:53 - Parents
- rLAMMPS2d32fa8ccb04: Fixing GPU memory issues in atom_vec_dpd_kokkos
rLAMMPS3af4b3c28c8b: Merge pull request #337 from ohenrich/user-cgdna - Branches
- Unknown
- Tags
Merged Changes
Merged Changes
| Commit | Author | Details | Committed | |||
|---|---|---|---|---|---|---|
| 3af4b3c28c8b | sjplimp/GitHub | Merge pull request #337 from ohenrich/user-cgdna | Jan 18 2017 | |||
| 7fc097058708 | sjplimp/GitHub | Merge pull request #344 from timattox/USER-DPD_zero_compute | Jan 18 2017 | |||
| 93262b52b484 | sjplimp/GitHub | Merge pull request #343 from timattox/USER-DPD_bugfix_molecule | Jan 18 2017 | |||
| 4eb08a5822c5 | Tim Mattox | USER-DPD: Skip a0*stuff computations, if a0 was set to zero in pair_coeff. This… | Jan 17 2017 | |||
| 01609f55e2b3 | Tim Mattox | USER-DPD: bugfix for a segfault when using MOLECULE and DPD together. | Jan 17 2017 | |||
| 8360e70f4ebd | Axel Kohlmeyer | update USER-CGDNA examples to follow LAMMPS style | Jan 14 2017 | |||
| b988b294133f | Axel Kohlmeyer | remove dead code | Jan 14 2017 | |||
| 5d48bfdcab05 | Axel Kohlmeyer | USER-CGDNA whitespace cleanup: expand tabs and remove trailing whitespace | Jan 14 2017 | |||
| fe8caa8a5633 | Axel Kohlmeyer | apply some LAMMPS formatting style conventions for include files | Jan 14 2017 | |||
| afaacc61739c | Axel Kohlmeyer | add USER-CGDNA package with dependencies into the build system | Jan 14 2017 | |||
| 374abea0f03f | Axel Kohlmeyer | some minor documentation integration tweaks for USER-CGDNA package | Jan 14 2017 | |||
| 96259ea2d2bd | Oliver Henrich | Added source code and documentation for USER-CGDNA | Jan 13 2017 |
