Homec4science

Merge branch 'lammps-icms' of bitbucket.org:akohlmey/lammps-icms into lammps…

Authored by Axel Kohlmeyer <akohlmey@gmail.com> on Jan 26 2016, 17:41.

Description

Merge branch 'lammps-icms' of bitbucket.org:akohlmey/lammps-icms into lammps-icms

Details

Committed
Axel Kohlmeyer <akohlmey@gmail.com>Jan 26 2016, 17:41
Pushed
jungeOct 6 2016, 16:49
Parents
rLAMMPS32f22f2ff4ad: fix last minute typo
rLAMMPSe5493e211593: fix typo
Branches
Unknown
Tags
Unknown

Event Timeline

Axel Kohlmeyer <akohlmey@gmail.com> committed rLAMMPS977a7a5461f7: Merge branch 'lammps-icms' of bitbucket.org:akohlmey/lammps-icms into lammps… (authored by Axel Kohlmeyer <akohlmey@gmail.com>).Jan 26 2016, 17:41

Merged Changes

This commit merges a very large number of changes. Only the first 50 are shown.
CommitAuthorDetailsCommitted
32f22f2ff4adAxel Kohlmeyer
fix last minute typo 
Jan 25 2016
7f4c5276775fAxel Kohlmeyer
Merge branch 'lammps-icms' of bitbucket.org:akohlmey/lammps-icms into lammps… 
Jan 25 2016
05a1d98c042cAxel Kohlmeyer
only allow fix adapt to control 2-d parameter arrays for pair parameters 
Jan 25 2016
c3d483916547Axel Kohlmeyer
Merge branch 'lammps-icms' into kim-fix-adapt-changes 
Jan 25 2016
33759a8b187dAxel Kohlmeyer
Merge branch 'lammps-icms' of bitbucket.org:akohlmey/lammps-icms into lammps… 
Jan 24 2016
2aaf9f3d5937Axel Kohlmeyer
Merge remote-tracking branch 'lammps-ro/master' into lammps-icms 
Jan 23 2016
aca24423f4c7sjplimp
git-svn-id: svn://svn.icms.temple.edu/lammps-ro/trunk@14485 f3b2605a-c512-4ea7… 
Jan 23 2016
f593ffb67b98sjplimp
git-svn-id: svn://svn.icms.temple.edu/lammps-ro/trunk@14484 f3b2605a-c512-4ea7… 
Jan 23 2016
67d5513df13bsjplimp
git-svn-id: svn://svn.icms.temple.edu/lammps-ro/trunk@14483 f3b2605a-c512-4ea7… 
Jan 23 2016
b31f864e8341sjplimp
git-svn-id: svn://svn.icms.temple.edu/lammps-ro/trunk@14482 f3b2605a-c512-4ea7… 
Jan 23 2016
8b7e9fea4cb5sjplimp
git-svn-id: svn://svn.icms.temple.edu/lammps-ro/trunk@14481 f3b2605a-c512-4ea7… 
Jan 23 2016
3621171480f3sjplimp
git-svn-id: svn://svn.icms.temple.edu/lammps-ro/trunk@14480 f3b2605a-c512-4ea7… 
Jan 23 2016
5d99bf664efbsjplimp
git-svn-id: svn://svn.icms.temple.edu/lammps-ro/trunk@14479 f3b2605a-c512-4ea7… 
Jan 23 2016
7f049bb31b3dsjplimp
git-svn-id: svn://svn.icms.temple.edu/lammps-ro/trunk@14478 f3b2605a-c512-4ea7… 
Jan 23 2016
627561054c70sjplimp
git-svn-id: svn://svn.icms.temple.edu/lammps-ro/trunk@14477 f3b2605a-c512-4ea7… 
Jan 23 2016
d4a5571aaba9sjplimp
git-svn-id: svn://svn.icms.temple.edu/lammps-ro/trunk@14476 f3b2605a-c512-4ea7… 
Jan 23 2016
28d6cef69782sjplimp
git-svn-id: svn://svn.icms.temple.edu/lammps-ro/trunk@14475 f3b2605a-c512-4ea7… 
Jan 23 2016
79466c37d8e3sjplimp
git-svn-id: svn://svn.icms.temple.edu/lammps-ro/trunk@14474 f3b2605a-c512-4ea7… 
Jan 23 2016
ad1d7ffdc70aathomps
Fixed another bug in edge_histo 
Jan 23 2016
34785af4a6a0stamoor
Fixing Kokkos bugs 
Jan 23 2016
611bb37724baAxel Kohlmeyer
import changes to fix adapt posted by ryan elliot to lammps-users 
Jan 22 2016
c8fb84783edbstamoor
Fixing Kokkos bug 
Jan 22 2016
e3e687f7b35eathomps
Added peratom keyword 
Jan 22 2016
05dd231d6734Axel Kohlmeyer
fix broken download link 
Jan 22 2016
666d63d81c9aAxel Kohlmeyer
Merge remote-tracking branch 'lammps-ro/master' into lammps-icms 
Jan 22 2016
56ef0d40fcbcathomps
Added description of peratom keyword 
Jan 22 2016
4da36d1c01a0athomps
Added data output example 
Jan 22 2016
eb105410ad06stamoor
Fixing Kokkos bug 
Jan 21 2016
eebf110e0250athomps
Further tweaked the flangevin issue 
Jan 21 2016
b833b5593398Axel Kohlmeyer
Merge remote-tracking branch 'lammps-ro/master' into lammps-icms 
Jan 21 2016
d13b2ecfc9f5athomps
Added faces as local compute 
Jan 21 2016
66a048bbb996athomps
Added faces as local compute 
Jan 21 2016
005f9d5ac5e8athomps
Added faces as local compute 
Jan 21 2016
fe10d8c87b00athomps
Removed flangevin==NULL check 
Jan 20 2016
f3b15cd4d165Axel Kohlmeyer
Merge remote-tracking branch 'lammps-ro/master' into lammps-icms 
Jan 20 2016
2e035a00f766Axel Kohlmeyer
add documentation for ndx2group command 
Jan 20 2016
6d4beaa7d86bAxel Kohlmeyer
hack to make USER-INTEL compilable without OpenMP support 
Jan 20 2016
7fb6016839d1Axel Kohlmeyer
add ndx2group command that allows restoring groups from an index file 
Jan 20 2016
dcec5c28c669Axel Kohlmeyer
skip over deleted groups when printing the list of groups 
Jan 20 2016
fa01d915e336athomps
Changed behavior for non-periodic systems 
Jan 20 2016
81d55a790498athomps
Changed behavior for non-periodic systems 
Jan 20 2016
a3c0f3e43e36sjplimp
git-svn-id: svn://svn.icms.temple.edu/lammps-ro/trunk@14459 f3b2605a-c512-4ea7… 
Jan 20 2016
7c810d619885athomps
Added 2d example 
Jan 19 2016
0d1c7af98b5aathomps
Updated description of 2d and free surface cases 
Jan 19 2016
f16130ab67basjplimp
git-svn-id: svn://svn.icms.temple.edu/lammps-ro/trunk@14456 f3b2605a-c512-4ea7… 
Jan 19 2016
b9913826d9f1Axel Kohlmeyer
Merge remote-tracking branch 'lammps-ro/master' into lammps-icms 
Jan 16 2016
f6f88c2f2804sjplimp
git-svn-id: svn://svn.icms.temple.edu/lammps-ro/trunk@14455 f3b2605a-c512-4ea7… 
Jan 15 2016
0d79f78f73b6sjplimp
git-svn-id: svn://svn.icms.temple.edu/lammps-ro/trunk@14453 f3b2605a-c512-4ea7… 
Jan 15 2016
b66f1e351e27sjplimp
git-svn-id: svn://svn.icms.temple.edu/lammps-ro/trunk@14452 f3b2605a-c512-4ea7… 
Jan 15 2016
fb0230aed29bsjplimp
git-svn-id: svn://svn.icms.temple.edu/lammps-ro/trunk@14451 f3b2605a-c512-4ea7… 
Jan 15 2016

Very Large Commit

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