Commit Graph

15739 Commits

Author SHA1 Message Date
607c4aa2a3 Merge remote-tracking branch 'lammps-ro/master' into lammps-icms
# Resolved Conflicts:
#	doc/Manual.html
#	doc/Manual.txt
#	src/USER-SMTBQ/pair_smtbq.cpp
2016-01-12 07:02:29 -05:00
05240f9467 git-svn-id: svn://svn.icms.temple.edu/lammps-ro/trunk@14427 f3b2605a-c512-4ea7-a41b-209d697bcdaa 2016-01-12 00:43:44 +00:00
0da05dcdf4 git-svn-id: svn://svn.icms.temple.edu/lammps-ro/trunk@14426 f3b2605a-c512-4ea7-a41b-209d697bcdaa 2016-01-12 00:29:49 +00:00
20cc9e51cd git-svn-id: svn://svn.icms.temple.edu/lammps-ro/trunk@14425 f3b2605a-c512-4ea7-a41b-209d697bcdaa 2016-01-12 00:13:11 +00:00
4e199dd5bd git-svn-id: svn://svn.icms.temple.edu/lammps-ro/trunk@14424 f3b2605a-c512-4ea7-a41b-209d697bcdaa 2016-01-12 00:12:15 +00:00
12c8aaf29d git-svn-id: svn://svn.icms.temple.edu/lammps-ro/trunk@14423 f3b2605a-c512-4ea7-a41b-209d697bcdaa 2016-01-11 23:38:16 +00:00
681ebfaf8f git-svn-id: svn://svn.icms.temple.edu/lammps-ro/trunk@14422 f3b2605a-c512-4ea7-a41b-209d697bcdaa 2016-01-11 23:34:59 +00:00
e72cef0c3a git-svn-id: svn://svn.icms.temple.edu/lammps-ro/trunk@14421 f3b2605a-c512-4ea7-a41b-209d697bcdaa 2016-01-11 22:00:29 +00:00
e24ed78dd1 git-svn-id: svn://svn.icms.temple.edu/lammps-ro/trunk@14420 f3b2605a-c512-4ea7-a41b-209d697bcdaa 2016-01-11 22:00:15 +00:00
d3f534f5cc git-svn-id: svn://svn.icms.temple.edu/lammps-ro/trunk@14419 f3b2605a-c512-4ea7-a41b-209d697bcdaa 2016-01-11 22:00:09 +00:00
f5946c73f7 git-svn-id: svn://svn.icms.temple.edu/lammps-ro/trunk@14418 f3b2605a-c512-4ea7-a41b-209d697bcdaa 2016-01-11 22:00:04 +00:00
7ae65d4dcf git-svn-id: svn://svn.icms.temple.edu/lammps-ro/trunk@14417 f3b2605a-c512-4ea7-a41b-209d697bcdaa 2016-01-11 22:00:02 +00:00
b5086e3d69 git-svn-id: svn://svn.icms.temple.edu/lammps-ro/trunk@14416 f3b2605a-c512-4ea7-a41b-209d697bcdaa 2016-01-11 21:59:49 +00:00
173d4861a2 git-svn-id: svn://svn.icms.temple.edu/lammps-ro/trunk@14415 f3b2605a-c512-4ea7-a41b-209d697bcdaa 2016-01-11 21:59:38 +00:00
9e4140c954 git-svn-id: svn://svn.icms.temple.edu/lammps-ro/trunk@14413 f3b2605a-c512-4ea7-a41b-209d697bcdaa 2016-01-11 18:57:20 +00:00
eb20bcf183 git-svn-id: svn://svn.icms.temple.edu/lammps-ro/trunk@14412 f3b2605a-c512-4ea7-a41b-209d697bcdaa 2016-01-11 18:56:25 +00:00
eb063200bf git-svn-id: svn://svn.icms.temple.edu/lammps-ro/trunk@14411 f3b2605a-c512-4ea7-a41b-209d697bcdaa 2016-01-11 17:59:15 +00:00
e86cfe431a git-svn-id: svn://svn.icms.temple.edu/lammps-ro/trunk@14410 f3b2605a-c512-4ea7-a41b-209d697bcdaa 2016-01-11 17:58:37 +00:00
51745e2c95 git-svn-id: svn://svn.icms.temple.edu/lammps-ro/trunk@14409 f3b2605a-c512-4ea7-a41b-209d697bcdaa 2016-01-11 16:01:39 +00:00
f5cf3008dd added new (fast/small) test example for PCFF with ignore flag set 2016-01-03 16:21:34 -05:00
7550656ce7 add update dipole flag to nose-hoover integrator for extended particles 2015-12-31 11:57:15 -05:00
b62c955bed incorporate fix for segfault by andrew jewett from lammps-users 2015-12-29 19:07:14 -05:00
52312fdca4 run through cleanup script to fix includes and whitespace 2015-12-24 07:48:29 -05:00
47e8ef8cc7 restore bugfix 2015-12-24 07:47:29 -05:00
b921253f3f fix typo 2015-12-24 07:47:18 -05:00
5e8d04a07f Merge remote-tracking branch 'lammps-ro/master' into lammps-icms
# Resolved Conflicts:
#	doc/Manual.txt
2015-12-24 07:44:16 -05:00
06e04df4e3 git-svn-id: svn://svn.icms.temple.edu/lammps-ro/trunk@14406 f3b2605a-c512-4ea7-a41b-209d697bcdaa 2015-12-24 00:03:25 +00:00
41a026ee14 git-svn-id: svn://svn.icms.temple.edu/lammps-ro/trunk@14405 f3b2605a-c512-4ea7-a41b-209d697bcdaa 2015-12-24 00:02:10 +00:00
ce72ce4e13 git-svn-id: svn://svn.icms.temple.edu/lammps-ro/trunk@14404 f3b2605a-c512-4ea7-a41b-209d697bcdaa 2015-12-24 00:00:27 +00:00
ca0d0dcb63 git-svn-id: svn://svn.icms.temple.edu/lammps-ro/trunk@14402 f3b2605a-c512-4ea7-a41b-209d697bcdaa 2015-12-23 17:23:17 +00:00
f0cd77adef git-svn-id: svn://svn.icms.temple.edu/lammps-ro/trunk@14401 f3b2605a-c512-4ea7-a41b-209d697bcdaa 2015-12-23 17:21:50 +00:00
10c246dddb git-svn-id: svn://svn.icms.temple.edu/lammps-ro/trunk@14400 f3b2605a-c512-4ea7-a41b-209d697bcdaa 2015-12-23 17:21:36 +00:00
57dc7d32d4 git-svn-id: svn://svn.icms.temple.edu/lammps-ro/trunk@14399 f3b2605a-c512-4ea7-a41b-209d697bcdaa 2015-12-23 17:07:47 +00:00
29b4d60141 git-svn-id: svn://svn.icms.temple.edu/lammps-ro/trunk@14398 f3b2605a-c512-4ea7-a41b-209d697bcdaa 2015-12-23 17:04:56 +00:00
2f02c1c94c Merge remote-tracking branch 'lammps-ro/master' into lammps-icms 2015-12-23 09:24:25 -05:00
202bc7b713 Added comment about momentum under NPT
git-svn-id: svn://svn.icms.temple.edu/lammps-ro/trunk@14397 f3b2605a-c512-4ea7-a41b-209d697bcdaa
2015-12-23 01:40:29 +00:00
ca9b0adad7 Adding changes from Mike Brown to USER-INTEL for gcc compatibility
git-svn-id: svn://svn.icms.temple.edu/lammps-ro/trunk@14396 f3b2605a-c512-4ea7-a41b-209d697bcdaa
2015-12-22 20:16:56 +00:00
81f9f74d8e Merge remote-tracking branch 'lammps-ro/master' into lammps-icms
# Resolved Conflicts:
#	doc/Manual.txt
#	doc/pair_reax.html
2015-12-22 07:49:35 -05:00
4a4f7b7554 incorporate support for ziggurat method into RanMT 2015-12-21 15:54:49 -05:00
0fd57a6fe4 git-svn-id: svn://svn.icms.temple.edu/lammps-ro/trunk@14395 f3b2605a-c512-4ea7-a41b-209d697bcdaa 2015-12-21 16:44:00 +00:00
95cf453456 fix bug in read_dump reported on lammps-users today 2015-12-21 11:02:10 -05:00
6f10e999c9 git-svn-id: svn://svn.icms.temple.edu/lammps-ro/trunk@14394 f3b2605a-c512-4ea7-a41b-209d697bcdaa 2015-12-21 15:20:41 +00:00
490401bd6a Merge remote-tracking branch 'lammps-ro/master' into lammps-icms
# Resolved Conflicts:
#	doc/Manual.txt
#	doc/pair_reax.html
2015-12-20 20:06:45 -05:00
0656a3e0b5 git-svn-id: svn://svn.icms.temple.edu/lammps-ro/trunk@14392 f3b2605a-c512-4ea7-a41b-209d697bcdaa 2015-12-19 18:43:03 +00:00
e2ec56c171 git-svn-id: svn://svn.icms.temple.edu/lammps-ro/trunk@14391 f3b2605a-c512-4ea7-a41b-209d697bcdaa 2015-12-19 18:42:24 +00:00
2926854b8d git-svn-id: svn://svn.icms.temple.edu/lammps-ro/trunk@14390 f3b2605a-c512-4ea7-a41b-209d697bcdaa 2015-12-19 18:32:29 +00:00
df8b58a8c6 git-svn-id: svn://svn.icms.temple.edu/lammps-ro/trunk@14389 f3b2605a-c512-4ea7-a41b-209d697bcdaa 2015-12-19 18:32:22 +00:00
528053b65f git-svn-id: svn://svn.icms.temple.edu/lammps-ro/trunk@14388 f3b2605a-c512-4ea7-a41b-209d697bcdaa 2015-12-19 18:31:40 +00:00
15063188b8 git-svn-id: svn://svn.icms.temple.edu/lammps-ro/trunk@14387 f3b2605a-c512-4ea7-a41b-209d697bcdaa 2015-12-19 18:31:14 +00:00
72ebb1dd9b git-svn-id: svn://svn.icms.temple.edu/lammps-ro/trunk@14386 f3b2605a-c512-4ea7-a41b-209d697bcdaa 2015-12-19 18:30:53 +00:00