a47e493dfd
Merge branch 'master' into lammps-icms
...
Conflicts resolved in:
doc/Section_commands.html
src/USER-IMD/fix_imd.cpp
src/finish.cpp
2011-01-10 10:06:21 -05:00
140cdf9485
git-svn-id: svn://svn.icms.temple.edu/lammps-ro/trunk@5504 f3b2605a-c512-4ea7-a41b-209d697bcdaa
2011-01-07 21:42:19 +00:00
5aa419d3d3
Merge branch 'master' into lammps-icms
2011-01-07 09:28:18 -05:00
01db59bea3
git-svn-id: svn://svn.icms.temple.edu/lammps-ro/trunk@5498 f3b2605a-c512-4ea7-a41b-209d697bcdaa
2011-01-06 23:23:37 +00:00
582ce0423f
Merge branch 'master' into lammps-icms
2011-01-06 12:14:18 -05:00
c531b460b4
Merge branch 'master' into lammps-icms
2011-01-05 12:36:24 -05:00
e8ca445bfe
git-svn-id: svn://svn.icms.temple.edu/lammps-ro/trunk@5478 f3b2605a-c512-4ea7-a41b-209d697bcdaa
2011-01-05 15:39:37 +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
55e8b2bee6
git-svn-id: svn://svn.icms.temple.edu/lammps-ro/trunk@5476 f3b2605a-c512-4ea7-a41b-209d697bcdaa
2011-01-05 00:29:35 +00:00
d5aa03447b
git-svn-id: svn://svn.icms.temple.edu/lammps-ro/trunk@5457 f3b2605a-c512-4ea7-a41b-209d697bcdaa
2011-01-04 19:12:58 +00:00
3a2e71771f
print extendend statistics only after one step
2010-12-13 06:39:12 -05:00
7e8e577a3e
fix indentation
2010-11-28 20:38:53 -05:00
6818800ee7
add final info about timing more similar to NAMD.
2010-11-28 20:26:36 -05:00
c2ac3c93c3
Merge branch 'master' into lammps-icms
2010-11-04 18:29:40 -04:00
39efc7e491
git-svn-id: svn://svn.icms.temple.edu/lammps-ro/trunk@5054 f3b2605a-c512-4ea7-a41b-209d697bcdaa
2010-10-18 15:47:12 +00:00
640ba39da4
Merge branch 'master' into lammps-icms
...
Resolved conflict with user gauss,
by keeping the simpler gauss pair style.
and the special gauss pair style only in
the /omp version. temporary changes are
stashed away.
2010-10-15 14:25:38 -04:00
46a1a3b66e
Made full neighbor list histogram report work when nlocal is zero for some procs
...
git-svn-id: svn://svn.icms.temple.edu/lammps-ro/trunk@5050 f3b2605a-c512-4ea7-a41b-209d697bcdaa
2010-10-14 17:54:00 +00:00
d80c13054b
Merge branch 'master' into lammps-icms
2010-08-20 09:31:32 -04:00
41d9b859e4
git-svn-id: svn://svn.icms.temple.edu/lammps-ro/trunk@4526 f3b2605a-c512-4ea7-a41b-209d697bcdaa
2010-08-19 19:39:58 +00:00
9272bcd98a
Merge branch 'master' into lammps-icms
2010-06-29 08:52:15 -04:00
d71b088457
git-svn-id: svn://svn.icms.temple.edu/lammps-ro/trunk@4355 f3b2605a-c512-4ea7-a41b-209d697bcdaa
2010-06-28 22:06:53 +00:00
731c14befb
print proper number of processors with OpenMP/MPI.
2010-06-26 18:40:44 -04:00
6708220211
print thread status at the end of a loop.
2010-04-28 19:33:43 -04:00
32adc325aa
git-svn-id: svn://svn.icms.temple.edu/lammps-ro/trunk@3295 f3b2605a-c512-4ea7-a41b-209d697bcdaa
2009-11-02 20:59:26 +00:00
c01b4e016c
git-svn-id: svn://svn.icms.temple.edu/lammps-ro/trunk@3117 f3b2605a-c512-4ea7-a41b-209d697bcdaa
2009-08-21 19:05:42 +00:00
5986c9042c
git-svn-id: svn://svn.icms.temple.edu/lammps-ro/trunk@3098 f3b2605a-c512-4ea7-a41b-209d697bcdaa
2009-08-18 17:57:27 +00:00
7732b4f0c2
git-svn-id: svn://svn.icms.temple.edu/lammps-ro/trunk@2051 f3b2605a-c512-4ea7-a41b-209d697bcdaa
2008-08-13 14:39:45 +00:00
b1181dd900
git-svn-id: svn://svn.icms.temple.edu/lammps-ro/trunk@1743 f3b2605a-c512-4ea7-a41b-209d697bcdaa
2008-04-14 20:50:48 +00:00
d39a8de8ab
git-svn-id: svn://svn.icms.temple.edu/lammps-ro/trunk@1422 f3b2605a-c512-4ea7-a41b-209d697bcdaa
2008-01-24 22:30:58 +00:00
4eb4e838ee
git-svn-id: svn://svn.icms.temple.edu/lammps-ro/trunk@1177 f3b2605a-c512-4ea7-a41b-209d697bcdaa
2007-11-19 16:32:34 +00:00
ed9ce73904
git-svn-id: svn://svn.icms.temple.edu/lammps-ro/trunk@954 f3b2605a-c512-4ea7-a41b-209d697bcdaa
2007-10-04 23:59:26 +00:00
9be7620ace
git-svn-id: svn://svn.icms.temple.edu/lammps-ro/trunk@937 f3b2605a-c512-4ea7-a41b-209d697bcdaa
2007-10-03 16:22:30 +00:00
209f169cbc
git-svn-id: svn://svn.icms.temple.edu/lammps-ro/trunk@254 f3b2605a-c512-4ea7-a41b-209d697bcdaa
2007-01-30 00:22:05 +00:00
222c95507e
git-svn-id: svn://svn.icms.temple.edu/lammps-ro/trunk@26 f3b2605a-c512-4ea7-a41b-209d697bcdaa
2006-09-27 19:51:33 +00:00
