Homec4science
Diffusion lammps 8d0330d0ad47

Merge branch 'primary'
8d0330d0ad47
Actions

Authored by crtrott <crtrott@sandia.gov> on Oct 10 2015, 01:08.

Description

Merge branch 'primary'

Conflicts:
lib/kokkos/Makefile.kokkos
lib/kokkos/algorithms/src/Kokkos_Random.hpp
lib/kokkos/core/src/Qthread/Kokkos_Qthread_TaskPolicy.cpp
lib/kokkos/core/unit_test/TestCuda.cpp
src/KOKKOS/pair_eam_kokkos.cpp
src/KOKKOS/pair_eam_kokkos.h

Details

Committed
crtrott <crtrott@sandia.gov>Oct 10 2015, 01:08
Pushed
jungeOct 6 2016, 16:49
Parents
rLAMMPS92f0f87b3629: Kokkos: Pair EAM: remove old code
rLAMMPS97878b1a9f68: Added deprecated warning message to pair_style reax
Branches
Unknown
Tags
Unknown

Event Timeline

crtrott <crtrott@sandia.gov> committed rLAMMPS8d0330d0ad47: Merge branch 'primary' (authored by crtrott <crtrott@sandia.gov>).Oct 10 2015, 01:08

Merged Changes

This commit merges a very large number of changes. Only the first 50 are shown.
CommitAuthorDetailsCommitted
97878b1a9f68athomps
Added deprecated warning message to pair_style reax 
Oct 7 2015
dcb68f4c9786athomps
Added deprecated warning message to pair_style reax 
Oct 7 2015
da1e4e4f258cathomps
Added elastic constant example at finite temperature 
Oct 5 2015
233eaea97d7cathomps
Added elastic constant example at finite temperature 
Oct 5 2015
ae2a7e2ebdbaathomps
Made output prettier 
Oct 5 2015
a1149efbfa3bathomps
Added elastic constant example at finite temperature 
Oct 5 2015
8a024fa64b01athomps
Added elastic constant example at finite temperature 
Oct 5 2015
db4d01260bdaathomps
Added elastic constant example at finite temperature 
Oct 5 2015
46545bb3083bathomps
Added elastic constant example at finite temperature 
Oct 5 2015
eda7896364bbathomps
Added elastic constant example at finite temperature 
Oct 5 2015
f343a9f4a077athomps
Added elastic constant example at finite temperature 
Oct 5 2015
1bb4a26214c3sjplimp
git-svn-id: svn://svn.icms.temple.edu/lammps-ro/trunk@14095 f3b2605a-c512-4ea7… 
Oct 5 2015
bb48e4789521sjplimp
git-svn-id: svn://svn.icms.temple.edu/lammps-ro/trunk@14094 f3b2605a-c512-4ea7… 
Oct 5 2015
c7842922980bsjplimp
git-svn-id: svn://svn.icms.temple.edu/lammps-ro/trunk@14093 f3b2605a-c512-4ea7… 
Oct 5 2015
5fa97f537abdsjplimp
git-svn-id: svn://svn.icms.temple.edu/lammps-ro/trunk@14092 f3b2605a-c512-4ea7… 
Oct 5 2015
fa6ad89b99absjplimp
git-svn-id: svn://svn.icms.temple.edu/lammps-ro/trunk@14091 f3b2605a-c512-4ea7… 
Oct 5 2015
bee7ed920a2csjplimp
'' 
Oct 5 2015
0e398e5e65e4sjplimp
'' 
Oct 5 2015
56ee1b670b3bsjplimp
git-svn-id: svn://svn.icms.temple.edu/lammps-ro/trunk@14088 f3b2605a-c512-4ea7… 
Oct 5 2015
6f038ab6d04dsjplimp
git-svn-id: svn://svn.icms.temple.edu/lammps-ro/trunk@14087 f3b2605a-c512-4ea7… 
Oct 5 2015
3f3165af39fdsjplimp
git-svn-id: svn://svn.icms.temple.edu/lammps-ro/trunk@14086 f3b2605a-c512-4ea7… 
Oct 2 2015
e5514189ba45athomps
Fixed negligible error in Tersoff and COMB 
Oct 1 2015
858eed24383csjplimp
'' 
Sep 28 2015
89ea1e4ae6d8sjplimp
'' 
Sep 28 2015
a6d7932ef46asjplimp
git-svn-id: svn://svn.icms.temple.edu/lammps-ro/trunk@14082 f3b2605a-c512-4ea7… 
Sep 28 2015
4d4d56175a68sjplimp
'' 
Sep 28 2015
615657899c78sjplimp
'' 
Sep 28 2015
4f4ba3f7bf3estamoor
Tweak to Kokkos Cuda Makefile allowing it to automatically find the nvcc wrapper 
Sep 25 2015
27c4accd4feesjplimp
git-svn-id: svn://svn.icms.temple.edu/lammps-ro/trunk@14077 f3b2605a-c512-4ea7… 
Sep 25 2015
f384db5c2eeesjplimp
git-svn-id: svn://svn.icms.temple.edu/lammps-ro/trunk@14076 f3b2605a-c512-4ea7… 
Sep 25 2015
61649b57d0edsjplimp
git-svn-id: svn://svn.icms.temple.edu/lammps-ro/trunk@14075 f3b2605a-c512-4ea7… 
Sep 25 2015
8fd8c25e7c3fsjplimp
git-svn-id: svn://svn.icms.temple.edu/lammps-ro/trunk@14074 f3b2605a-c512-4ea7… 
Sep 25 2015
663551ee9f0fsjplimp
git-svn-id: svn://svn.icms.temple.edu/lammps-ro/trunk@14073 f3b2605a-c512-4ea7… 
Sep 25 2015
d2a2124b5678sjplimp
git-svn-id: svn://svn.icms.temple.edu/lammps-ro/trunk@14072 f3b2605a-c512-4ea7… 
Sep 25 2015
ef4e8f288aa4sjplimp
git-svn-id: svn://svn.icms.temple.edu/lammps-ro/trunk@14071 f3b2605a-c512-4ea7… 
Sep 24 2015
df7687fcc18esjplimp
git-svn-id: svn://svn.icms.temple.edu/lammps-ro/trunk@14069 f3b2605a-c512-4ea7… 
Sep 24 2015
9bdec3026069sjplimp
git-svn-id: svn://svn.icms.temple.edu/lammps-ro/trunk@14068 f3b2605a-c512-4ea7… 
Sep 24 2015
87025c6770fdsjplimp
'' 
Sep 24 2015
aec30b07c2c3sjplimp
'' 
Sep 24 2015
d2ee16c936cesjplimp
git-svn-id: svn://svn.icms.temple.edu/lammps-ro/trunk@14065 f3b2605a-c512-4ea7… 
Sep 24 2015
546186739cecsjplimp
git-svn-id: svn://svn.icms.temple.edu/lammps-ro/trunk@14064 f3b2605a-c512-4ea7… 
Sep 24 2015
c622ab1e6df4sjplimp
'' 
Sep 24 2015
ac2ab62f03f9sjplimp
'' 
Sep 24 2015
53a8a038e82bsjplimp
git-svn-id: svn://svn.icms.temple.edu/lammps-ro/trunk@14061 f3b2605a-c512-4ea7… 
Sep 24 2015
44c8bb9cbf2csjplimp
git-svn-id: svn://svn.icms.temple.edu/lammps-ro/trunk@14060 f3b2605a-c512-4ea7… 
Sep 24 2015
6f39a0a78d86sjplimp
git-svn-id: svn://svn.icms.temple.edu/lammps-ro/trunk@14059 f3b2605a-c512-4ea7… 
Sep 24 2015
448b9f66f0fasjplimp
git-svn-id: svn://svn.icms.temple.edu/lammps-ro/trunk@14058 f3b2605a-c512-4ea7… 
Sep 24 2015
2ed7d366a693sjplimp
git-svn-id: svn://svn.icms.temple.edu/lammps-ro/trunk@14057 f3b2605a-c512-4ea7… 
Sep 24 2015
ea547aaf79c9sjplimp
'' 
Sep 24 2015
787cc145e8e0sjplimp
'' 
Sep 24 2015

Very Large Commit

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