Commit Graph

4323 Commits

Author SHA1 Message Date
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
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
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
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
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
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
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
50c38d8866 Merge remote-tracking branch 'lammps-ro/master' into lammps-icms 2015-12-18 07:15:45 -05:00
e37c9faf05 git-svn-id: svn://svn.icms.temple.edu/lammps-ro/trunk@14380 f3b2605a-c512-4ea7-a41b-209d697bcdaa 2015-12-17 23:05:03 +00:00
1aeecfb0cf Merge remote-tracking branch 'lammps-ro/master' into lammps-icms
# Resolved Conflicts:
#	doc/Manual.txt
#	doc/pair_reax.html
#	src/USER-PHONON/fix_phonon.cpp
2015-12-16 07:31:09 -05:00
9e3b61d926 git-svn-id: svn://svn.icms.temple.edu/lammps-ro/trunk@14376 f3b2605a-c512-4ea7-a41b-209d697bcdaa 2015-12-15 23:32:24 +00:00
f3af23a41b git-svn-id: svn://svn.icms.temple.edu/lammps-ro/trunk@14375 f3b2605a-c512-4ea7-a41b-209d697bcdaa 2015-12-15 23:31:16 +00:00
75de12f26a git-svn-id: svn://svn.icms.temple.edu/lammps-ro/trunk@14365 f3b2605a-c512-4ea7-a41b-209d697bcdaa 2015-12-15 15:49:29 +00:00
9195c252ee Merge remote-tracking branch 'lammps-ro/master' into lammps-icms 2015-12-12 08:04:57 -05:00
b7b610f3b9 git-svn-id: svn://svn.icms.temple.edu/lammps-ro/trunk@14362 f3b2605a-c512-4ea7-a41b-209d697bcdaa 2015-12-11 23:33:06 +00:00
4e835935c6 git-svn-id: svn://svn.icms.temple.edu/lammps-ro/trunk@14361 f3b2605a-c512-4ea7-a41b-209d697bcdaa 2015-12-11 23:32:49 +00:00
5affb6c013 Merge branch 'master' into lammps-icms
# Resolved Conflicts:
#	doc/Manual.html
#	doc/Manual.txt
#	doc/pair_hybrid.txt
#	doc/pair_reax.html
#	doc/pair_reax.txt
#	doc/pair_reax_c.txt
#	src/MANYBODY/pair_polymorphic.cpp
2015-12-11 07:33:14 -05:00
3b6a3f4e55 git-svn-id: svn://svn.icms.temple.edu/lammps-ro/trunk@14357 f3b2605a-c512-4ea7-a41b-209d697bcdaa 2015-12-10 22:38:44 +00:00
4c1ad17581 git-svn-id: svn://svn.icms.temple.edu/lammps-ro/trunk@14354 f3b2605a-c512-4ea7-a41b-209d697bcdaa 2015-12-10 17:44:45 +00:00
28bf73fbf7 git-svn-id: svn://svn.icms.temple.edu/lammps-ro/trunk@14349 f3b2605a-c512-4ea7-a41b-209d697bcdaa 2015-12-10 17:23:56 +00:00
8550cacf18 git-svn-id: svn://svn.icms.temple.edu/lammps-ro/trunk@14348 f3b2605a-c512-4ea7-a41b-209d697bcdaa 2015-12-10 17:07:56 +00:00
e7d896a459 Merge remote-tracking branch 'lammps-ro/master' into lammps-icms
# Resolved Conflicts:
#	doc/Manual.txt
#	doc/improper_distance.txt
#	doc/pair_mdf.txt
#	python/lammps.py
#	src/MANYBODY/pair_polymorphic.cpp
#	src/MANYBODY/pair_polymorphic.h
2015-12-10 06:29:32 -05:00
760071bb4c git-svn-id: svn://svn.icms.temple.edu/lammps-ro/trunk@14342 f3b2605a-c512-4ea7-a41b-209d697bcdaa 2015-12-09 23:57:59 +00:00
0dcabb7080 git-svn-id: svn://svn.icms.temple.edu/lammps-ro/trunk@14340 f3b2605a-c512-4ea7-a41b-209d697bcdaa 2015-12-09 23:29:22 +00:00
fc1a176d04 git-svn-id: svn://svn.icms.temple.edu/lammps-ro/trunk@14339 f3b2605a-c512-4ea7-a41b-209d697bcdaa 2015-12-09 22:46:13 +00:00
676cdda5aa git-svn-id: svn://svn.icms.temple.edu/lammps-ro/trunk@14337 f3b2605a-c512-4ea7-a41b-209d697bcdaa 2015-12-09 22:32:13 +00:00
8349024265 git-svn-id: svn://svn.icms.temple.edu/lammps-ro/trunk@14333 f3b2605a-c512-4ea7-a41b-209d697bcdaa 2015-12-09 21:48:11 +00:00
b1dc501880 git-svn-id: svn://svn.icms.temple.edu/lammps-ro/trunk@14332 f3b2605a-c512-4ea7-a41b-209d697bcdaa 2015-12-09 21:47:11 +00:00
c00aabe736 git-svn-id: svn://svn.icms.temple.edu/lammps-ro/trunk@14329 f3b2605a-c512-4ea7-a41b-209d697bcdaa 2015-12-09 21:24:31 +00:00
582ba55e4a git-svn-id: svn://svn.icms.temple.edu/lammps-ro/trunk@14325 f3b2605a-c512-4ea7-a41b-209d697bcdaa 2015-12-09 20:28:38 +00:00
7920c13b04 git-svn-id: svn://svn.icms.temple.edu/lammps-ro/trunk@14323 f3b2605a-c512-4ea7-a41b-209d697bcdaa 2015-12-09 18:17:05 +00:00
549ea8787b git-svn-id: svn://svn.icms.temple.edu/lammps-ro/trunk@14320 f3b2605a-c512-4ea7-a41b-209d697bcdaa 2015-12-09 17:45:54 +00:00
fe6f196439 git-svn-id: svn://svn.icms.temple.edu/lammps-ro/trunk@14316 f3b2605a-c512-4ea7-a41b-209d697bcdaa 2015-12-09 17:29:59 +00:00
0010e7c7b6 Merge remote-tracking branch 'lammps-ro/master' into lammps-icms
# Resolved Conflicts:
#	doc/Manual.html
#	doc/Manual.txt
#	src/STUBS/Makefile
2015-12-09 08:55:51 -05:00
d24d85da64 git-svn-id: svn://svn.icms.temple.edu/lammps-ro/trunk@14305 f3b2605a-c512-4ea7-a41b-209d697bcdaa 2015-12-09 00:27:17 +00:00
f3dabd0dce git-svn-id: svn://svn.icms.temple.edu/lammps-ro/trunk@14304 f3b2605a-c512-4ea7-a41b-209d697bcdaa 2015-12-08 23:56:27 +00:00
ab3fa39cc2 git-svn-id: svn://svn.icms.temple.edu/lammps-ro/trunk@14302 f3b2605a-c512-4ea7-a41b-209d697bcdaa 2015-12-08 23:52:11 +00:00
74a04c378d git-svn-id: svn://svn.icms.temple.edu/lammps-ro/trunk@14300 f3b2605a-c512-4ea7-a41b-209d697bcdaa 2015-12-08 23:51:33 +00:00
2216401b98 git-svn-id: svn://svn.icms.temple.edu/lammps-ro/trunk@14299 f3b2605a-c512-4ea7-a41b-209d697bcdaa 2015-12-08 23:46:58 +00:00
24da72836d git-svn-id: svn://svn.icms.temple.edu/lammps-ro/trunk@14298 f3b2605a-c512-4ea7-a41b-209d697bcdaa 2015-12-08 23:35:27 +00:00
9f7fc76984 git-svn-id: svn://svn.icms.temple.edu/lammps-ro/trunk@14297 f3b2605a-c512-4ea7-a41b-209d697bcdaa 2015-12-08 23:35:16 +00:00
eaa45f0b10 ''
git-svn-id: svn://svn.icms.temple.edu/lammps-ro/trunk@14295 f3b2605a-c512-4ea7-a41b-209d697bcdaa
2015-12-08 23:34:01 +00:00
b73bfe968a ''
git-svn-id: svn://svn.icms.temple.edu/lammps-ro/trunk@14293 f3b2605a-c512-4ea7-a41b-209d697bcdaa
2015-12-08 23:16:00 +00:00
d1cbced715 ''
git-svn-id: svn://svn.icms.temple.edu/lammps-ro/trunk@14292 f3b2605a-c512-4ea7-a41b-209d697bcdaa
2015-12-08 23:15:41 +00:00
4da6cce1e9 git-svn-id: svn://svn.icms.temple.edu/lammps-ro/trunk@14291 f3b2605a-c512-4ea7-a41b-209d697bcdaa 2015-12-08 23:15:20 +00:00
8446b8cc1b Merge branch 'srp-refactor' into lammps-icms 2015-12-08 14:57:56 -05:00
4f2c55d12e Merge remote-tracking branch 'lammps-ro/master' into lammps-icms 2015-12-08 14:57:44 -05:00