Merge branch 'master' into github-tutorial-update
Description
Description
Details
Details
- Committed
Stefan Paquay <stefanpaquay@gmail.com> Jan 9 2017, 14:38 - Pushed
junge Oct 19 2017, 09:53 - Parents
- rLAMMPSccd09e39676e: Updated images of succesful merge.
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 | |||
| 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 | |||
| 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 | |||
| 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 | |||
| 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 | |||
| 4f195254af35 | Stan Moore/Stan Gerald Moore (stamoor) | Fixing bug with Kokkos and reading restart files | Dec 28 2016 | |||
| 9a0007a13f43 | Dan Ibanez/Stan Gerald Moore (stamoor) | rename region_block_kokkos inside() | Dec 28 2016 | |||
| 994f36bc6f8b | Dan Ibanez/Stan Gerald Moore (stamoor) | silence "implicit dereference" warning | Dec 28 2016 | |||
| b3557bfbf50f | Dan Ibanez/Stan Gerald Moore (stamoor) | add missing return in comm_tiled_kokkos | Dec 28 2016 | |||
| 371df8ea72d6 | Dan Ibanez/Stan Gerald Moore (stamoor) | repair sync bugs in fix_momentum_kokkos | Dec 28 2016 | |||
| 06ae2804f6c2 | Dan Ibanez/Stan Gerald Moore (stamoor) | ensure velocity is marked as modified before syncing | Dec 28 2016 | |||
| 68814d4fc818 | Efrem Braun | Made documentation changes to fix nvk | Dec 28 2016 | |||
| 616ca1de0345 | Efrem Braun | Fix nvk implemented. | Dec 28 2016 | |||
| b0263e87bbaa | Giacomo Fiorin | Fix missing force with extended-Lagrangian mass | Dec 27 2016 | |||
| 925f42727f32 | Giacomo Fiorin | Fix typo | Dec 27 2016 | |||
| f553e230dbcb | Giacomo Fiorin | Update Colvars library to version 2016-12-22 | Dec 27 2016 | |||
| 6ab716164b43 | Giacomo Fiorin | Fix seg fault for gyration collective variable | Dec 27 2016 | |||
| 7a45c72b9735 | Giacomo Fiorin | Allow extended Lagrangian on non-scalar collective variables | Dec 27 2016 | |||
| 634eb357d2a7 | Axel Kohlmeyer | synchronize pppm/cg with pppm and remove block on triclinic | Dec 24 2016 | |||
| a1036f2d74be | Tim Mattox | USER-DPD: bugfix for new PairExp6rx::polynomialScaling() function. | Dec 23 2016 | |||
| c301d70333a9 | Tim Mattox | USER-DPD: update example input and output (see commits 3faa57 and eff7238) | Dec 22 2016 | |||
| 781daad2a02d | Tim Mattox | USER-DPD: update documentation for changes in commit 3faa57 | Dec 22 2016 |