Merge branch 'master' of https://github.com/lammps/lammps into USER-DPD_kokkos
Description
Description
Details
Details
- Committed
Stan Moore <stamoor@sandia.gov> Mar 15 2017, 22:59 - Pushed
junge Oct 19 2017, 09:53 - Parents
- rLAMMPSbd7f4143e292: Merge pull request #18 from ibaned/pair-table-rx-kokkos-slow
rLAMMPS3a2da51a8210: Merge pull request #413 from ohenrich/user-cgdna - Branches
- Unknown
- Tags
Merged Changes
Merged Changes
| Commit | Author | Details | Committed | |||
|---|---|---|---|---|---|---|
| 3a2da51a8210 | sjplimp/GitHub | Merge pull request #413 from ohenrich/user-cgdna | Mar 15 2017 | |||
| b1c59126f750 | sjplimp/GitHub | Merge pull request #415 from stanmoore1/kk_qeq | Mar 15 2017 | |||
| 4c77838514d1 | sjplimp/GitHub | Merge pull request #414 from sstrong99/flow-gauss-doc-addition | Mar 15 2017 | |||
| f9468f46f577 | sjplimp/GitHub | Merge pull request #412 from timattox/master_typofix | Mar 15 2017 | |||
| fdc390ad0548 | Stan Moore | Tweaking docs for Kokkos package | Mar 14 2017 | |||
| 580f6b567b12 | Stan Moore | Add neigh/qeq option to Kokkos | Mar 14 2017 | |||
| 27b1c33a1680 | Steven Strong | updated the NEMD discussion in the how-to documentation about flow/gauss | Mar 14 2017 | |||
| 7a75cd111c3d | Oliver Henrich | Minor updates in documentation and setup tool, merge before upgrade to oxDNA2 | Mar 14 2017 | |||
| 23b828793333 | Oliver Henrich | Updated documentation and simple setup tool | Mar 14 2017 | |||
| 4cfe623bc17d | Tim Mattox | Correct a typo in the fix_halt.txt documentation. | Mar 11 2017 | |||
| 3626496c7c6a | Oliver Henrich | Corrected comment in 3' to 5' directionality check | Feb 22 2017 | |||
| 458b6749e7b6 | Oliver Henrich | Corrected comment in 3' to 5' directionality check. | Feb 22 2017 | |||
| 0efd20948050 | Oliver Henrich | Merge branch 'master' into user-cgdna | Feb 9 2017 | |||
| ed0a347fbf61 | Oliver Henrich | Merge branch 'master' into user-cgdna | Jan 30 2017 | |||
| 149f37e764dc | Oliver Henrich | Corrected reference to Fig.1 | Jan 26 2017 |