Commit Graph

11797 Commits

Author SHA1 Message Date
eb42e19e53 document support for fix property/atom in fix store/state 2014-07-24 13:11:59 -04:00
512038de6f Merge remote-tracking branch 'lammps-ro/master' into lammps-icms
Resolved Conflicts:
	doc/Manual.html
	doc/Manual.txt
2014-07-24 13:11:31 -04:00
f01d9363e7 git-svn-id: svn://svn.icms.temple.edu/lammps-ro/trunk@12197 f3b2605a-c512-4ea7-a41b-209d697bcdaa 2014-07-22 22:52:44 +00:00
6760d0dd57 git-svn-id: svn://svn.icms.temple.edu/lammps-ro/trunk@12196 f3b2605a-c512-4ea7-a41b-209d697bcdaa 2014-07-22 22:52:38 +00:00
76f04f7683 git-svn-id: svn://svn.icms.temple.edu/lammps-ro/trunk@12195 f3b2605a-c512-4ea7-a41b-209d697bcdaa 2014-07-22 22:52:28 +00:00
887151262e git-svn-id: svn://svn.icms.temple.edu/lammps-ro/trunk@12194 f3b2605a-c512-4ea7-a41b-209d697bcdaa 2014-07-22 22:52:19 +00:00
e9a0ca6dca git-svn-id: svn://svn.icms.temple.edu/lammps-ro/trunk@12193 f3b2605a-c512-4ea7-a41b-209d697bcdaa 2014-07-22 18:31:33 +00:00
20ddf0396d git-svn-id: svn://svn.icms.temple.edu/lammps-ro/trunk@12192 f3b2605a-c512-4ea7-a41b-209d697bcdaa 2014-07-22 18:28:46 +00:00
209d18aea3 git-svn-id: svn://svn.icms.temple.edu/lammps-ro/trunk@12190 f3b2605a-c512-4ea7-a41b-209d697bcdaa 2014-07-22 17:53:46 +00:00
6640abfc6c git-svn-id: svn://svn.icms.temple.edu/lammps-ro/trunk@12189 f3b2605a-c512-4ea7-a41b-209d697bcdaa 2014-07-22 17:53:45 +00:00
6bb86c2d52 git-svn-id: svn://svn.icms.temple.edu/lammps-ro/trunk@12188 f3b2605a-c512-4ea7-a41b-209d697bcdaa 2014-07-22 16:01:12 +00:00
1a2996c6a6 git-svn-id: svn://svn.icms.temple.edu/lammps-ro/trunk@12187 f3b2605a-c512-4ea7-a41b-209d697bcdaa 2014-07-22 16:01:00 +00:00
4c3539e9ff git-svn-id: svn://svn.icms.temple.edu/lammps-ro/trunk@12186 f3b2605a-c512-4ea7-a41b-209d697bcdaa 2014-07-22 14:38:28 +00:00
68859c0191 Merge remote-tracking branch 'lammps-ro/master' into lammps-icms 2014-07-21 18:46:10 -04:00
b2cb1b3572 enable storing custom per atom properties in fix store/state 2014-07-21 18:45:28 -04:00
70a5d02c8d git-svn-id: svn://svn.icms.temple.edu/lammps-ro/trunk@12185 f3b2605a-c512-4ea7-a41b-209d697bcdaa 2014-07-14 16:10:59 +00:00
11c32cb8d4 Merge remote-tracking branch 'lammps-ro/master' into lammps-icms
Resolved Conflicts:
	doc/Manual.html
	doc/Manual.txt
2014-07-14 11:43:52 -04:00
164832591d git-svn-id: svn://svn.icms.temple.edu/lammps-ro/trunk@12183 f3b2605a-c512-4ea7-a41b-209d697bcdaa 2014-07-11 22:12:46 +00:00
331fe9b10b git-svn-id: svn://svn.icms.temple.edu/lammps-ro/trunk@12182 f3b2605a-c512-4ea7-a41b-209d697bcdaa 2014-07-11 22:12:45 +00:00
0d4c0446b7 git-svn-id: svn://svn.icms.temple.edu/lammps-ro/trunk@12181 f3b2605a-c512-4ea7-a41b-209d697bcdaa 2014-07-11 22:10:48 +00:00
94007ab875 git-svn-id: svn://svn.icms.temple.edu/lammps-ro/trunk@12180 f3b2605a-c512-4ea7-a41b-209d697bcdaa 2014-07-11 22:06:44 +00:00
97bbff4614 update htmldoc input for change in communication commands 2014-07-11 14:04:14 -04:00
d1d077924f replace non-ASCII characters with non-accented versions 2014-07-11 14:03:36 -04:00
8e9c910d8c Merge remote-tracking branch 'lammps-ro/master' into lammps-icms 2014-07-11 13:06:47 -04:00
f89510ab88 git-svn-id: svn://svn.icms.temple.edu/lammps-ro/trunk@12179 f3b2605a-c512-4ea7-a41b-209d697bcdaa 2014-07-10 22:16:47 +00:00
0d6a8c5e67 git-svn-id: svn://svn.icms.temple.edu/lammps-ro/trunk@12178 f3b2605a-c512-4ea7-a41b-209d697bcdaa 2014-07-10 21:06:57 +00:00
7e875a1ef3 git-svn-id: svn://svn.icms.temple.edu/lammps-ro/trunk@12177 f3b2605a-c512-4ea7-a41b-209d697bcdaa 2014-07-10 19:38:32 +00:00
33186b6ad4 git-svn-id: svn://svn.icms.temple.edu/lammps-ro/trunk@12176 f3b2605a-c512-4ea7-a41b-209d697bcdaa 2014-07-10 17:25:44 +00:00
b69c0f4ac5 git-svn-id: svn://svn.icms.temple.edu/lammps-ro/trunk@12174 f3b2605a-c512-4ea7-a41b-209d697bcdaa 2014-07-09 17:42:16 +00:00
1ed2f052c7 Merge remote-tracking branch 'lammps-ro/master' into lammps-icms 2014-07-08 09:03:06 -04:00
3b9563910e git-svn-id: svn://svn.icms.temple.edu/lammps-ro/trunk@12173 f3b2605a-c512-4ea7-a41b-209d697bcdaa 2014-07-07 19:19:55 +00:00
5490ec615d git-svn-id: svn://svn.icms.temple.edu/lammps-ro/trunk@12172 f3b2605a-c512-4ea7-a41b-209d697bcdaa 2014-07-07 19:19:40 +00:00
1c6cac8ae5 Merge remote-tracking branch 'lammps-ro/master' into lammps-icms
Resolved Conflicts:
	lib/gpu/lal_coul.cu
	lib/gpu/lal_coul_debye.cu
2014-07-06 21:57:06 -04:00
ff01a109a1 git-svn-id: svn://svn.icms.temple.edu/lammps-ro/trunk@12171 f3b2605a-c512-4ea7-a41b-209d697bcdaa 2014-07-03 13:18:49 +00:00
a4edae13ae git-svn-id: svn://svn.icms.temple.edu/lammps-ro/trunk@12170 f3b2605a-c512-4ea7-a41b-209d697bcdaa 2014-07-03 13:15:37 +00:00
b5d89cd768 git-svn-id: svn://svn.icms.temple.edu/lammps-ro/trunk@12169 f3b2605a-c512-4ea7-a41b-209d697bcdaa 2014-07-02 20:53:37 +00:00
0553f4af2b git-svn-id: svn://svn.icms.temple.edu/lammps-ro/trunk@12168 f3b2605a-c512-4ea7-a41b-209d697bcdaa 2014-07-02 14:30:06 +00:00
a44e538ac6 transfer changes from upstream to USER-OMP version 2014-07-01 12:50:40 -04:00
29ae4bd8dc Merge remote-tracking branch 'lammps-ro/master' into lammps-icms
Resolved Conflicts:
	doc/Manual.html
	doc/Manual.txt
	lib/cuda/Makefile.lammps
	lib/gpu/lal_coul_long.cu
	src/VORONOI/compute_voronoi_atom.cpp
	src/version.h
2014-07-01 12:08:09 -04:00
74d63800ab git-svn-id: svn://svn.icms.temple.edu/lammps-ro/trunk@12164 f3b2605a-c512-4ea7-a41b-209d697bcdaa r12164 2014-06-27 23:49:56 +00:00
dae378a368 git-svn-id: svn://svn.icms.temple.edu/lammps-ro/trunk@12163 f3b2605a-c512-4ea7-a41b-209d697bcdaa 2014-06-27 23:49:56 +00:00
a5856e9d3e git-svn-id: svn://svn.icms.temple.edu/lammps-ro/trunk@12162 f3b2605a-c512-4ea7-a41b-209d697bcdaa 2014-06-27 23:46:07 +00:00
5b6c04fd5f git-svn-id: svn://svn.icms.temple.edu/lammps-ro/trunk@12161 f3b2605a-c512-4ea7-a41b-209d697bcdaa 2014-06-27 23:45:47 +00:00
0c68c7f328 git-svn-id: svn://svn.icms.temple.edu/lammps-ro/trunk@12160 f3b2605a-c512-4ea7-a41b-209d697bcdaa 2014-06-27 23:45:33 +00:00
c8bbcb34de git-svn-id: svn://svn.icms.temple.edu/lammps-ro/trunk@12159 f3b2605a-c512-4ea7-a41b-209d697bcdaa 2014-06-27 23:44:32 +00:00
f939beaf31 git-svn-id: svn://svn.icms.temple.edu/lammps-ro/trunk@12158 f3b2605a-c512-4ea7-a41b-209d697bcdaa 2014-06-27 23:41:00 +00:00
7872ffe797 git-svn-id: svn://svn.icms.temple.edu/lammps-ro/trunk@12157 f3b2605a-c512-4ea7-a41b-209d697bcdaa 2014-06-27 23:28:02 +00:00
a2dfb8421e git-svn-id: svn://svn.icms.temple.edu/lammps-ro/trunk@12155 f3b2605a-c512-4ea7-a41b-209d697bcdaa 2014-06-27 19:41:51 +00:00
5889855861 git-svn-id: svn://svn.icms.temple.edu/lammps-ro/trunk@12154 f3b2605a-c512-4ea7-a41b-209d697bcdaa 2014-06-27 19:41:50 +00:00
18e1a56f6f git-svn-id: svn://svn.icms.temple.edu/lammps-ro/trunk@12153 f3b2605a-c512-4ea7-a41b-209d697bcdaa 2014-06-27 19:41:37 +00:00