Merge branch 'master' into USER-DPD_kokkos: as of 17Dec16 patch
Description
Description
Details
Details
- Committed
Tim Mattox <timothy.mattox@engilitycorp.com> Dec 16 2016, 21:02 - Pushed
junge Oct 19 2017, 09:53 - Parents
- rLAMMPScfa61b98aec5: Fixing runtime issues in fix_eos_table_rx_kokkos
rLAMMPS81a2db8a0cbc: 17Dec16 patch - Branches
- Unknown
- Tags
Merged Changes
Merged Changes
| Commit | Author | Details | Committed | |||
|---|---|---|---|---|---|---|
| 81a2db8a0cbc | Steve Plimpton | 17Dec16 patch | Dec 16 2016 | |||
| 0a176841e7cd | Steve Plimpton | extra python_wrapper change needed for last patch | Dec 16 2016 | |||
| 3027ac92507e | Steve Plimpton | patch 16Dec16 | Dec 16 2016 | |||
| fc54ab5cea21 | sjplimp/GitHub | Merge pull request #301 from akohlmey/corrections-and-bugfixes | Dec 16 2016 | |||
| e364b80724ae | Steve Plimpton | added length keyword to python command | Dec 16 2016 | |||
| 830c9e866139 | Axel Kohlmeyer | Merge branch 'USER-DPD_internal_energy' of https://github. | Dec 16 2016 | |||
| 4907b29ad223 | Axel Kohlmeyer | Merge branch 'USER-DPD_bugfixes' of https://github.com/timattox/lammps_USER-DPD… | Dec 16 2016 | |||
| eff7238ff224 | Tim Mattox | USER-DPD: fix_eos*: partition all internal energy into the uMech term only This… | Dec 16 2016 | |||
| 126fb22e9355 | Tim Mattox | USER-DPD: Fix #define typo in pair_multi_lucy.h and pair_multi_lucy_rx.h | Dec 16 2016 | |||
| 0a90492c4447 | Tim Mattox | USER-DPD: Update the header files to properly document all error statements… | Dec 15 2016 | |||
| fed629c23e56 | Tim Mattox | USER-DPD: Bugfix for fix_rx and fix_eos_table_rx to handle restart files. Patch… | Dec 15 2016 | |||
| 925481c3f40d | Tim Mattox | USER-DPD: Fix hard-wall force interaction bug, and ensure fraction is >= 0… | Dec 15 2016 | |||
| da2ad5b6e0bd | Axel Kohlmeyer | update FixIntel code for new neighbor list code | Dec 14 2016 | |||
| bfcab72268bf | Axel Kohlmeyer | restore change to make -DLAMMPS_MEMALIGN=64 default when USER-INTEL package is… | Dec 14 2016 |