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
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
Axel Kohlmeyer <akohlmey@gmail.com> | Jan 1 2012, 01:37 |
junge | Oct 6 2016, 16:49 |
Commit | Author | Details | Committed | |||
---|---|---|---|---|---|---|
9921d2078894 | sjplimp | git-svn-id: svn://svn.icms.temple.edu/lammps-ro/trunk@7381 f3b2605a-c512-4ea7… | Dec 19 2011 | |||
5a644b0e5de4 | athomps | Added protection for zero atoms case | Dec 19 2011 | |||
4f48544d4198 | sjplimp | git-svn-id: svn://svn.icms.temple.edu/lammps-ro/trunk@7379 f3b2605a-c512-4ea7… | Dec 16 2011 | |||
70316a8f775e | sjplimp | git-svn-id: svn://svn.icms.temple.edu/lammps-ro/trunk@7377 f3b2605a-c512-4ea7… | Dec 16 2011 | |||
06f040f25df4 | sjplimp | git-svn-id: svn://svn.icms.temple.edu/lammps-ro/trunk@7376 f3b2605a-c512-4ea7… | Dec 16 2011 | |||
d99b580613d6 | sjplimp | git-svn-id: svn://svn.icms.temple.edu/lammps-ro/trunk@7375 f3b2605a-c512-4ea7… | Dec 16 2011 | |||
891740f4a2e0 | sjplimp | git-svn-id: svn://svn.icms.temple.edu/lammps-ro/trunk@7374 f3b2605a-c512-4ea7… | Dec 16 2011 | |||
432bb8a32320 | sjplimp | git-svn-id: svn://svn.icms.temple.edu/lammps-ro/trunk@7372 f3b2605a-c512-4ea7… | Dec 15 2011 | |||
a704ddb697c0 | sjplimp | git-svn-id: svn://svn.icms.temple.edu/lammps-ro/trunk@7371 f3b2605a-c512-4ea7… | Dec 15 2011 | |||
ee2ab8eac375 | sjplimp | git-svn-id: svn://svn.icms.temple.edu/lammps-ro/trunk@7370 f3b2605a-c512-4ea7… | Dec 15 2011 | |||
59165f7114c0 | sjplimp | git-svn-id: svn://svn.icms.temple.edu/lammps-ro/trunk@7369 f3b2605a-c512-4ea7… | Dec 15 2011 | |||
fb16c0eb301b | sjplimp | git-svn-id: svn://svn.icms.temple.edu/lammps-ro/trunk@7368 f3b2605a-c512-4ea7… | Dec 15 2011 | |||
6376eeec92e2 | sjplimp | git-svn-id: svn://svn.icms.temple.edu/lammps-ro/trunk@7367 f3b2605a-c512-4ea7… | Dec 14 2011 | |||
f5c26abaa61a | sjplimp | git-svn-id: svn://svn.icms.temple.edu/lammps-ro/trunk@7366 f3b2605a-c512-4ea7… | Dec 14 2011 | |||
e79e5b975c26 | sjplimp | git-svn-id: svn://svn.icms.temple.edu/lammps-ro/trunk@7365 f3b2605a-c512-4ea7… | Dec 14 2011 | |||
bac07b76cef2 | sjplimp | git-svn-id: svn://svn.icms.temple.edu/lammps-ro/trunk@7364 f3b2605a-c512-4ea7… | Dec 14 2011 | |||
a86eeda9b364 | sjplimp | git-svn-id: svn://svn.icms.temple.edu/lammps-ro/trunk@7363 f3b2605a-c512-4ea7… | Dec 14 2011 | |||
ea56c1ec97a0 | sjplimp | git-svn-id: svn://svn.icms.temple.edu/lammps-ro/trunk@7362 f3b2605a-c512-4ea7… | Dec 14 2011 | |||
ad9fa0e18743 | sjplimp | git-svn-id: svn://svn.icms.temple.edu/lammps-ro/trunk@7361 f3b2605a-c512-4ea7… | Dec 13 2011 | |||
8068e88f0ca4 | sjplimp | git-svn-id: svn://svn.icms.temple.edu/lammps-ro/trunk@7360 f3b2605a-c512-4ea7… | Dec 13 2011 | |||
28b1e0de2bad | sjplimp | git-svn-id: svn://svn.icms.temple.edu/lammps-ro/trunk@7359 f3b2605a-c512-4ea7… | Dec 13 2011 | |||
25ea036d7df5 | sjplimp | git-svn-id: svn://svn.icms.temple.edu/lammps-ro/trunk@7358 f3b2605a-c512-4ea7… | Dec 13 2011 | |||
62e304c0d325 | sjplimp | git-svn-id: svn://svn.icms.temple.edu/lammps-ro/trunk@7357 f3b2605a-c512-4ea7… | Dec 13 2011 | |||
7e6755866f77 | sjplimp | git-svn-id: svn://svn.icms.temple.edu/lammps-ro/trunk@7356 f3b2605a-c512-4ea7… | Dec 13 2011 | |||
37ed3d917e88 | sjplimp | git-svn-id: svn://svn.icms.temple.edu/lammps-ro/trunk@7355 f3b2605a-c512-4ea7… | Dec 13 2011 | |||
ae6318ce2955 | sjplimp | git-svn-id: svn://svn.icms.temple.edu/lammps-ro/trunk@7354 f3b2605a-c512-4ea7… | Dec 13 2011 | |||
b294de40f9f7 | sjplimp | git-svn-id: svn://svn.icms.temple.edu/lammps-ro/trunk@7353 f3b2605a-c512-4ea7… | Dec 13 2011 | |||
eb04caa0548a | sjplimp | git-svn-id: svn://svn.icms.temple.edu/lammps-ro/trunk@7351 f3b2605a-c512-4ea7… | Dec 13 2011 | |||
3870fcb2917a | sjplimp | git-svn-id: svn://svn.icms.temple.edu/lammps-ro/trunk@7350 f3b2605a-c512-4ea7… | Dec 13 2011 | |||
eeb5ad77e617 | sjplimp | git-svn-id: svn://svn.icms.temple.edu/lammps-ro/trunk@7348 f3b2605a-c512-4ea7… | Dec 13 2011 | |||
2f7c6cfb0deb | sjplimp | git-svn-id: svn://svn.icms.temple.edu/lammps-ro/trunk@7347 f3b2605a-c512-4ea7… | Dec 13 2011 | |||
47c30ce47cbf | sjplimp | git-svn-id: svn://svn.icms.temple.edu/lammps-ro/trunk@7346 f3b2605a-c512-4ea7… | Dec 13 2011 | |||
a866ec3edbd8 | sjplimp | git-svn-id: svn://svn.icms.temple.edu/lammps-ro/trunk@7345 f3b2605a-c512-4ea7… | Dec 13 2011 | |||
dfdc3fe1a2d4 | sjplimp | git-svn-id: svn://svn.icms.temple.edu/lammps-ro/trunk@7344 f3b2605a-c512-4ea7… | Dec 13 2011 | |||
3d36d38a5183 | sjplimp | git-svn-id: svn://svn.icms.temple.edu/lammps-ro/trunk@7343 f3b2605a-c512-4ea7… | Dec 13 2011 | |||
9b72a103ea29 | sjplimp | git-svn-id: svn://svn.icms.temple.edu/lammps-ro/trunk@7342 f3b2605a-c512-4ea7… | Dec 13 2011 | |||
8325ae695402 | sjplimp | git-svn-id: svn://svn.icms.temple.edu/lammps-ro/trunk@7341 f3b2605a-c512-4ea7… | Dec 13 2011 | |||
86347b81e32f | sjplimp | git-svn-id: svn://svn.icms.temple.edu/lammps-ro/trunk@7340 f3b2605a-c512-4ea7… | Dec 13 2011 | |||
744efbc2cd5d | sjplimp | git-svn-id: svn://svn.icms.temple.edu/lammps-ro/trunk@7339 f3b2605a-c512-4ea7… | Dec 13 2011 |