Merge remote-tracking branch 'origin/USER-DPD_kokkos' into USER-DPD_kokkos
Description
Description
Details
Details
- Committed
Christopher Stone <chris.stone@computational-science.com> Jan 5 2017, 18:25 - Pushed
junge Oct 19 2017, 09:53 - Parents
- rLAMMPS79ed1b5258bb: Merge branch 'USER-DPD_updates' into USER-DPD_kokkos, bring over history.
rLAMMPSa4271ae8c5c2: Added a Makefile for AFRL Thunder. - Branches
- Unknown
- Tags
Merged Changes
Merged Changes
| Commit | Author | Details | Committed | |||
|---|---|---|---|---|---|---|
| 79ed1b5258bb | Tim Mattox | Merge branch 'USER-DPD_updates' into USER-DPD_kokkos, bring over history. | Jan 3 2017 | |||
| b5c7d442992d | Stan Moore | Merge branch 'USER-DPD_kokkos_updates' into USER-DPD_kokkos | Jan 3 2017 | |||
| fe3c98cdbb2b | Tim Mattox/GitHub | Merge pull request #4 from ibaned/dpd-fixes | Jan 3 2017 | |||
| 50df3da34337 | Tim Mattox/GitHub | Merge pull request #3 from ibaned/fix-dpd-energy-kokkos-pr | Jan 3 2017 | |||
| ae0e882cde4c | Stan Moore | Updating pair_multi_lucy_rx_kokkos to USER-DPD changes | Jan 3 2017 | |||
| 6d7607a6ade5 | Dan Ibanez | member function containing lambdas must be public | Jan 3 2017 | |||
| e3ebd8e7f179 | Dan Ibanez/Dan Ibanez | remove syncs that shouldn't be needed | Jan 3 2017 | |||
| dae132c77099 | Dan Ibanez/Dan Ibanez | place newline at end of file | Jan 3 2017 | |||
| e632f8597ac7 | Dan Ibanez/Dan Ibanez | fix warning about enum comparisons | Jan 3 2017 | |||
| 89795b3653ea | Dan Ibanez/Dan Ibanez | got fix_dpd_energy_kokkos to compile | Jan 3 2017 | |||
| 04e2f170a33c | Dan Ibanez/Dan Ibanez | first draft fix_dpd_energy_kokkos | Jan 3 2017 | |||
| 53e07996c692 | Dan Ibanez/Dan Ibanez | save draft of fix_dpd_energy_kokkos.cpp | Jan 3 2017 | |||
| 66cdd3a708b9 | Dan Ibanez/Dan Ibanez | draft fix_dpd_energy_kokkos.h | Jan 3 2017 | |||
| ccaa0506cb93 | Dan Ibanez/Dan Ibanez | LAMMPS_LAMBDA from ibaned/lammps@7559bc9 | Jan 3 2017 | |||
| f220b07625b7 | Stan Moore | Updating pair_exp6_rx_kokkos to USER-DPD changes | Jan 3 2017 | |||
| 2af10cb8da9b | Stan Moore | Updating fix_eos_table_rx_kokkos to USER-DPD changes | Jan 3 2017 | |||
| cc1b55e0310a | Stan Moore | Merging USER-DPD updates | Dec 23 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 | |||
| 3faa57a413d2 | Tim Mattox | USER-DPD: Several updates to *_rx files: 1) Added MY_EPSILON to handle machine… | Dec 22 2016 | |||
| fa435fb51464 | Tim Mattox | USER-DPD: remove unused variable, and convert some constants to MY_EPSILON | Dec 22 2016 | |||
| ba96fcc15a3f | Tim Mattox | USER-DPD: update reference output to reflect changes from commit eff7238 | Dec 22 2016 |