Homec4science

Merge branch 'master' into lammps-icms

Authored by Axel Kohlmeyer <akohlmey@gmail.com> on Jan 1 2012, 01:37.

Description

Merge branch 'master' into lammps-icms

Resolved Conflicts:
doc/Eqs/pair_coul_diel.jpg
doc/Eqs/pair_gauss.jpg
doc/Eqs/pair_tersoff_1.jpg
src/KSPACE/fft3d.h
src/comm.cpp
src/comm.h

Event Timeline

Axel Kohlmeyer <akohlmey@gmail.com> committed rLAMMPS006d63d78a92: Merge branch 'master' into lammps-icms (authored by Axel Kohlmeyer <akohlmey@gmail.com>).Jan 1 2012, 01:37

Merged Changes

CommitAuthorDetailsCommitted
9921d2078894sjplimp
git-svn-id: svn://svn.icms.temple.edu/lammps-ro/trunk@7381 f3b2605a-c512-4ea7… 
Dec 19 2011
5a644b0e5de4athomps
Added protection for zero atoms case 
Dec 19 2011
4f48544d4198sjplimp
git-svn-id: svn://svn.icms.temple.edu/lammps-ro/trunk@7379 f3b2605a-c512-4ea7… 
Dec 16 2011
70316a8f775esjplimp
git-svn-id: svn://svn.icms.temple.edu/lammps-ro/trunk@7377 f3b2605a-c512-4ea7… 
Dec 16 2011
06f040f25df4sjplimp
git-svn-id: svn://svn.icms.temple.edu/lammps-ro/trunk@7376 f3b2605a-c512-4ea7… 
Dec 16 2011
d99b580613d6sjplimp
git-svn-id: svn://svn.icms.temple.edu/lammps-ro/trunk@7375 f3b2605a-c512-4ea7… 
Dec 16 2011
891740f4a2e0sjplimp
git-svn-id: svn://svn.icms.temple.edu/lammps-ro/trunk@7374 f3b2605a-c512-4ea7… 
Dec 16 2011
432bb8a32320sjplimp
git-svn-id: svn://svn.icms.temple.edu/lammps-ro/trunk@7372 f3b2605a-c512-4ea7… 
Dec 15 2011
a704ddb697c0sjplimp
git-svn-id: svn://svn.icms.temple.edu/lammps-ro/trunk@7371 f3b2605a-c512-4ea7… 
Dec 15 2011
ee2ab8eac375sjplimp
git-svn-id: svn://svn.icms.temple.edu/lammps-ro/trunk@7370 f3b2605a-c512-4ea7… 
Dec 15 2011
59165f7114c0sjplimp
git-svn-id: svn://svn.icms.temple.edu/lammps-ro/trunk@7369 f3b2605a-c512-4ea7… 
Dec 15 2011
fb16c0eb301bsjplimp
git-svn-id: svn://svn.icms.temple.edu/lammps-ro/trunk@7368 f3b2605a-c512-4ea7… 
Dec 15 2011
6376eeec92e2sjplimp
git-svn-id: svn://svn.icms.temple.edu/lammps-ro/trunk@7367 f3b2605a-c512-4ea7… 
Dec 14 2011
f5c26abaa61asjplimp
git-svn-id: svn://svn.icms.temple.edu/lammps-ro/trunk@7366 f3b2605a-c512-4ea7… 
Dec 14 2011
e79e5b975c26sjplimp
git-svn-id: svn://svn.icms.temple.edu/lammps-ro/trunk@7365 f3b2605a-c512-4ea7… 
Dec 14 2011
bac07b76cef2sjplimp
git-svn-id: svn://svn.icms.temple.edu/lammps-ro/trunk@7364 f3b2605a-c512-4ea7… 
Dec 14 2011
a86eeda9b364sjplimp
git-svn-id: svn://svn.icms.temple.edu/lammps-ro/trunk@7363 f3b2605a-c512-4ea7… 
Dec 14 2011
ea56c1ec97a0sjplimp
git-svn-id: svn://svn.icms.temple.edu/lammps-ro/trunk@7362 f3b2605a-c512-4ea7… 
Dec 14 2011
ad9fa0e18743sjplimp
git-svn-id: svn://svn.icms.temple.edu/lammps-ro/trunk@7361 f3b2605a-c512-4ea7… 
Dec 13 2011
8068e88f0ca4sjplimp
git-svn-id: svn://svn.icms.temple.edu/lammps-ro/trunk@7360 f3b2605a-c512-4ea7… 
Dec 13 2011
28b1e0de2badsjplimp
git-svn-id: svn://svn.icms.temple.edu/lammps-ro/trunk@7359 f3b2605a-c512-4ea7… 
Dec 13 2011
25ea036d7df5sjplimp
git-svn-id: svn://svn.icms.temple.edu/lammps-ro/trunk@7358 f3b2605a-c512-4ea7… 
Dec 13 2011
62e304c0d325sjplimp
git-svn-id: svn://svn.icms.temple.edu/lammps-ro/trunk@7357 f3b2605a-c512-4ea7… 
Dec 13 2011
7e6755866f77sjplimp
git-svn-id: svn://svn.icms.temple.edu/lammps-ro/trunk@7356 f3b2605a-c512-4ea7… 
Dec 13 2011
37ed3d917e88sjplimp
git-svn-id: svn://svn.icms.temple.edu/lammps-ro/trunk@7355 f3b2605a-c512-4ea7… 
Dec 13 2011
ae6318ce2955sjplimp
git-svn-id: svn://svn.icms.temple.edu/lammps-ro/trunk@7354 f3b2605a-c512-4ea7… 
Dec 13 2011
b294de40f9f7sjplimp
git-svn-id: svn://svn.icms.temple.edu/lammps-ro/trunk@7353 f3b2605a-c512-4ea7… 
Dec 13 2011
eb04caa0548asjplimp
git-svn-id: svn://svn.icms.temple.edu/lammps-ro/trunk@7351 f3b2605a-c512-4ea7… 
Dec 13 2011
3870fcb2917asjplimp
git-svn-id: svn://svn.icms.temple.edu/lammps-ro/trunk@7350 f3b2605a-c512-4ea7… 
Dec 13 2011
eeb5ad77e617sjplimp
git-svn-id: svn://svn.icms.temple.edu/lammps-ro/trunk@7348 f3b2605a-c512-4ea7… 
Dec 13 2011
2f7c6cfb0debsjplimp
git-svn-id: svn://svn.icms.temple.edu/lammps-ro/trunk@7347 f3b2605a-c512-4ea7… 
Dec 13 2011
47c30ce47cbfsjplimp
git-svn-id: svn://svn.icms.temple.edu/lammps-ro/trunk@7346 f3b2605a-c512-4ea7… 
Dec 13 2011
a866ec3edbd8sjplimp
git-svn-id: svn://svn.icms.temple.edu/lammps-ro/trunk@7345 f3b2605a-c512-4ea7… 
Dec 13 2011
dfdc3fe1a2d4sjplimp
git-svn-id: svn://svn.icms.temple.edu/lammps-ro/trunk@7344 f3b2605a-c512-4ea7… 
Dec 13 2011
3d36d38a5183sjplimp
git-svn-id: svn://svn.icms.temple.edu/lammps-ro/trunk@7343 f3b2605a-c512-4ea7… 
Dec 13 2011
9b72a103ea29sjplimp
git-svn-id: svn://svn.icms.temple.edu/lammps-ro/trunk@7342 f3b2605a-c512-4ea7… 
Dec 13 2011
8325ae695402sjplimp
git-svn-id: svn://svn.icms.temple.edu/lammps-ro/trunk@7341 f3b2605a-c512-4ea7… 
Dec 13 2011
86347b81e32fsjplimp
git-svn-id: svn://svn.icms.temple.edu/lammps-ro/trunk@7340 f3b2605a-c512-4ea7… 
Dec 13 2011
744efbc2cd5dsjplimp
git-svn-id: svn://svn.icms.temple.edu/lammps-ro/trunk@7339 f3b2605a-c512-4ea7… 
Dec 13 2011