Commit Graph

11 Commits

Author SHA1 Message Date
5d70f4a0d0 restore temporarily removed geryon update 2014-10-13 19:08:56 -04:00
7235c337d2 remove additional code from mike brown that was in his bitbucket repo 2014-10-13 16:15:20 -04:00
39b1597778 Merge remote-tracking branch 'lammps-ro/master' into lammps-icms
Resolved Conflicts:
	doc/Manual.txt
	src/RIGID/fix_shake.cpp
	src/variable.cpp
	src/write_data.cpp
2014-01-26 21:35:32 -05:00
28194a14eb git-svn-id: svn://svn.icms.temple.edu/lammps-ro/trunk@11335 f3b2605a-c512-4ea7-a41b-209d697bcdaa 2014-01-25 23:53:12 +00:00
0cff15d30c Adding intel tuning options for OpenCL builds. Changing 'GPU' to 'Device' in output. Turning off timer output when timers not available for
clenqueuemarker..
2013-10-06 15:14:07 +02:00
402d1a8605 git-svn-id: svn://svn.icms.temple.edu/lammps-ro/trunk@10667 f3b2605a-c512-4ea7-a41b-209d697bcdaa 2013-08-23 14:41:20 +00:00
c8624bc7eb git-svn-id: svn://svn.icms.temple.edu/lammps-ro/trunk@9175 f3b2605a-c512-4ea7-a41b-209d697bcdaa 2013-01-02 16:27:31 +00:00
209999068c git-svn-id: svn://svn.icms.temple.edu/lammps-ro/trunk@8810 f3b2605a-c512-4ea7-a41b-209d697bcdaa 2012-09-21 15:57:23 +00:00
31551d81fd git-svn-id: svn://svn.icms.temple.edu/lammps-ro/trunk@8693 f3b2605a-c512-4ea7-a41b-209d697bcdaa 2012-08-21 13:57:32 +00:00
6b1774dc20 git-svn-id: svn://svn.icms.temple.edu/lammps-ro/trunk@7575 f3b2605a-c512-4ea7-a41b-209d697bcdaa 2012-01-25 15:31:54 +00:00
7837edd51f git-svn-id: svn://svn.icms.temple.edu/lammps-ro/trunk@7281 f3b2605a-c512-4ea7-a41b-209d697bcdaa 2011-12-02 16:02:36 +00:00