Commit Graph

9626 Commits

Author SHA1 Message Date
bbde2c4a81 incorporate print levels into output in finish. 2013-07-26 18:40:19 +02:00
ab8c4854ba make the timer code handle the various flags as expected 2013-07-26 16:51:43 +02:00
7606acc6e5 missed a change to compile on the new branch 2013-07-26 15:41:37 +02:00
8e91a7e6cd Merge branch 'lammps-icms' into unified-timer 2013-07-26 14:52:01 +02:00
8358adc964 modify_cuda depends on style_computeh and its .d needs to be updated 2013-07-26 13:44:07 +02:00
60e58c44cf Merge remote branch 'lammps-ro/master' into lammps-icms
Resolved Conflicts:
	doc/Manual.txt
2013-07-26 13:15:49 +02:00
434c695e39 re-instate Makefile.lammps 2013-07-26 11:40:02 +02:00
e6f6722365 make USER-CUDA compile with current LAMMPS-ICMS 2013-07-26 11:02:01 +02:00
e131e2a141 make sure everything compiles again 2013-07-26 09:09:08 +02:00
8a9817c5d6 bugfixes and cleanup in the timers command 2013-07-26 09:01:30 +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
921d24c0f8 git-svn-id: svn://svn.icms.temple.edu/lammps-ro/trunk@10397 f3b2605a-c512-4ea7-a41b-209d697bcdaa 2013-07-26 00:01:19 +00:00
7d3d8b5b9d git-svn-id: svn://svn.icms.temple.edu/lammps-ro/trunk@10395 f3b2605a-c512-4ea7-a41b-209d697bcdaa 2013-07-25 23:59:16 +00:00
026a04e4f1 git-svn-id: svn://svn.icms.temple.edu/lammps-ro/trunk@10394 f3b2605a-c512-4ea7-a41b-209d697bcdaa 2013-07-25 23:58:07 +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
609842916c git-svn-id: svn://svn.icms.temple.edu/lammps-ro/trunk@10392 f3b2605a-c512-4ea7-a41b-209d697bcdaa 2013-07-25 23:52:14 +00:00
6cc90ecca2 git-svn-id: svn://svn.icms.temple.edu/lammps-ro/trunk@10391 f3b2605a-c512-4ea7-a41b-209d697bcdaa 2013-07-25 23:51:47 +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
2ef83a7442 git-svn-id: svn://svn.icms.temple.edu/lammps-ro/trunk@10388 f3b2605a-c512-4ea7-a41b-209d697bcdaa 2013-07-25 23:21:10 +00:00
38305bf20c git-svn-id: svn://svn.icms.temple.edu/lammps-ro/trunk@10387 f3b2605a-c512-4ea7-a41b-209d697bcdaa 2013-07-25 23:17:16 +00:00
da8124b43b git-svn-id: svn://svn.icms.temple.edu/lammps-ro/trunk@10386 f3b2605a-c512-4ea7-a41b-209d697bcdaa 2013-07-25 23:17: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
4bde9638de git-svn-id: svn://svn.icms.temple.edu/lammps-ro/trunk@10384 f3b2605a-c512-4ea7-a41b-209d697bcdaa 2013-07-25 23:12:53 +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
e5b54caa95 git-svn-id: svn://svn.icms.temple.edu/lammps-ro/trunk@10380 f3b2605a-c512-4ea7-a41b-209d697bcdaa 2013-07-25 23:02:06 +00:00
d348e525e8 git-svn-id: svn://svn.icms.temple.edu/lammps-ro/trunk@10378 f3b2605a-c512-4ea7-a41b-209d697bcdaa 2013-07-25 22:59:29 +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
476c0a0a30 git-svn-id: svn://svn.icms.temple.edu/lammps-ro/trunk@10374 f3b2605a-c512-4ea7-a41b-209d697bcdaa 2013-07-25 22:42:40 +00:00
5642cae07b git-svn-id: svn://svn.icms.temple.edu/lammps-ro/trunk@10372 f3b2605a-c512-4ea7-a41b-209d697bcdaa 2013-07-25 22:38:36 +00:00
ea122c8016 git-svn-id: svn://svn.icms.temple.edu/lammps-ro/trunk@10371 f3b2605a-c512-4ea7-a41b-209d697bcdaa 2013-07-25 22:38:11 +00:00
a66131ef17 git-svn-id: svn://svn.icms.temple.edu/lammps-ro/trunk@10370 f3b2605a-c512-4ea7-a41b-209d697bcdaa 2013-07-25 22:34:35 +00:00
f6b6aeb0dc git-svn-id: svn://svn.icms.temple.edu/lammps-ro/trunk@10369 f3b2605a-c512-4ea7-a41b-209d697bcdaa 2013-07-25 22:31:49 +00:00
2bbf3f1ef7 git-svn-id: svn://svn.icms.temple.edu/lammps-ro/trunk@10368 f3b2605a-c512-4ea7-a41b-209d697bcdaa 2013-07-25 22:30:28 +00:00
28a774a70b git-svn-id: svn://svn.icms.temple.edu/lammps-ro/trunk@10367 f3b2605a-c512-4ea7-a41b-209d697bcdaa 2013-07-25 22:30:22 +00:00
87b941f250 git-svn-id: svn://svn.icms.temple.edu/lammps-ro/trunk@10366 f3b2605a-c512-4ea7-a41b-209d697bcdaa 2013-07-25 22:26:18 +00:00
dea3df948e git-svn-id: svn://svn.icms.temple.edu/lammps-ro/trunk@10365 f3b2605a-c512-4ea7-a41b-209d697bcdaa 2013-07-25 22:25:38 +00:00
a26ee56443 git-svn-id: svn://svn.icms.temple.edu/lammps-ro/trunk@10364 f3b2605a-c512-4ea7-a41b-209d697bcdaa 2013-07-25 22:21:01 +00:00
be3847ff31 git-svn-id: svn://svn.icms.temple.edu/lammps-ro/trunk@10363 f3b2605a-c512-4ea7-a41b-209d697bcdaa 2013-07-25 22:03:32 +00:00
de94416d02 git-svn-id: svn://svn.icms.temple.edu/lammps-ro/trunk@10361 f3b2605a-c512-4ea7-a41b-209d697bcdaa 2013-07-25 21:56:30 +00:00
6715450f06 git-svn-id: svn://svn.icms.temple.edu/lammps-ro/trunk@10360 f3b2605a-c512-4ea7-a41b-209d697bcdaa 2013-07-25 21:56:29 +00:00
fadc25d704 git-svn-id: svn://svn.icms.temple.edu/lammps-ro/trunk@10359 f3b2605a-c512-4ea7-a41b-209d697bcdaa 2013-07-25 21:54:22 +00:00
9f07d255bf git-svn-id: svn://svn.icms.temple.edu/lammps-ro/trunk@10358 f3b2605a-c512-4ea7-a41b-209d697bcdaa 2013-07-25 21:53:48 +00:00
dcc4d8a01b git-svn-id: svn://svn.icms.temple.edu/lammps-ro/trunk@10356 f3b2605a-c512-4ea7-a41b-209d697bcdaa 2013-07-25 21:03:04 +00:00
1b02a37d2f git-svn-id: svn://svn.icms.temple.edu/lammps-ro/trunk@10355 f3b2605a-c512-4ea7-a41b-209d697bcdaa 2013-07-25 21:03:03 +00:00
2efedae09e git-svn-id: svn://svn.icms.temple.edu/lammps-ro/trunk@10354 f3b2605a-c512-4ea7-a41b-209d697bcdaa 2013-07-25 20:59:36 +00:00
3503b9c828 git-svn-id: svn://svn.icms.temple.edu/lammps-ro/trunk@10353 f3b2605a-c512-4ea7-a41b-209d697bcdaa 2013-07-25 20:34:30 +00:00
28dcb90c7b git-svn-id: svn://svn.icms.temple.edu/lammps-ro/trunk@10352 f3b2605a-c512-4ea7-a41b-209d697bcdaa 2013-07-25 20:32:40 +00:00
328cbc4db9 git-svn-id: svn://svn.icms.temple.edu/lammps-ro/trunk@10351 f3b2605a-c512-4ea7-a41b-209d697bcdaa 2013-07-25 20:24:46 +00:00
48510d047b git-svn-id: svn://svn.icms.temple.edu/lammps-ro/trunk@10350 f3b2605a-c512-4ea7-a41b-209d697bcdaa 2013-07-25 19:47:41 +00:00