fbe0cbe012
add some missing big integer format descriptors
...
synchronize BIGINT definition and format with lmptypes.h
2011-02-01 10:17:39 -05:00
fa493de199
Merge branch 'master' into lammps-icms
...
Conflicts resolved in following files.
lib/gpu/cmm_cut_gpu.cpp
lib/gpu/cmmc_long_gpu.cpp
lib/gpu/gb_gpu.cpp
lib/gpu/gb_gpu_memory.cpp
lib/gpu/lj96_cut_gpu.cpp
lib/gpu/lj_cut_gpu.cpp
lib/gpu/ljc_cut_gpu.cpp
lib/gpu/ljcl_cut_gpu.cpp
lib/gpu/pair_gpu_balance.h
lib/gpu/pair_gpu_device.cpp
lib/gpu/pair_gpu_device.h
src/GPU/fix_gpu.cpp
tools/restart2data.cpp
2011-01-13 13:14:47 -05:00
11e80405e1
git-svn-id: svn://svn.icms.temple.edu/lammps-ro/trunk@5542 f3b2605a-c512-4ea7-a41b-209d697bcdaa
2011-01-12 15:28:26 +00:00
e33cf00fb0
Merge branch 'master' into lammps-icms
2011-01-11 10:40:01 -05:00
663cd083d8
git-svn-id: svn://svn.icms.temple.edu/lammps-ro/trunk@5523 f3b2605a-c512-4ea7-a41b-209d697bcdaa
2011-01-11 00:43:41 +00:00
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
15c856bcaa
git-svn-id: svn://svn.icms.temple.edu/lammps-ro/trunk@5502 f3b2605a-c512-4ea7-a41b-209d697bcdaa
2011-01-07 17:58:43 +00:00
c531b460b4
Merge branch 'master' into lammps-icms
2011-01-05 12:36:24 -05:00
b414a4a22a
git-svn-id: svn://svn.icms.temple.edu/lammps-ro/trunk@5464 f3b2605a-c512-4ea7-a41b-209d697bcdaa
2011-01-04 19:49:15 +00:00
a69ca213b6
git-svn-id: svn://svn.icms.temple.edu/lammps-ro/trunk@5461 f3b2605a-c512-4ea7-a41b-209d697bcdaa
2011-01-04 19:22:15 +00:00
dd111e21d2
git-svn-id: svn://svn.icms.temple.edu/lammps-ro/trunk@5460 f3b2605a-c512-4ea7-a41b-209d697bcdaa
2011-01-04 19:21:40 +00:00
1226d999b4
Merge branch 'master' into lammps-icms
2010-11-25 10:24:09 -05:00
d4ada34579
Merge branch 'master' into lammps-icms
...
merge in gpu pair style update from master.
needed to resolve lots of whitespace conflicts.
2010-11-24 12:31:02 -05:00
d9b78fef10
git-svn-id: svn://svn.icms.temple.edu/lammps-ro/trunk@5293 f3b2605a-c512-4ea7-a41b-209d697bcdaa
2010-11-24 14:10:29 +00:00
8ba792f112
Updating restart2data.cpp to reflect new GPU pair styles --- all changes courtesy of Axel.
...
git-svn-id: svn://svn.icms.temple.edu/lammps-ro/trunk@5292 f3b2605a-c512-4ea7-a41b-209d697bcdaa
2010-11-23 21:28:42 +00:00
a37ad5addf
add support for dpd/tstat
2010-11-23 15:57:15 -05:00
17e6ef5f97
add a missing gayberne/omp entry
2010-11-23 15:37:39 -05:00
dd247a869a
restart2data support for gpu accelerated styles
2010-11-20 15:17:43 -05:00
b6444e36cd
Merge branch 'master' into lammps-icms
2010-11-18 13:29:46 -05:00
c5c8dbbf3f
git-svn-id: svn://svn.icms.temple.edu/lammps-ro/trunk@5251 f3b2605a-c512-4ea7-a41b-209d697bcdaa
2010-11-17 18:44:00 +00:00
b956107fc6
Merge branch 'master' into lammps-icms
2010-10-03 16:52:05 -04:00
a4b092afd8
git-svn-id: svn://svn.icms.temple.edu/lammps-ro/trunk@4801 f3b2605a-c512-4ea7-a41b-209d697bcdaa
2010-09-16 14:19:00 +00:00
e9f7f4813a
Merge branch 'master' into lammps-icms
2010-09-07 10:00:31 -04:00
a133ae5a4a
git-svn-id: svn://svn.icms.temple.edu/lammps-ro/trunk@4703 f3b2605a-c512-4ea7-a41b-209d697bcdaa
2010-09-06 17:21:59 +00:00
39aea46e4c
Merge branch 'master' into lammps-icms
2010-09-01 09:16:29 -04:00
9561f63b07
git-svn-id: svn://svn.icms.temple.edu/lammps-ro/trunk@4632 f3b2605a-c512-4ea7-a41b-209d697bcdaa
2010-08-31 14:41:31 +00:00
049c863a9a
Merge branch 'master' into lammps-icms
2010-08-26 17:54:12 -04:00
74dc9c26f5
git-svn-id: svn://svn.icms.temple.edu/lammps-ro/trunk@4596 f3b2605a-c512-4ea7-a41b-209d697bcdaa
2010-08-25 17:38:29 +00:00
eb09b27064
continue writing data file for certain pair styles
...
if we have a system with pair styles that don't allow
or don't need writing of the parameters to the data
file, don't stop but print a warning and continue.
2010-07-17 20:25:46 -04:00
fc688a5d79
add support for /omp styles to restart2data.cpp
2010-06-04 20:11:55 -04:00
eac7d3358c
added a gauss pair potential as user package.
2010-05-13 13:56:33 -04:00
4b11504052
git-svn-id: svn://svn.icms.temple.edu/lammps-ro/trunk@3687 f3b2605a-c512-4ea7-a41b-209d697bcdaa
2010-01-14 21:26:30 +00:00
5e6ab952f7
git-svn-id: svn://svn.icms.temple.edu/lammps-ro/trunk@3449 f3b2605a-c512-4ea7-a41b-209d697bcdaa
2009-11-30 15:47:56 +00:00
d359806af0
git-svn-id: svn://svn.icms.temple.edu/lammps-ro/trunk@3014 f3b2605a-c512-4ea7-a41b-209d697bcdaa
2009-08-07 14:54:39 +00:00
df77bc9dc2
git-svn-id: svn://svn.icms.temple.edu/lammps-ro/trunk@2961 f3b2605a-c512-4ea7-a41b-209d697bcdaa
2009-07-02 18:03:41 +00:00
d72a4c91d9
git-svn-id: svn://svn.icms.temple.edu/lammps-ro/trunk@2890 f3b2605a-c512-4ea7-a41b-209d697bcdaa
2009-06-22 21:47:30 +00:00
b5f579d0fb
git-svn-id: svn://svn.icms.temple.edu/lammps-ro/trunk@2850 f3b2605a-c512-4ea7-a41b-209d697bcdaa
2009-06-03 20:50:48 +00:00
d288757018
git-svn-id: svn://svn.icms.temple.edu/lammps-ro/trunk@2829 f3b2605a-c512-4ea7-a41b-209d697bcdaa
2009-05-19 15:19:41 +00:00
4c8102c10f
git-svn-id: svn://svn.icms.temple.edu/lammps-ro/trunk@2757 f3b2605a-c512-4ea7-a41b-209d697bcdaa
2009-04-15 13:10:59 +00:00
4b187034de
git-svn-id: svn://svn.icms.temple.edu/lammps-ro/trunk@2672 f3b2605a-c512-4ea7-a41b-209d697bcdaa
2009-03-18 14:35:26 +00:00
f9ba681c5e
git-svn-id: svn://svn.icms.temple.edu/lammps-ro/trunk@2670 f3b2605a-c512-4ea7-a41b-209d697bcdaa
2009-03-18 14:20:41 +00:00
1a510caccb
git-svn-id: svn://svn.icms.temple.edu/lammps-ro/trunk@2543 f3b2605a-c512-4ea7-a41b-209d697bcdaa
2009-01-29 14:56:43 +00:00
b698d94df8
git-svn-id: svn://svn.icms.temple.edu/lammps-ro/trunk@2362 f3b2605a-c512-4ea7-a41b-209d697bcdaa
2009-01-09 18:18:56 +00:00
17092d4799
git-svn-id: svn://svn.icms.temple.edu/lammps-ro/trunk@2356 f3b2605a-c512-4ea7-a41b-209d697bcdaa
2009-01-08 23:48:19 +00:00
2ec25e4cf8
git-svn-id: svn://svn.icms.temple.edu/lammps-ro/trunk@2041 f3b2605a-c512-4ea7-a41b-209d697bcdaa
2008-08-08 14:39:39 +00:00
c48558f297
git-svn-id: svn://svn.icms.temple.edu/lammps-ro/trunk@2040 f3b2605a-c512-4ea7-a41b-209d697bcdaa
2008-08-08 14:28:23 +00:00
c791517e1d
git-svn-id: svn://svn.icms.temple.edu/lammps-ro/trunk@2033 f3b2605a-c512-4ea7-a41b-209d697bcdaa
2008-08-05 23:53:23 +00:00
ad521ad23f
git-svn-id: svn://svn.icms.temple.edu/lammps-ro/trunk@2032 f3b2605a-c512-4ea7-a41b-209d697bcdaa
2008-08-05 23:51:20 +00:00
7ce2faa4ac
git-svn-id: svn://svn.icms.temple.edu/lammps-ro/trunk@1953 f3b2605a-c512-4ea7-a41b-209d697bcdaa
2008-07-16 13:47:20 +00:00
910d982db4
git-svn-id: svn://svn.icms.temple.edu/lammps-ro/trunk@1841 f3b2605a-c512-4ea7-a41b-209d697bcdaa
2008-05-16 22:12:35 +00:00
