Merge remote-tracking branch 'thunder/USER-DPD_GBhacks' into USER-DPD_GBhacks_cps
Description
Description
Details
Details
- Committed
Christopher P. Stone <chris.stone@computational-science.com> Mar 17 2017, 15:11 - Pushed
junge Oct 19 2017, 09:53 - Parents
- rLAMMPS4a7bc115cbbd: Merge branch 'USER-DPD_kokkos' into USER-DPD_GBhacks, bring in MPI deadlock fix
rLAMMPSec192a95cb14: Cleaned up the non-kokkos part of KOKKOS/pair_exp6_rx_kokkos.cpp - Branches
- Unknown
- Tags
Merged Changes
Merged Changes
| Commit | Author | Details | Committed | |||
|---|---|---|---|---|---|---|
| 4a7bc115cbbd | Tim Mattox | Merge branch 'USER-DPD_kokkos' into USER-DPD_GBhacks, bring in MPI deadlock fix | Mar 17 2017 | |||
| 5ea096d08cdc | Tim Mattox | Merge branch 'master_bugfix_irregular' into USER-DPD_kokkos | Mar 17 2017 | |||
| 8e75616c144d | Tim Mattox | In irregular.cpp use simpler and slightly faster MPI_Reduce_scatter_block() | Mar 17 2017 | |||
| 411c069ba66f | Tim Mattox | BUGFIX: Prevent possible deadlock in Irregular::create_atom and create_data | Mar 17 2017 |