Merge branch 'master' into user-cgdna
Description
Description
Details
Details
- Committed
Oliver Henrich <o.henrich@epcc.ed.ac.uk> Feb 9 2017, 12:50 - Pushed
junge Oct 19 2017, 09:53 - Parents
- rLAMMPSed0a347fbf61: Merge branch 'master' into user-cgdna
rLAMMPS207adc3968ff: Merge pull request #373 from stanmoore1/kk_more_bugfixes - Branches
- Unknown
- Tags
Merged Changes
Merged Changes
| Commit | Author | Details | Committed | |||
|---|---|---|---|---|---|---|
| 207adc3968ff | sjplimp/GitHub | Merge pull request #373 from stanmoore1/kk_more_bugfixes | Feb 3 2017 | |||
| 84c517159d07 | sjplimp/GitHub | Merge pull request #368 from Pakketeretet2/kokkos_morse | Feb 3 2017 | |||
| 6ca377436f8b | sjplimp/GitHub | Merge pull request #366 from rbberger/kokkos_lammps_bigbig_fix | Feb 3 2017 | |||
| dc34a32602ef | sjplimp/GitHub | Merge pull request #362 from ibaned/warnings2 | Feb 3 2017 | |||
| 067119f6c642 | Stan Moore | Adding missing friend statement to pair_lj_class2_coul_cut_kokkos | Feb 2 2017 | |||
| 1834a5e46c3a | Stan Moore | Fixing more Kokkos per-atom and fdotr issues | Feb 2 2017 | |||
| 6a4918b39abe | Stan Moore | Fixing typo in pair_buck_coul_cut_kokkos | Feb 2 2017 | |||
| 5da0d393921d | Stan Moore | Fixing fdotr in pair_buck_coul_cut_kokkos | Feb 2 2017 | |||
| 6f92429602d6 | Stan Moore | Fixing per-atom ev issue | Feb 2 2017 | |||
| 38e0e4bb69ff | Stan Moore | Add missing typedef in Kokkos pair styles | Feb 2 2017 | |||
| daf9f95381c2 | Stan Moore | Fixing Kokkos per-atom e/v issue | Feb 2 2017 | |||
| 6bcec9c61d18 | Richard Berger/GitHub | Merge pull request #2 from stanmoore1/kk_tag_bugfixes | Feb 2 2017 | |||
| 0a87b7443a75 | Stefan Paquay | Updated contributing authors and docs | Feb 2 2017 | |||
| 7ee45ec5f354 | Stan Moore | Fixing tagint and imageint issues in Kokkos package | Feb 1 2017 | |||
| d4c9e2500be8 | Stefan Paquay | Ported Morse to KOKKOS | Feb 1 2017 | |||
| 6232073d3b76 | Stefan Paquay | Removed traces of pair morse/kk | Feb 1 2017 | |||
| ed59193d13f8 | Stefan Paquay | Removed traces of pair morse/kk | Feb 1 2017 | |||
| 67bed8e853de | Richard Berger/GitHub | Merge pull request #1 from akohlmey/tagint-issue | Feb 1 2017 | |||
| bcb1d94b9a12 | Axel Kohlmeyer | silence compiler warning about dead code | Feb 1 2017 | |||
| fbe30b56835c | Axel Kohlmeyer | correct issue with compiling for -DLAMMPS_BIGBIG in fix qeq/reax/kk | Feb 1 2017 | |||
| 9ef55fedf795 | Axel Kohlmeyer | Merge branch 'kokkos_lammps_bigbig_fix' of https://github.com/rbberger/lammps… | Jan 31 2017 | |||
| 997142a4c1d4 | sjplimp/GitHub | Merge pull request #364 from stanmoore1/kk_triclinic_neighlist | Jan 30 2017 | |||
| 033b07fdb79f | sjplimp/GitHub | Merge pull request #363 from ibaned/obey-datamask | Jan 30 2017 | |||
| 51a0b6b445e5 | Richard Berger | Fix data type of molecule array in npair_kokkos.h | Jan 28 2017 | |||
| 59f4a77dd509 | Stan Moore | Whitespace change to npair_kokkos | Jan 27 2017 | |||
| 579cc6d7aab5 | Stan Moore | More tweaks to npair_kokkos for triclinic | Jan 27 2017 | |||
| 5afd3e995b74 | Stan Moore | Adding support to npair_kokkos for triclinic-newton-on neighborlists | Jan 27 2017 | |||
| 2a6f5e651ce6 | Dan Ibanez | more preference of datamask over custom sync | Jan 27 2017 | |||
| 09fc8b0bd731 | Dan Ibanez | kspace & dihedral can't do their own sync/modify | Jan 27 2017 | |||
| e5d0bde78339 | Dan Ibanez | pppm_kokkos: remove useless statement | Jan 27 2017 | |||
| 9daf7fb6509e | Dan Ibanez | pppm_kokkos: don't shadow member variables | Jan 27 2017 | |||
| b5d622c6a381 | Dan Ibanez | pppm_kokkos: remove unused variables | Jan 27 2017 | |||
| 2023fa28e017 | Dan Ibanez | consistent #ifdefs for fft3d variable (2) | Jan 27 2017 | |||
| 5b29515849ad | Dan Ibanez | fft3d: use C++ loop declarations | Jan 27 2017 | |||
| 5b18421dd204 | Dan Ibanez | fft3d : remove unused variables | Jan 27 2017 | |||
| cf95ea070973 | Dan Ibanez | fft3d: only declare variables when used | Jan 27 2017 | |||
| 6a74a81da023 | Dan Ibanez | consistent #ifdefs for fft3d variable | Jan 27 2017 | |||
| f0a4ed615dc5 | Dan Ibanez | add missing KOKKOS_INLINE_FUNCTION for params | Jan 27 2017 | |||
| cfe818a17564 | Dan Ibanez | remove unused variables from fix_cmap | Jan 27 2017 |