Homec4science
Diffusion lammps b35aaf4e756a

Merge remote-tracking branch 'main/master'
b35aaf4e756a
Actions

Authored by crtrott <crtrott@sandia.gov> on Dec 9 2015, 21:35.

Description

Merge remote-tracking branch 'main/master'

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>Dec 9 2015, 21:35
Pushed
jungeOct 6 2016, 16:49
Parents
rLAMMPS92f0f87b3629: Kokkos: Pair EAM: remove old code
rLAMMPSd24d85da64f9: git-svn-id: svn://svn.icms.temple.edu/lammps-ro/trunk@14305 f3b2605a-c512-4ea7…
Branches
Unknown
Tags
Unknown

Event Timeline

crtrott <crtrott@sandia.gov> committed rLAMMPSb35aaf4e756a: Merge remote-tracking branch 'main/master' (authored by crtrott <crtrott@sandia.gov>).Dec 9 2015, 21:35

Merged Changes

This commit merges a very large number of changes. Only the first 50 are shown.
CommitAuthorDetailsCommitted
d24d85da64f9sjplimp
git-svn-id: svn://svn.icms.temple.edu/lammps-ro/trunk@14305 f3b2605a-c512-4ea7… 
Dec 9 2015
f3dabd0dcedasjplimp
git-svn-id: svn://svn.icms.temple.edu/lammps-ro/trunk@14304 f3b2605a-c512-4ea7… 
Dec 9 2015
ab3fa39cc2f5sjplimp
git-svn-id: svn://svn.icms.temple.edu/lammps-ro/trunk@14302 f3b2605a-c512-4ea7… 
Dec 9 2015
b13f9b8c675bsjplimp
git-svn-id: svn://svn.icms.temple.edu/lammps-ro/trunk@14301 f3b2605a-c512-4ea7… 
Dec 9 2015
74a04c378d40sjplimp
git-svn-id: svn://svn.icms.temple.edu/lammps-ro/trunk@14300 f3b2605a-c512-4ea7… 
Dec 9 2015
2216401b9843sjplimp
git-svn-id: svn://svn.icms.temple.edu/lammps-ro/trunk@14299 f3b2605a-c512-4ea7… 
Dec 9 2015
24da72836debsjplimp
git-svn-id: svn://svn.icms.temple.edu/lammps-ro/trunk@14298 f3b2605a-c512-4ea7… 
Dec 9 2015
9f7fc76984b8sjplimp
git-svn-id: svn://svn.icms.temple.edu/lammps-ro/trunk@14297 f3b2605a-c512-4ea7… 
Dec 9 2015
eaa45f0b1032sjplimp
'' 
Dec 9 2015
6000ad1bb77bsjplimp
git-svn-id: svn://svn.icms.temple.edu/lammps-ro/trunk@14294 f3b2605a-c512-4ea7… 
Dec 9 2015
b73bfe968afasjplimp
'' 
Dec 9 2015
d1cbced71570sjplimp
'' 
Dec 9 2015
4da6cce1e948sjplimp
git-svn-id: svn://svn.icms.temple.edu/lammps-ro/trunk@14291 f3b2605a-c512-4ea7… 
Dec 9 2015
7e710a0fe3bfsjplimp
git-svn-id: svn://svn.icms.temple.edu/lammps-ro/trunk@14290 f3b2605a-c512-4ea7… 
Dec 9 2015
692047a65a93athomps
Fixed error in one example command 
Dec 8 2015
e02850884592athomps
Simplified non-overlap condition 
Dec 5 2015
32acf721464bathomps
Simplified non-overlap condition 
Dec 5 2015
9ae8b64f9a5cathomps
Cleaned up sna factorial table 
Dec 5 2015
5087bdb20c59athomps
prevented reorder from being used with fix gcmc 
Dec 5 2015
f7702fd7e388athomps
removed print statement 
Dec 5 2015
2271d9168e52athomps
Added missing normalization to vector case 
Dec 4 2015
d241f928c85bathomps
Fixed error in average option 
Dec 4 2015
050a1367a04eathomps
Fixed error in average option 
Dec 4 2015
28e3ebfd102eathomps
Fixed error in average option 
Dec 4 2015
853eab89178fathomps
Fixed problem in column_length(int) 
Dec 3 2015
00738a8baa2bathomps
Added average keyword 
Dec 2 2015
3ca986fc6ad9athomps
Fixed undefined tdof in setup 
Dec 1 2015
e99393473295sjplimp
git-svn-id: svn://svn.icms.temple.edu/lammps-ro/trunk@14276 f3b2605a-c512-4ea7… 
Dec 1 2015
7f02cecb78a5athomps
Small change 
Nov 25 2015
88f58beb97d6athomps
Added latest changes from Albert Bartok 
Nov 24 2015
574a328184d2sjplimp
git-svn-id: svn://svn.icms.temple.edu/lammps-ro/trunk@14272 f3b2605a-c512-4ea7… 
Nov 21 2015
355ba86d8b8asjplimp
git-svn-id: svn://svn.icms.temple.edu/lammps-ro/trunk@14271 f3b2605a-c512-4ea7… 
Nov 21 2015
b10ae0abaf08sjplimp
git-svn-id: svn://svn.icms.temple.edu/lammps-ro/trunk@14270 f3b2605a-c512-4ea7… 
Nov 21 2015
b857237fef0fsjplimp
git-svn-id: svn://svn.icms.temple.edu/lammps-ro/trunk@14269 f3b2605a-c512-4ea7… 
Nov 19 2015
7189cdd80d9dsjplimp
'' 
Nov 18 2015
0bdd0e36ccfdsjplimp
'' 
Nov 18 2015
77f8955d4ec4sjplimp
git-svn-id: svn://svn.icms.temple.edu/lammps-ro/trunk@14266 f3b2605a-c512-4ea7… 
Nov 18 2015
f6c76f46235dsjplimp
git-svn-id: svn://svn.icms.temple.edu/lammps-ro/trunk@14265 f3b2605a-c512-4ea7… 
Nov 18 2015
e3c4db746c45sjplimp
'' 
Nov 18 2015
61678ee8f253sjplimp
'' 
Nov 18 2015
f496b51d5653athomps
Changed the factorial table to static member 
Nov 18 2015
d7e2bb3a62acsjplimp
git-svn-id: svn://svn.icms.temple.edu/lammps-ro/trunk@14259 f3b2605a-c512-4ea7… 
Nov 17 2015
99c4b4cb2236sjplimp
git-svn-id: svn://svn.icms.temple.edu/lammps-ro/trunk@14258 f3b2605a-c512-4ea7… 
Nov 17 2015
16a90f2bfc24sjplimp
'' 
Nov 17 2015
cd714e67a745sjplimp
'' 
Nov 17 2015
27798d4f4ec5athomps
Updated compute hexorder/atom, added compute orientorder/atom 
Nov 17 2015
c28bd3c3ff2bathomps
Updated compute hexorder/atom, added compute orientorder/atom 
Nov 16 2015
9dc8102ac4a3athomps
Updated compute hexorder/atom, added compute orientorder/atom 
Nov 16 2015
70aba85d3130athomps
Updated compute hexorder/atom, added compute orientorder/atom 
Nov 15 2015
da1a3ac83af4athomps
Fixed error in onemols initialization when gcmc uses non-first molecule template 
Nov 12 2015

Very Large Commit

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