Commit Graph

2499 Commits

Author SHA1 Message Date
c931a450c0 Merge remote-tracking branch 'lammps-ro/master' into atc-merge
Resolved Conflicts:
	doc/Manual.txt
	src/USER-ATC/Install.sh
	tools/msi2lmp/biosym_frc_files/README
2013-08-08 14:02:03 +02:00
0ec1c854eb ATC version 2.0, date: Aug7
git-svn-id: svn://svn.icms.temple.edu/lammps-ro/trunk@10563 f3b2605a-c512-4ea7-a41b-209d697bcdaa
2013-08-07 21:35:01 +00:00
53c7162e9e ATC version 2.0, date: Aug7
git-svn-id: svn://svn.icms.temple.edu/lammps-ro/trunk@10559 f3b2605a-c512-4ea7-a41b-209d697bcdaa
2013-08-07 21:29:07 +00:00
2486323112 git-svn-id: svn://svn.icms.temple.edu/lammps-ro/trunk@10554 f3b2605a-c512-4ea7-a41b-209d697bcdaa 2013-08-06 17:35:17 +00:00
20d39d1e8d git-svn-id: svn://svn.icms.temple.edu/lammps-ro/trunk@10552 f3b2605a-c512-4ea7-a41b-209d697bcdaa 2013-08-06 17:34:02 +00:00
addeed415a Merge remote branch 'lammps-ro/master' into lammps-icms
Resolved Conflicts:
	doc/Manual.txt
	src/USER-CUDA/verlet_cuda.cpp
	tools/msi2lmp/test/runtests.sh
2013-08-03 14:20:18 +02:00
a90c188ff9 git-svn-id: svn://svn.icms.temple.edu/lammps-ro/trunk@10529 f3b2605a-c512-4ea7-a41b-209d697bcdaa 2013-08-02 15:23:35 +00:00
9d0e4c010a git-svn-id: svn://svn.icms.temple.edu/lammps-ro/trunk@10527 f3b2605a-c512-4ea7-a41b-209d697bcdaa 2013-08-02 15:23:11 +00:00
2a8b892cc9 git-svn-id: svn://svn.icms.temple.edu/lammps-ro/trunk@10512 f3b2605a-c512-4ea7-a41b-209d697bcdaa 2013-08-02 14:28:45 +00:00
b6012ff420 Merge remote branch 'lammps-ro/master' into lammps-icms 2013-08-02 13:21:49 +02:00
217a0a3b7f git-svn-id: svn://svn.icms.temple.edu/lammps-ro/trunk@10509 f3b2605a-c512-4ea7-a41b-209d697bcdaa 2013-08-01 14:38:21 +00:00
77f06b1dfe Merge remote branch 'lammps-ro/master' into lammps-icms
Resolved Conflicts:
	doc/Manual.txt
	doc/Section_start.txt
	src/citeme.cpp
	src/citeme.h
	src/lammps.cpp
	src/neighbor.cpp
2013-07-31 14:39:31 +02:00
74b4c894a2 git-svn-id: svn://svn.icms.temple.edu/lammps-ro/trunk@10497 f3b2605a-c512-4ea7-a41b-209d697bcdaa 2013-07-30 21:03:20 +00:00
dd08396f75 git-svn-id: svn://svn.icms.temple.edu/lammps-ro/trunk@10496 f3b2605a-c512-4ea7-a41b-209d697bcdaa 2013-07-30 21:01:14 +00:00
927aa02d1d git-svn-id: svn://svn.icms.temple.edu/lammps-ro/trunk@10494 f3b2605a-c512-4ea7-a41b-209d697bcdaa 2013-07-30 20:44:02 +00:00
d388f9d84a git-svn-id: svn://svn.icms.temple.edu/lammps-ro/trunk@10488 f3b2605a-c512-4ea7-a41b-209d697bcdaa 2013-07-30 16:43:47 +00:00
dedb247fcd anticipate patches from upstream to 12 Aug 2013 version 2013-07-30 10:12:29 +02:00
424c14b992 git-svn-id: svn://svn.icms.temple.edu/lammps-ro/trunk@10482 f3b2605a-c512-4ea7-a41b-209d697bcdaa 2013-07-30 00:17:45 +00:00
378ade817c git-svn-id: svn://svn.icms.temple.edu/lammps-ro/trunk@10480 f3b2605a-c512-4ea7-a41b-209d697bcdaa 2013-07-30 00:16:10 +00:00
936efd215e git-svn-id: svn://svn.icms.temple.edu/lammps-ro/trunk@10474 f3b2605a-c512-4ea7-a41b-209d697bcdaa 2013-07-29 20:03:06 +00:00
3445e262ad git-svn-id: svn://svn.icms.temple.edu/lammps-ro/trunk@10469 f3b2605a-c512-4ea7-a41b-209d697bcdaa 2013-07-29 17:36:14 +00:00
33b91864aa git-svn-id: svn://svn.icms.temple.edu/lammps-ro/trunk@10465 f3b2605a-c512-4ea7-a41b-209d697bcdaa 2013-07-29 16:51:50 +00:00
6121f426d3 git-svn-id: svn://svn.icms.temple.edu/lammps-ro/trunk@10461 f3b2605a-c512-4ea7-a41b-209d697bcdaa 2013-07-29 15:15:06 +00:00
32c9412952 document -nocite / -nc command line switch 2013-07-28 23:25:06 +02:00
9550535392 Merge remote branch 'lammps-ro/master' into lammps-icms
Resolved Conflicts:
	doc/Manual.txt
	lib/cuda/Makefile.lammps
	src/GPU/fix_gpu.cpp
2013-07-27 12:34:08 +02:00
f59e0be85c git-svn-id: svn://svn.icms.temple.edu/lammps-ro/trunk@10456 f3b2605a-c512-4ea7-a41b-209d697bcdaa 2013-07-26 21:00:42 +00:00
e2354fbd7f git-svn-id: svn://svn.icms.temple.edu/lammps-ro/trunk@10452 f3b2605a-c512-4ea7-a41b-209d697bcdaa 2013-07-26 20:36:29 +00:00
e207ab1993 git-svn-id: svn://svn.icms.temple.edu/lammps-ro/trunk@10439 f3b2605a-c512-4ea7-a41b-209d697bcdaa 2013-07-26 17:08:56 +00:00
23529a8d6e git-svn-id: svn://svn.icms.temple.edu/lammps-ro/trunk@10438 f3b2605a-c512-4ea7-a41b-209d697bcdaa 2013-07-26 17:07:14 +00:00
5abaf69425 git-svn-id: svn://svn.icms.temple.edu/lammps-ro/trunk@10436 f3b2605a-c512-4ea7-a41b-209d697bcdaa 2013-07-26 17:01:21 +00:00
9b8196cc95 git-svn-id: svn://svn.icms.temple.edu/lammps-ro/trunk@10433 f3b2605a-c512-4ea7-a41b-209d697bcdaa 2013-07-26 16:58:07 +00:00
d54ed85f75 git-svn-id: svn://svn.icms.temple.edu/lammps-ro/trunk@10432 f3b2605a-c512-4ea7-a41b-209d697bcdaa 2013-07-26 16:58:02 +00:00
fa35c123f1 git-svn-id: svn://svn.icms.temple.edu/lammps-ro/trunk@10431 f3b2605a-c512-4ea7-a41b-209d697bcdaa 2013-07-26 16:57:44 +00:00
677384427d add documentation for timers command 2013-07-26 18:44:32 +02:00
0a1c74ef9e git-svn-id: svn://svn.icms.temple.edu/lammps-ro/trunk@10428 f3b2605a-c512-4ea7-a41b-209d697bcdaa 2013-07-26 16:41:07 +00:00
efa18fbd01 git-svn-id: svn://svn.icms.temple.edu/lammps-ro/trunk@10423 f3b2605a-c512-4ea7-a41b-209d697bcdaa 2013-07-26 16:36:26 +00:00
6563ff8b74 git-svn-id: svn://svn.icms.temple.edu/lammps-ro/trunk@10422 f3b2605a-c512-4ea7-a41b-209d697bcdaa 2013-07-26 16:34:16 +00:00
1c078adb8a git-svn-id: svn://svn.icms.temple.edu/lammps-ro/trunk@10421 f3b2605a-c512-4ea7-a41b-209d697bcdaa 2013-07-26 16:32:33 +00:00
560b0fe356 git-svn-id: svn://svn.icms.temple.edu/lammps-ro/trunk@10412 f3b2605a-c512-4ea7-a41b-209d697bcdaa 2013-07-26 15:41:42 +00:00
5e1c01f3bd git-svn-id: svn://svn.icms.temple.edu/lammps-ro/trunk@10407 f3b2605a-c512-4ea7-a41b-209d697bcdaa 2013-07-26 15:35:41 +00:00
7afd7e7d17 git-svn-id: svn://svn.icms.temple.edu/lammps-ro/trunk@10405 f3b2605a-c512-4ea7-a41b-209d697bcdaa 2013-07-26 15:32:21 +00:00
0e292ef2c4 git-svn-id: svn://svn.icms.temple.edu/lammps-ro/trunk@10404 f3b2605a-c512-4ea7-a41b-209d697bcdaa 2013-07-26 15:13:02 +00:00
60e58c44cf Merge remote branch 'lammps-ro/master' into lammps-icms
Resolved Conflicts:
	doc/Manual.txt
2013-07-26 13:15:49 +02:00
d3b876aff9 git-svn-id: svn://svn.icms.temple.edu/lammps-ro/trunk@10398 f3b2605a-c512-4ea7-a41b-209d697bcdaa 2013-07-26 00:01:20 +00:00
43a8d254fa git-svn-id: svn://svn.icms.temple.edu/lammps-ro/trunk@10393 f3b2605a-c512-4ea7-a41b-209d697bcdaa 2013-07-25 23:57:01 +00:00
745ced23a7 git-svn-id: svn://svn.icms.temple.edu/lammps-ro/trunk@10389 f3b2605a-c512-4ea7-a41b-209d697bcdaa 2013-07-25 23:21:11 +00:00
489dceb7e6 git-svn-id: svn://svn.icms.temple.edu/lammps-ro/trunk@10385 f3b2605a-c512-4ea7-a41b-209d697bcdaa 2013-07-25 23:16:06 +00:00
b3ce5149ac git-svn-id: svn://svn.icms.temple.edu/lammps-ro/trunk@10381 f3b2605a-c512-4ea7-a41b-209d697bcdaa 2013-07-25 23:02:07 +00:00
7b31065944 git-svn-id: svn://svn.icms.temple.edu/lammps-ro/trunk@10377 f3b2605a-c512-4ea7-a41b-209d697bcdaa 2013-07-25 22:59:19 +00:00
ddb9f3f4ec git-svn-id: svn://svn.icms.temple.edu/lammps-ro/trunk@10375 f3b2605a-c512-4ea7-a41b-209d697bcdaa 2013-07-25 22:42:41 +00:00