Homec4science

Merge branch 'master' into USER-DPD_kokkos

Authored by Stan Moore <stanmoore1@gmail.com> on Dec 14 2016, 19:25.

Description

Merge branch 'master' into USER-DPD_kokkos

Event Timeline

Stan Moore <stanmoore1@gmail.com> committed rLAMMPSd47c6b276105: Merge branch 'master' into USER-DPD_kokkos (authored by Stan Moore <stanmoore1@gmail.com>).Dec 14 2016, 19:25

Merged Changes

CommitAuthorDetailsCommitted
f509f133afd9Steve Plimpton
patch 13Dec16: neighbor refactor, Stan pppm/disp bug fix, M Brown INTEL package… 
Dec 14 2016
624c57e9dacbsjplimp/GitHub
Merge pull request #185 from akohlmey/new-neighbor 
Dec 14 2016
f3b355bcbea7sjplimp/GitHub
Merge pull request #298 from akohlmey/collected-small-fixes 
Dec 14 2016
ae5764beac4eSteve Plimpton
added functionity to lib interface 
Dec 14 2016
fda43c00fd99Axel Kohlmeyer
add deleted file in package to purge list 
Dec 12 2016
b34be30be6f5Axel Kohlmeyer/GitHub
Merge pull request #53 from stanmoore1/new-neighbor 
Dec 12 2016
13b6196b8235Stan Moore
Fixing Kokkos compile error 
Dec 12 2016
baf55c90f472Stan Moore
Whitespace change 
Dec 12 2016
770f5d0bf736Stan Moore
Whitespace change 
Dec 12 2016
a31b00965a81Stan Moore
Updating to master 
Dec 12 2016
a5e46e3e6ad9Stan Moore
Merging 
Dec 10 2016
31be0da59008Stan Moore
Merging pull request 
Dec 10 2016
0f3b2544a13cstanmoore1/GitHub
Merge pull request #1 from timattox/new-neighbor 
Dec 10 2016
586514e05c51stanmoore1/GitHub
Merge branch 'new-neighbor' into new-neighbor 
Dec 10 2016
43c459ba5694Stan Moore
More changes for Kokkos neighbor 
Dec 9 2016
b5c3d2f66c25Axel Kohlmeyer/GitHub
Merge pull request #52 from timattox/new-neighbor 
Dec 9 2016
5187cb97e5f1Tim Mattox
USER-DPD: Make fix_shardlow request its own SSA-specific neighbor list, instead… 
Dec 9 2016
eff503e56c1fTim Mattox
Prevent neighbor list copies between SSA and non-SSA neighbor list requests. 
Dec 9 2016
cdcebab3bd63Axel Kohlmeyer
make the output of the %CPU/OpenMP threads line consistent with compiling in… 
Dec 9 2016
ddf678da5161Axel Kohlmeyer
make fix gcmc command overview consistent 
Dec 9 2016
435421301b0bStan Moore
Small tweaks to Kokkos neighbor 
Dec 9 2016
9b48c49f8348Stan Moore
Removing used Kokkos file 
Dec 8 2016
d3d5ac17bf67Efrem Braun
Fixed small typos in doc 
Dec 8 2016
8318c6781697Stan Moore
Kokkos neighbor refactor 
Dec 7 2016
7c61dbf5e209Axel Kohlmeyer
Merge branch 'new-neighbor' of github.com:akohlmey/lammps into new-neighbor 
Dec 7 2016
39a12b15d7eaAxel Kohlmeyer
Merge branch 'master' into new-neighbor 
Dec 7 2016
114926a4886bAxel Kohlmeyer
Merge branch 'master' into new-neighbor 
Oct 2 2016
5eb9dd0c5d9cAxel Kohlmeyer
Merge branch 'master' into new-neighbor 
Sep 30 2016
ebabc8f0bc3bAxel Kohlmeyer
Merge remote-tracking branch 'lammps-rw/integration' into update-neighbor 
Sep 9 2016
232abf853468Axel Kohlmeyer
restore locale and enforce grep option squashing 
Sep 9 2016
d22caf26580eAxel Kohlmeyer/GitHub
Merge pull request #29 from timattox/new-neighbor 
Sep 9 2016
3842aa609531Axel Kohlmeyer
forward skip lists /omp neighbor list builds to non-omp implementations 
Sep 9 2016
32c240978aa3Tim Mattox
USER-DPD: remove several files from src that came from src/USER-DPD/ These were… 
Sep 9 2016
212c2617f6e4Axel Kohlmeyer
delete a couple more files, that don't belong into src/ 
Sep 9 2016
40f85c93ba4eAxel Kohlmeyer
corrected mismatched free() vs. delete[] 
Sep 9 2016
2f02d9846976Axel Kohlmeyer
remove USER-DPD files that should not be where they are 
Sep 9 2016
4553881fc28fAxel Kohlmeyer/GitHub
Merge pull request #28 from timattox/new-neighbor 
Sep 9 2016
81fcbcd99cd0Tim Mattox
USER-DPD: move nstencil_ssa out of core LAMMPS into USER-DPD 
Sep 9 2016
82c6eb467539Tim Mattox
USER-DPD: Set missing NP_HALF flag in npair_half_bin_newton_ssa.h 
Sep 9 2016
8ed3f4226e5bTim Mattox
USER-DPD: move custom binning stuff to a NBinSSA child class. Removes most SSA… 
Sep 9 2016
9b7a0d7e1c1aTim Mattox
Update gitignore for the new USER-DPD source files. 
Sep 9 2016
c9c2ae6c6134Steve Plimpton
new neighbor list changes 
Sep 7 2016