Homec4science
Diffusion lammps 2a288504ddbd

Merge remote-tracking branch 'main/master'
2a288504ddbd
Actions

Authored by crtrott <crtrott@sandia.gov> on Feb 25 2016, 20:35.

Description

Merge remote-tracking branch 'main/master'

Conflicts:
lib/kokkos/Makefile.kokkos
lib/kokkos/containers/src/Kokkos_DualView.hpp
lib/kokkos/core/src/KokkosExp_View.hpp
lib/kokkos/core/src/Threads/Kokkos_ThreadsExec.cpp
lib/kokkos/core/src/impl/KokkosExp_ViewMapping.hpp
lib/kokkos/core/src/impl/Kokkos_Error.hpp
lib/kokkos/core/unit_test/TestViewMapping.hpp

Details

Committed
crtrott <crtrott@sandia.gov>Feb 25 2016, 20:35
Pushed
jungeOct 6 2016, 16:49
Parents
rLAMMPS5146f1894fae: Kokkos: Fix again wrong usage of DualView
rLAMMPSb5e95a0a14c6: Fixing USER-CUDA compile error
Branches
Unknown
Tags
Unknown

Event Timeline

crtrott <crtrott@sandia.gov> committed rLAMMPS2a288504ddbd: Merge remote-tracking branch 'main/master' (authored by crtrott <crtrott@sandia.gov>).Feb 25 2016, 20:35

Merged Changes

This commit merges a very large number of changes. Only the first 50 are shown.
CommitAuthorDetailsCommitted
b5e95a0a14c6stamoor
Fixing USER-CUDA compile error 
Feb 24 2016
dbd259948ba0sjplimp
git-svn-id: svn://svn.icms.temple.edu/lammps-ro/trunk@14675 f3b2605a-c512-4ea7… 
Feb 24 2016
98b34b6311aasjplimp
git-svn-id: svn://svn.icms.temple.edu/lammps-ro/trunk@14673 f3b2605a-c512-4ea7… 
Feb 24 2016
a4e33d30969asjplimp
git-svn-id: svn://svn.icms.temple.edu/lammps-ro/trunk@14672 f3b2605a-c512-4ea7… 
Feb 24 2016
4ddd88da26edsjplimp
git-svn-id: svn://svn.icms.temple.edu/lammps-ro/trunk@14670 f3b2605a-c512-4ea7… 
Feb 23 2016
e0361bb7a5e8sjplimp
git-svn-id: svn://svn.icms.temple.edu/lammps-ro/trunk@14669 f3b2605a-c512-4ea7… 
Feb 23 2016
43158e38f67bsjplimp
git-svn-id: svn://svn.icms.temple.edu/lammps-ro/trunk@14667 f3b2605a-c512-4ea7… 
Feb 23 2016
a7b85690d13esjplimp
git-svn-id: svn://svn.icms.temple.edu/lammps-ro/trunk@14666 f3b2605a-c512-4ea7… 
Feb 23 2016
c200e187b53bsjplimp
git-svn-id: svn://svn.icms.temple.edu/lammps-ro/trunk@14665 f3b2605a-c512-4ea7… 
Feb 23 2016
577af878eaf4sjplimp
git-svn-id: svn://svn.icms.temple.edu/lammps-ro/trunk@14664 f3b2605a-c512-4ea7… 
Feb 23 2016
f406a5ed558bsjplimp
git-svn-id: svn://svn.icms.temple.edu/lammps-ro/trunk@14663 f3b2605a-c512-4ea7… 
Feb 23 2016
8291f5e69c50sjplimp
git-svn-id: svn://svn.icms.temple.edu/lammps-ro/trunk@14662 f3b2605a-c512-4ea7… 
Feb 23 2016
dc0dc5a7d9e7sjplimp
git-svn-id: svn://svn.icms.temple.edu/lammps-ro/trunk@14661 f3b2605a-c512-4ea7… 
Feb 22 2016
d2d5b0cb7501sjplimp
git-svn-id: svn://svn.icms.temple.edu/lammps-ro/trunk@14660 f3b2605a-c512-4ea7… 
Feb 22 2016
00fc71e8b8absjplimp
git-svn-id: svn://svn.icms.temple.edu/lammps-ro/trunk@14659 f3b2605a-c512-4ea7… 
Feb 22 2016
f705ef560019sjplimp
git-svn-id: svn://svn.icms.temple.edu/lammps-ro/trunk@14658 f3b2605a-c512-4ea7… 
Feb 18 2016
08b53bb70997sjplimp
git-svn-id: svn://svn.icms.temple.edu/lammps-ro/trunk@14657 f3b2605a-c512-4ea7… 
Feb 18 2016
5c78508b40bfsjplimp
git-svn-id: svn://svn.icms.temple.edu/lammps-ro/trunk@14656 f3b2605a-c512-4ea7… 
Feb 18 2016
e4ea9c065801sjplimp
git-svn-id: svn://svn.icms.temple.edu/lammps-ro/trunk@14655 f3b2605a-c512-4ea7… 
Feb 17 2016
b7e4a33bab9bsjplimp
git-svn-id: svn://svn.icms.temple.edu/lammps-ro/trunk@14654 f3b2605a-c512-4ea7… 
Feb 17 2016
718c87f9150esjplimp
git-svn-id: svn://svn.icms.temple.edu/lammps-ro/trunk@14653 f3b2605a-c512-4ea7… 
Feb 17 2016
a43731758c54sjplimp
git-svn-id: svn://svn.icms.temple.edu/lammps-ro/trunk@14652 f3b2605a-c512-4ea7… 
Feb 17 2016
eee65e309eddsjplimp
git-svn-id: svn://svn.icms.temple.edu/lammps-ro/trunk@14651 f3b2605a-c512-4ea7… 
Feb 17 2016
e4f73836553dsjplimp
git-svn-id: svn://svn.icms.temple.edu/lammps-ro/trunk@14650 f3b2605a-c512-4ea7… 
Feb 17 2016
2ad23266fb20stamoor
Fixing Kokkos bug 
Feb 17 2016
1a1b81cb8f9bstamoor
Fixing Kokkos bug 
Feb 16 2016
7b9802562c10sjplimp
git-svn-id: svn://svn.icms.temple.edu/lammps-ro/trunk@14647 f3b2605a-c512-4ea7… 
Feb 16 2016
9d6dbdb0f40esjplimp
git-svn-id: svn://svn.icms.temple.edu/lammps-ro/trunk@14646 f3b2605a-c512-4ea7… 
Feb 16 2016
f5e8f73677b5sjplimp
git-svn-id: svn://svn.icms.temple.edu/lammps-ro/trunk@14645 f3b2605a-c512-4ea7… 
Feb 16 2016
abe869aaed3fsjplimp
git-svn-id: svn://svn.icms.temple.edu/lammps-ro/trunk@14644 f3b2605a-c512-4ea7… 
Feb 16 2016
319762c37f30sjplimp
git-svn-id: svn://svn.icms.temple.edu/lammps-ro/trunk@14643 f3b2605a-c512-4ea7… 
Feb 16 2016
40952680d812sjplimp
git-svn-id: svn://svn.icms.temple.edu/lammps-ro/trunk@14642 f3b2605a-c512-4ea7… 
Feb 16 2016
33113808012csjplimp
git-svn-id: svn://svn.icms.temple.edu/lammps-ro/trunk@14639 f3b2605a-c512-4ea7… 
Feb 16 2016
1abf6d03bc33sjplimp
git-svn-id: svn://svn.icms.temple.edu/lammps-ro/trunk@14638 f3b2605a-c512-4ea7… 
Feb 16 2016
d242d3b6c4c0sjplimp
git-svn-id: svn://svn.icms.temple.edu/lammps-ro/trunk@14636 f3b2605a-c512-4ea7… 
Feb 15 2016
ae788f1bdc8bsjplimp
git-svn-id: svn://svn.icms.temple.edu/lammps-ro/trunk@14635 f3b2605a-c512-4ea7… 
Feb 15 2016
9b32dcb314ddsjplimp
git-svn-id: svn://svn.icms.temple.edu/lammps-ro/trunk@14634 f3b2605a-c512-4ea7… 
Feb 15 2016
53b3a4aec002sjplimp
git-svn-id: svn://svn.icms.temple.edu/lammps-ro/trunk@14633 f3b2605a-c512-4ea7… 
Feb 15 2016
52ca6416a08csjplimp
git-svn-id: svn://svn.icms.temple.edu/lammps-ro/trunk@14632 f3b2605a-c512-4ea7… 
Feb 15 2016
21136ae10745sjplimp
git-svn-id: svn://svn.icms.temple.edu/lammps-ro/trunk@14631 f3b2605a-c512-4ea7… 
Feb 15 2016
490b26ed0643sjplimp
git-svn-id: svn://svn.icms.temple.edu/lammps-ro/trunk@14630 f3b2605a-c512-4ea7… 
Feb 15 2016
952671afd6c7sjplimp
git-svn-id: svn://svn.icms.temple.edu/lammps-ro/trunk@14629 f3b2605a-c512-4ea7… 
Feb 15 2016
7512821dd62asjplimp
git-svn-id: svn://svn.icms.temple.edu/lammps-ro/trunk@14628 f3b2605a-c512-4ea7… 
Feb 15 2016
507bde5b5a92sjplimp
git-svn-id: svn://svn.icms.temple.edu/lammps-ro/trunk@14627 f3b2605a-c512-4ea7… 
Feb 15 2016
ed9e16202518sjplimp
git-svn-id: svn://svn.icms.temple.edu/lammps-ro/trunk@14626 f3b2605a-c512-4ea7… 
Feb 15 2016
74d9b4656acasjplimp
git-svn-id: svn://svn.icms.temple.edu/lammps-ro/trunk@14624 f3b2605a-c512-4ea7… 
Feb 15 2016
0be549d08f18sjplimp
git-svn-id: svn://svn.icms.temple.edu/lammps-ro/trunk@14622 f3b2605a-c512-4ea7… 
Feb 15 2016
384d5103dd30sjplimp
git-svn-id: svn://svn.icms.temple.edu/lammps-ro/trunk@14621 f3b2605a-c512-4ea7… 
Feb 15 2016
c43da51b44f5sjplimp
git-svn-id: svn://svn.icms.temple.edu/lammps-ro/trunk@14620 f3b2605a-c512-4ea7… 
Feb 15 2016
531cd5fe2cd9sjplimp
git-svn-id: svn://svn.icms.temple.edu/lammps-ro/trunk@14619 f3b2605a-c512-4ea7… 
Feb 15 2016

Very Large Commit

This commit is very large, and affects more than 1000 files. Changes are not shown.
c4science · Help