Merge branch 'master' as of patch 6Jan17 into USER-DPD_kokkos
Description
Description
Details
Details
- Committed
Tim Mattox <timothy.mattox@engilitycorp.com> Jan 9 2017, 19:12 - Pushed
junge Oct 19 2017, 09:53 - Parents
- rLAMMPS49d644ec3ab4: Merge pull request #7 from ibaned/pair-dpd-energy-kokkos-warnings
rLAMMPS51fa33a407c7: patch 6Jan17 - Branches
- Unknown
- Tags
Merged Changes
Merged Changes
| Commit | Author | Details | Committed | |||
|---|---|---|---|---|---|---|
| 51fa33a407c7 | Steve Plimpton | patch 6Jan17 | Jan 6 2017 | |||
| 142770cb2a69 | Steve Plimpton | enable pppm/tip4p to work with triclinic | Jan 6 2017 | |||
| 63f202501b27 | sjplimp/GitHub | Merge pull request #324 from ibaned/pair-table-kokkos-inherit | Jan 6 2017 | |||
| 83da5d3b5d6f | sjplimp/GitHub | Merge pull request #323 from akohlmey/pppm-cg-triclinic | Jan 6 2017 | |||
| ebbf60b1120b | sjplimp/GitHub | Merge pull request #319 from andeplane/domain_bug | Jan 6 2017 | |||
| 12c4fa25e8b1 | sjplimp/GitHub | Merge pull request #318 from andeplane/initialize_pointers | Jan 6 2017 | |||
| 3ac58452de6a | sjplimp/GitHub | Merge pull request #310 from EfremBraun/master | Jan 6 2017 | |||
| 9b348d567bd6 | sjplimp/GitHub | Merge pull request #315 from Pakketeretet2/github-tutorial-update | Jan 6 2017 | |||
| 467377094aad | sjplimp/GitHub | Merge pull request #314 from stanmoore1/fix-momentum-kokkos | Jan 6 2017 | |||
| 5656e90b7882 | sjplimp/GitHub | Merge pull request #313 from stanmoore1/kokkos_bugfixes | Jan 6 2017 | |||
| 41a6a3076e17 | sjplimp/GitHub | Merge pull request #309 from giacomofiorin/colvars-2016-12-22 | Jan 6 2017 | |||
| d4e8d4738769 | sjplimp/GitHub | Merge pull request #306 from timattox/USER-DPD_updates | Jan 6 2017 | |||
| f6a819580c6b | Steve Plimpton | pair TIP4P bug fix for cutoffs >> box size | Jan 6 2017 | |||
| 6af56e686d6a | Axel Kohlmeyer | polish the introduction, some more clarifications, corrections and formatting… | Jan 6 2017 | |||
| eb1c6a225c1b | Stefan Paquay | typo fixed | Jan 6 2017 | |||
| 4d0a6d83bdcb | Stefan Paquay | Merged Axel's suggestions and updated text | Jan 6 2017 | |||
| 958722573f72 | Stefan Paquay | Merge branch 'github-tutorial-update' of https://github. | Jan 6 2017 | |||
| 9d4667097274 | Stefan Paquay | Updated text and images on reverse pull requests | Jan 6 2017 | |||
| 1a9f2df3d04a | Stefan Paquay | Updated text and images on reverse pull requests | Jan 6 2017 | |||
| 1310438c8b39 | Stefan Paquay/GitHub | Merge pull request #1 from akohlmey/pull-315 | Jan 6 2017 | |||
| 9bf771207d7f | Dan Ibanez | make PairTable::allocate() virtual | Jan 6 2017 | |||
| b9144d63325d | Dan Ibanez | Revert "move enum to pair.h" | Jan 6 2017 | |||
| 267f05e5ca0c | Dan Ibanez | protect PairTable dtor with copymode | Jan 5 2017 | |||
| aebc8ea82671 | Dan Ibanez | move enum to pair.h | Jan 5 2017 | |||
| 53a1de1d4081 | Dan Ibanez/Dan Ibanez | fix several GPU memory bugs in pair_table_kokkos | Jan 5 2017 | |||
| d059b5d3344f | Dan Ibanez/Dan Ibanez | fix crash in create_kokkos_tables | Jan 5 2017 | |||
| 7cff343680ce | Dan Ibanez | fix allocation regressions in PairTableKokkos | Jan 5 2017 | |||
| a1ac86108494 | Dan Ibanez | PairTableKokkos : public PairTable | Jan 5 2017 | |||
| 17bdb57bb469 | Dan Ibanez | try PairTableKokkos : public PairTable | Jan 5 2017 | |||
| fe14158c10b7 | Axel Kohlmeyer | some formatting updates and text rewrites in the "do not use git add -a" section | Jan 4 2017 | |||
| 0bcbcca14043 | Stefan Paquay | Highlighted the assignee, maintainer changes, and mentioned LAMMPS collaborator | Jan 4 2017 | |||
| 4cfe122ac692 | Dan Ibanez/Stan Moore | fix warning about enum comparisons | Jan 4 2017 | |||
| b46629ee39f2 | Stan Moore/GitHub | Merge pull request #5 from ibaned/kokkos-fixes | Jan 4 2017 | |||
| 42bbeb3f16cf | Anders Hafreager | NULLing pointers after delete | Jan 4 2017 | |||
| 933b288ce934 | Stefan Paquay | Added explaination for assignee, changes pushed by others and collaborator. | Jan 4 2017 | |||
| a7c5905ca4ec | Dan Ibanez | prevent implicit dereference of s_CTEMP | Jan 3 2017 | |||
| 37d5567f6d8b | Anders Hafreager | Fixed bug in lamda_box_corners function | Jan 3 2017 | |||
| b10d0c17eca3 | Anders Hafreager | Initializing pointers in neighbor.cpp | Jan 3 2017 | |||
| 4f45d39ac72b | Richard Berger | Add warning formatting | Jan 3 2017 | |||
| 7d057d4c8368 | Axel Kohlmeyer | make it more explicit, that master needs to be updated and feature branches… | Jan 2 2017 | |||
| 4f096dbad5cd | Stefan Paquay | Updated some inconsistent text. | Jan 2 2017 | |||
| 18b12efc9f6f | Stefan Paquay | Small changes to tutorial text. | Jan 2 2017 | |||
| 2c7fea1e0d01 | Stefan Paquay | Second update round to text and images, a third will follow after succesful… | Jan 2 2017 | |||
| 4d98bbdfa502 | Stefan Paquay | Almost done with the tutorial now | Jan 2 2017 | |||
| 391ab761a40d | Stefan Paquay | Finally updated the github tutorial. | Jan 2 2017 | |||
| b0ebd3ef4e17 | Efrem Braun/GitHub | Merge pull request #1 from akohlmey/pull-310 | Dec 28 2016 | |||
| 94c4f8fe5f13 | Axel Kohlmeyer | add authorship attribution | Dec 28 2016 | |||
| aa146e9b383c | Efrem Braun | Moved fix_nvk to USER-MISC, updated documentation to reflect move | Dec 28 2016 | |||
| eca9539f84f7 | Stan Moore/Stan Gerald Moore (stamoor) | Disallowing full neighborlist for pair_tersoff_kokkos styles until a bugfix is… | Dec 28 2016 | |||
| 27172c4a553b | Stan Moore/Stan Gerald Moore (stamoor) | Fixing Kokkos bug when many atom types | Dec 28 2016 |
