Commit Graph

12 Commits

Author SHA1 Message Date
78b0055319 Merge branch 'ak-fix' into openmp-step2
Resolved Conflicts:
	src/COLLOID/pair_colloid.cpp
	src/pair_table.cpp
2011-09-24 13:55:42 -04:00
19e8c92a90 git-svn-id: svn://svn.icms.temple.edu/lammps-ro/trunk@7003 f3b2605a-c512-4ea7-a41b-209d697bcdaa 2011-09-23 18:06:55 +00:00
488eca7165 implemented improved timer class 2011-08-26 18:39:14 -04:00
aedbb28b6c git-svn-id: svn://svn.icms.temple.edu/lammps-ro/trunk@6486 f3b2605a-c512-4ea7-a41b-209d697bcdaa 2011-06-30 20:10:18 +00:00
d51c47d9ab git-svn-id: svn://svn.icms.temple.edu/lammps-ro/trunk@5705 f3b2605a-c512-4ea7-a41b-209d697bcdaa 2011-02-22 22:09:18 +00:00
82ec94916d git-svn-id: svn://svn.icms.temple.edu/lammps-ro/trunk@5520 f3b2605a-c512-4ea7-a41b-209d697bcdaa 2011-01-11 00:41:00 +00:00
2b8ae7a82f Added tad example
git-svn-id: svn://svn.icms.temple.edu/lammps-ro/trunk@5477 f3b2605a-c512-4ea7-a41b-209d697bcdaa
2011-01-05 00:30:27 +00:00
c0ca611a19 git-svn-id: svn://svn.icms.temple.edu/lammps-ro/trunk@5451 f3b2605a-c512-4ea7-a41b-209d697bcdaa 2011-01-03 22:42:04 +00:00
b511a75575 git-svn-id: svn://svn.icms.temple.edu/lammps-ro/trunk@5217 f3b2605a-c512-4ea7-a41b-209d697bcdaa 2010-11-05 15:57:43 +00:00
f97280116a git-svn-id: svn://svn.icms.temple.edu/lammps-ro/trunk@4915 f3b2605a-c512-4ea7-a41b-209d697bcdaa 2010-09-30 22:28:15 +00:00
653d41ec75 git-svn-id: svn://svn.icms.temple.edu/lammps-ro/trunk@4914 f3b2605a-c512-4ea7-a41b-209d697bcdaa 2010-09-30 21:43:11 +00:00
c40b3cb2a8 git-svn-id: svn://svn.icms.temple.edu/lammps-ro/trunk@4906 f3b2605a-c512-4ea7-a41b-209d697bcdaa 2010-09-30 18:20:52 +00:00