Merge branch 'lammps-icms' of https://github.com/lammps/lammps into add-user-manifold
Description
Description
Details
Details
- Committed
Stefan Paquay <stefanpaquay@gmail.com> Mar 3 2016, 17:36 - Pushed
junge Oct 6 2016, 16:49 - Parents
- rLAMMPS739825134d1d: removed some unnecessary files before merge.
rLAMMPS943cc0ac196c: update Eigen template library to version 3.2.8 - Branches
- Unknown
- Tags
Merged Changes
Merged Changes
| Commit | Author | Details | Committed | |||
|---|---|---|---|---|---|---|
| 943cc0ac196c | Axel Kohlmeyer | update Eigen template library to version 3.2.8 | Mar 2 2016 | |||
| bc900935fdaf | Axel Kohlmeyer | Merge branch 'merge-pull-33' into lammps-icms | Mar 2 2016 | |||
| ffd213d9fd8d | Axel Kohlmeyer | Merge branch 'master' of https://github.com/crtrott/lammps into merge-pull-33 | Mar 2 2016 | |||
| 375c1cc72144 | Axel Kohlmeyer | remove stray "same" from morse pair style docs | Mar 2 2016 | |||
| 6e327ee1b361 | Axel Kohlmeyer | Merge remote-tracking branch 'lammps-ro/master' into lammps-icms | Mar 2 2016 | |||
| 569736630afc | crtrott | Revert changes in benchmark examples | Mar 2 2016 | |||
| 9807c6fb5a4b | crtrott | Kokkos: fix missing namespace start in LJ2 class2 pair styles | Mar 2 2016 | |||
| ca39c079865e | crtrott | Kokkos: fix verlet_kokkos if no pair style is used | Mar 2 2016 | |||
| b01892757ad1 | crtrott | Merge remote-tracking branch 'main/master' | Mar 1 2016 | |||
| 5931b2f7cdf8 | crtrott | Kokkos: remove print statement | Mar 1 2016 | |||
| 35c29a061041 | crtrott | Kokkos: make lammps instantiate a kokkos atom_vec style if kokkos on | Mar 1 2016 | |||
| 29de3e2403be | crtrott | Kokkos: improper_harmonic: make reallocation check size first | Mar 1 2016 | |||
| e3fa5bfd4f87 | crtrott | KOKKOS: fixing an issue in atom_vect styles with missing modify statements | Mar 1 2016 | |||
| 5ee04e33b1d5 | Axel Kohlmeyer | Merge remote-tracking branch 'lammps-ro/master' into lammps-icms | Mar 1 2016 | |||
| ceb9f09e29d3 | crtrott | Kokkos: fix some bonded interactions to work with /kk/host | Mar 1 2016 | |||
| f37a13e6b0f9 | Axel Kohlmeyer | need to manually touch neighbor.cpp for packages providing custom neighbor… | Feb 29 2016 | |||
| dd11c888af34 | Axel Kohlmeyer | remove redundant entry | Feb 29 2016 | |||
| d6cfa07d3a96 | Axel Kohlmeyer | update .gitignore for new packages and styles | Feb 28 2016 | |||
| 0568dd760f40 | Axel Kohlmeyer | update machine g++ for new dependency generation | Feb 28 2016 | |||
| 9f8d3e998851 | Axel Kohlmeyer | properly support mode SUMSQ and AVESQ in compute reduce/region | Feb 28 2016 | |||
| 794cc332ac4a | Axel Kohlmeyer | correct bug in compute reduce/region reported by "maksim" on lammps-users | Feb 28 2016 | |||
| 28c510d67bea | Axel Kohlmeyer | some more colvars updates to silence compiler warnings | Feb 28 2016 | |||
| ebd41bc07fc2 | Axel Kohlmeyer | merge colvars updates as of feb 28th | Feb 28 2016 | |||
| 573256ad60de | Axel Kohlmeyer | Merge branch 'lammps-icms' of bitbucket.org:akohlmey/lammps-icms into lammps… | Feb 28 2016 | |||
| a1dc8e8a0c1d | Axel Kohlmeyer | Merge branch 'lammps-icms' of bitbucket.org:akohlmey/lammps-icms into lammps… | Feb 28 2016 | |||
| 56517813968d | Axel Kohlmeyer | convert machines "mpi" and "serial" to new dependency handling | Feb 28 2016 | |||
| cb3d9a80d885 | Axel Kohlmeyer | always delete and recreate .depend from master makefile. | Feb 28 2016 | |||
| 33a3c821d123 | Axel Kohlmeyer | Integrated pair_style morse/smooth/linear from stefan paquay in USER-MISC | Feb 28 2016 | |||
| 53bf9f7da8de | Stefan Paquay/Axel Kohlmeyer | Added equation and description for pair_style morse/smooth/linear | Feb 28 2016 | |||
| c22d699f742d | Stefan Paquay/Axel Kohlmeyer | Added a linearly smoothed variant for the Morse potential. | Feb 28 2016 | |||
| 16431222dab3 | Axel Kohlmeyer | alternate approach. not yet 100% working. | Feb 27 2016 | |||
| 43fdef3c32ed | Axel Kohlmeyer | safer trigger of dependency updates | Feb 27 2016 | |||
| 73037235b4de | Axel Kohlmeyer | use mkdep.exe for faster and cleaner dependency handling | Feb 27 2016 | |||
| 41d65eedf498 | Axel Kohlmeyer | adapt mkdep.c for building LAMMPS | Feb 27 2016 | |||
| cffdf5b3ae4c | Axel Kohlmeyer | remove incorrect include flag statement | Feb 27 2016 | |||
| ee999707937c | Axel Kohlmeyer | import mkdep.c from the linux 2.4 kernel source | Feb 27 2016 | |||
| 7b2414abfb09 | Axel Kohlmeyer | Merge remote branch 'lammps-ro/master' into lammps-icms | Feb 27 2016 | |||
| 216f543e2e7c | crtrott | Kokkos: reenable support for all neighbor styles | Feb 26 2016 | |||
| 4b755fb93b07 | crtrott | Kokkos: support overlapping host device calculation commit 9 | Feb 26 2016 | |||
| ba6abbd9d3fc | crtrott | Kokkos: support overlapping host device calculation commit 8 | Feb 26 2016 | |||
| 35dbc63af200 | crtrott | Kokkos: support overlapping host device calculation commit 7 | Feb 26 2016 | |||
| c20d2dccdb0b | Axel Kohlmeyer | update lammps.book for newly added files | Feb 26 2016 | |||
| 2702d94cfd5e | Axel Kohlmeyer | Merge remote-tracking branch 'lammps-ro/master' into lammps-icms | Feb 26 2016 | |||
| 9df1b66d1e14 | crtrott | Kokkos: support overlapping host device calculation commit 6 | Feb 25 2016 | |||
| 8aecc2baed13 | crtrott | Kokkos: support overlapping host device calculation commit 5 | Feb 25 2016 | |||
| a9452c807f85 | crtrott | Kokkos: support overlapping host device calculation commit 4 | Feb 25 2016 | |||
| f3716023e16a | crtrott | Kokkos: support overlapping host device calculation commit 3 | Feb 25 2016 | |||
| 2b2c4755c84e | crtrott | Kokkos: support overlapping host device calculation commit 1 | Feb 25 2016 | |||
| 46be84ff1fa5 | crtrott | Kokkos: support overlapping host device calculation commit 1 | Feb 25 2016 | |||
| 2aebaf5d45e7 | crtrott | KOKKOS: fixing clang compiler issues | Feb 25 2016 |