Merge branch 'USER-DPD_GBhacks' into USER-DPD_GBhacks_cps
Description
Description
Details
Details
- Committed
Tim Mattox <timothy.mattox@engilitycorp.com> Mar 20 2017, 19:37 - Pushed
junge Oct 19 2017, 09:53 - Parents
- rLAMMPSce94d7a4dfac: Merge branch 'USER-DPD_kokkos' into USER-DPD_GBhacks
rLAMMPS75670244bb5d: Added ONE-TYPE template capability to vectorized_operator and cleaned up timers. - Branches
- Unknown
- Tags
Merged Changes
Merged Changes
| Commit | Author | Details | Committed | |||
|---|---|---|---|---|---|---|
| ce94d7a4dfac | Stan Moore | Merge branch 'USER-DPD_kokkos' into USER-DPD_GBhacks | Mar 20 2017 | |||
| 2c93065786a1 | Stan Moore | Merge branch 'master' of https://github.com/lammps/lammps into USER-DPD_kokkos | Mar 20 2017 | |||
| d496c0fdfa9f | sjplimp/GitHub | Merge pull request #426 from dstelter92/master | Mar 20 2017 | |||
| 5c39dfd74089 | dstelter92 | re-ran example with fixed exchanges | Mar 20 2017 | |||
| 5b842f0010a7 | dstelter92 | Teff and exchange bugfix, as per Greg Dignon to match python examples | Mar 20 2017 | |||
| 20de98e898f0 | Tim Mattox | Merge branch 'USER-DPD_kokkos' into USER-DPD_GBhacks, bring in bugfix | Mar 20 2017 | |||
| a68f3a93e53a | Tim Mattox | USER-DPD Kokkos: bugfix, add a misisng line of code in pair_exp6_rx_kokkos.cpp | Mar 20 2017 | |||
| b3c46b7269db | Tim Mattox | Merge branch 'USER-DPD_kokkos' into USER-DPD_GBhacks, bugfix for bonds | Mar 18 2017 | |||
| fff43a4604a2 | Tim Mattox | USER-DPD Kokkos: bugfix for npair_ssa_kokkos.cpp corresponding to 0cd3f0cd | Mar 18 2017 | |||
| 0cd3f0cd63f2 | Tim Mattox | USER-DPD: bugfix for npair_half_bin_newton_ssa when bonds are involved. Only… | Mar 18 2017 | |||
| eb1a4d11ddf4 | Tim Mattox | Merge branch 'USER-DPD_kokkos' into USER-DPD_GBhacks, as of patch 17March17 | Mar 17 2017 | |||
| 1c749d5cf590 | Stan Moore | Merge branch 'master' of https://github.com/lammps/lammps into USER-DPD_kokkos | Mar 17 2017 | |||
| 4a90bca7a3b4 | Steve Plimpton | patch 17Mar17 | Mar 17 2017 | |||
| 9f35b764f8cc | sjplimp/GitHub | Merge pull request #424 from timattox/dpd_restart_fix | Mar 17 2017 | |||
| 7ca5dce2f56c | sjplimp/GitHub | Merge pull request #423 from timattox/master_bugfix_irregular | Mar 17 2017 | |||
| fcc3b3bd365d | sjplimp/GitHub | Merge pull request #421 from akohlmey/memory-output | Mar 17 2017 | |||
| 53a3877c3d3e | sjplimp/GitHub | Merge pull request #420 from rbberger/doc_anchor_check | Mar 17 2017 | |||
| a936b7b2ab27 | sjplimp/GitHub | Merge pull request #419 from rbberger/python_fixes | Mar 17 2017 | |||
| a91b851f3d40 | sjplimp/GitHub | Merge pull request #416 from lukin17/filter_corotate | Mar 17 2017 | |||
| d31c591b60f7 | Stan Moore | Remove unneeded restart_peratom flags | Mar 17 2017 | |||
| ae5ebf600189 | Axel Kohlmeyer | add support for MPI_Request_free() to MPI STUBS library | Mar 17 2017 | |||
| 7fb741d53da8 | Axel Kohlmeyer | Revert "In irregular.cpp use simpler and slightly faster… | Mar 17 2017 | |||
| ac82d041cc44 | Axel Kohlmeyer | ignore package pair style | Mar 17 2017 | |||
| 621d7d5ce0f2 | Richard Berger | Correct off-by-one error in line number reported | Mar 17 2017 | |||
| 1bb9c7da42e5 | Richard Berger | Remove some duplicate anchors in documentation | Mar 17 2017 | |||
| f893104b18d1 | Richard Berger | Add anchor_check to doc Makefile | Mar 17 2017 | |||
| efb2a942e046 | Richard Berger | Add utility to detect duplicate anchors in documentation files | Mar 17 2017 | |||
| 070ce33a13df | Axel Kohlmeyer | improve memory usage reporting in info and output class | Mar 16 2017 | |||
| f604f86cfcd4 | Axel Kohlmeyer | add fix filter/corotate to some administrative files | Mar 16 2017 | |||
| bed288339e74 | Axel Kohlmeyer | simplify and shorten examples for fix filter/corotate and combine into a single… | Mar 16 2017 | |||
| 1995f434f3d3 | Axel Kohlmeyer | fix some more code formatting issues, add newline at EOF | Mar 16 2017 | |||
| db0281b4df0b | Axel Kohlmeyer | Merge branch 'filter_corotate' of https://github.com/lukin17/lammps into pull… | Mar 16 2017 | |||
| 2f5e711acd82 | lukin17 | Merge remote-tracking branch 'upstream/master' into filter_corotate | Mar 16 2017 | |||
| bdb7669e2742 | lukin17 | Fixed coding style. | Mar 16 2017 | |||
| cda821389250 | Richard Berger | Added Python matplotlib plot example | Mar 16 2017 | |||
| ef940d226c33 | Richard Berger | Improve Python 3 compatibility of pizza tools and simplify read_snapshot code | Mar 16 2017 | |||
| 36da9223ec43 | Richard Berger | Fix dump cfg in vizplotgui_atomeye.py example | Mar 16 2017 | |||
| eb29ef32b1b9 | Richard Berger | Fix space/tab error in pizza/gl.py | Mar 16 2017 | |||
| 29550d472d23 | Richard Berger | Fix dump cfg in viz_atomeye.py example | Mar 16 2017 | |||
| 79cae51156ad | Richard Berger | Document property 'uses_exceptions' of Python interface | Mar 16 2017 | |||
| a210867025e1 | Richard Berger | Fixes lammps_create_atoms library function and its Python interface variant | Mar 16 2017 | |||
| 0262a54ecfeb | Richard Berger | Fix Python 3 compatibility by encoding strings passed as c_char_p | Mar 16 2017 | |||
| 0d8f74f0c52e | Axel Kohlmeyer | Merge branch 'filter_corotate' of https://github.com/lukin17/lammps into pull… | Mar 15 2017 | |||
| c3ce3747e049 | lukin17 | Added fix filter/corotate. | Mar 15 2017 |