Merge branch 'master' into USER-DPD_kokkos
Description
Description
Details
Details
- Committed
Stan Moore <stamoor@sandia.gov> Aug 22 2017, 21:50 - Pushed
junge Oct 19 2017, 09:53 - Parents
- rLAMMPS4041db8d1a74: Merge branch 'master' into USER-DPD_kokkos as of patch 10Aug17
rLAMMPSb11fe2eddb93: Merge pull request #573 from junghans/cmake - Branches
- Unknown
- Tags
Merged Changes
Merged Changes
Commit | Author | Details | Committed | |||
---|---|---|---|---|---|---|
b11fe2eddb93 | Steve Plimpton/GitHub | Merge pull request #573 from junghans/cmake | Aug 18 2017 | |||
7ddcb6812b44 | Steve Plimpton | patch 17Aug17 | Aug 18 2017 | |||
76cd61350d4c | Steve Plimpton/GitHub | Merge pull request #613 from akohlmey/collected-small-changes | Aug 17 2017 | |||
fa3c0c61d6a8 | Steve Plimpton/GitHub | Merge pull request #618 from lammps/intel | Aug 17 2017 | |||
c46d5ff422c2 | Steve Plimpton/GitHub | Merge pull request #612 from giacomofiorin/colvars-update-2017-08-10 | Aug 17 2017 | |||
dd67989c7675 | Steve Plimpton/GitHub | Merge pull request #601 from stanmoore1/kokkos_update | Aug 17 2017 | |||
00aafef1a851 | Steve Plimpton/GitHub | Merge pull request #597 from ndtrung81/three-body-short-nlist | Aug 17 2017 | |||
7175abcc7170 | Axel Kohlmeyer | flag more pair styles as supporting USER-INTEL to match newly added code | Aug 16 2017 | |||
e34b20405c28 | Axel Kohlmeyer/GitHub | Fix a couple of typos in the docs | Aug 16 2017 | |||
1d4d2155a23b | Steve Plimpton | USER-INTEL add-ons from Mike | Aug 16 2017 | |||
cee87d7a54b5 | Axel Kohlmeyer | update manual to point to packages.lammps.org instead of rpm.lammps.org | Aug 15 2017 | |||
60e14f14906c | Axel Kohlmeyer | add comment to msi2lmp README about symmetry limitations | Aug 14 2017 | |||
81e7d4a94259 | Axel Kohlmeyer | fix incorrect preprocessor define for windows | Aug 12 2017 | |||
0b3f1b8a156d | Steve Plimpton | patch 11Aug17 | Aug 11 2017 | |||
b209a4e246b5 | Steve Plimpton/GitHub | Merge pull request #614 from akohlmey/fixes-for-stable | Aug 11 2017 | |||
27553283c30e | Axel Kohlmeyer | fix bug with pair_modify <style> compute not triggering the correct global… | Aug 11 2017 | |||
df56b2d6a43a | Axel Kohlmeyer | trigger relink after package library build through updating the time stamp on… | Aug 11 2017 | |||
c6d923b6c889 | Axel Kohlmeyer | make download function more resilient by also catching failed execution | Aug 11 2017 | |||
6d24be8bb70f | Axel Kohlmeyer | whitespace cleanup | Aug 11 2017 | |||
8c16ea1bfca5 | Axel Kohlmeyer | add automatic triggering of review requests with a code owners file | Aug 10 2017 | |||
c8741f3a01a2 | Axel Kohlmeyer | remove special_bonds extra keyword and refer to read_data and create_box instead | Aug 10 2017 | |||
2a7d2dee3652 | Axel Kohlmeyer | add more strict checking of data when parsing molecule files to detect format… | Aug 10 2017 | |||
da01be7c1857 | Giacomo Fiorin | More robust change from initial to target restraint centers in Colvars | Aug 10 2017 | |||
3e9b41c6b74d | Trung Nguyen | Added references to GPU package citations | Aug 9 2017 | |||
8a7a831bd6c0 | Stan Moore | Remove redundant check in Makefile.kokkos | Aug 8 2017 | |||
93190a548a4a | Richard Berger | Merge branch 'cmake' of github.com:junghans/lammps into cmake | Jul 31 2017 | |||
72f50c91ee01 | Richard Berger | Add -DLAMMPS_EXCEPTIONS flag | Jul 31 2017 | |||
408d9d99a946 | Christoph Junghans | cmake: improve some error messages | Jul 31 2017 | |||
8431ca5fecbc | Stan Moore | Remove tpls directory | Jul 31 2017 | |||
13f2d39f55b1 | Stan Moore | Update Kokkos library to v2.03.13 | Jul 31 2017 | |||
0231cc38a35e | Christoph Junghans | cmake: some more typo fixes | Jul 26 2017 | |||
6716de532073 | Christoph Junghans | allow user to override PYTHON_INSTDIR | Jul 25 2017 | |||
f2023431f69b | Christoph Junghans | cmake: fixed another typo | Jul 24 2017 | |||
aa60ef6ed8cf | Trung Nguyen | Cleaned up 3-body kernels, reverted some mistaken changes to vashishta | Jul 23 2017 | |||
a71f5a0c20f7 | Trung Nguyen | Enabled again neigh no with tpa > 1 for 3-body gpu styles for backward… | Jul 23 2017 | |||
126d9cd3bc71 | Christoph Junghans | add GZIP and FFMPEG status | Jul 22 2017 | |||
74deeeca5855 | Christoph Junghans | cmake: fixed another typo | Jul 21 2017 | |||
c010edc4fdc3 | Christoph Junghans | cmake: fixed two typos | Jul 21 2017 | |||
3d1d0c58c732 | Trung Nguyen | Cleaned up 3-body gpu styles, and fixed a bug for tersoff/zbl/gpu. There is a… | Jul 21 2017 | |||
e8e9ea839207 | Christoph Junghans | added one trivial test | Jul 21 2017 | |||
c88d1e5510a1 | Christoph Junghans | make ENABLE_ALL work out of the box | Jul 20 2017 | |||
427ca88dd44d | Christoph Junghans | cmake: error for POEMS + BODY package | Jul 20 2017 | |||
1749d643c720 | Christoph Junghans | GPU: bring back CUDPP_OPT | Jul 20 2017 | |||
f037f89f5f4d | Christoph Junghans | fix GPU + BUILD_SHARED_LIBS | Jul 20 2017 | |||
488609a5fdfa | Christoph Junghans | make FFT a selective option | Jul 20 2017 | |||
01bcb79bdc0c | Christoph Junghans | cmake: clean up and updated comments | Jul 20 2017 | |||
babba1870efe | Christoph Junghans | added FFTW2 support | Jul 19 2017 | |||
a99e3ef4f0e8 | Christoph Junghans | cmake: fix typo and pkg info | Jul 19 2017 | |||
c95db97b83c3 | Christoph Junghans | fix PYTHON install | Jul 19 2017 | |||
2961ba7ebb0d | Christoph Junghans | added MKL support | Jul 19 2017 |