Commit Graph

183 Commits

Author SHA1 Message Date
127eb167c1 git-svn-id: svn://svn.icms.temple.edu/lammps-ro/trunk@11293 f3b2605a-c512-4ea7-a41b-209d697bcdaa 2014-01-22 17:44:32 +00:00
46e8e6c120 Merge remote-tracking branch 'lammps-ro/master' into lammps-icms
Resolved Conflicts:
	doc/Manual.txt
	src/MAKE/Makefile.openmpi
	src/MANYBODY/fix_qeq_comb.cpp
	src/MANYBODY/pair_nb3b_harmonic.cpp
	src/RIGID/fix_rigid_small.cpp
	src/RIGID/fix_shake.cpp
	src/USER-REAXC/fix_qeq_reax.cpp
	src/USER-REAXC/fix_reaxc_bonds.cpp
	src/read_data.cpp
	src/special.h
2014-01-18 11:52:59 -05:00
bad19033d0 git-svn-id: svn://svn.icms.temple.edu/lammps-ro/trunk@11250 f3b2605a-c512-4ea7-a41b-209d697bcdaa 2014-01-17 18:43:09 +00:00
1b7c870140 Merge remote-tracking branch 'lammps-ro/master' into lammps-icms 2014-01-10 06:23:01 -05:00
68625d2f63 git-svn-id: svn://svn.icms.temple.edu/lammps-ro/trunk@11214 f3b2605a-c512-4ea7-a41b-209d697bcdaa 2014-01-10 00:15:42 +00:00
235a57f48f git-svn-id: svn://svn.icms.temple.edu/lammps-ro/trunk@11213 f3b2605a-c512-4ea7-a41b-209d697bcdaa 2014-01-10 00:12:42 +00:00
6666259cd3 git-svn-id: svn://svn.icms.temple.edu/lammps-ro/trunk@11212 f3b2605a-c512-4ea7-a41b-209d697bcdaa 2014-01-09 22:24:48 +00:00
55aa75f6bf git-svn-id: svn://svn.icms.temple.edu/lammps-ro/trunk@11206 f3b2605a-c512-4ea7-a41b-209d697bcdaa 2014-01-09 16:33:05 +00:00
5e5212e1d1 Merge remote-tracking branch 'lammps-ro/master' into lammps-icms 2013-12-06 06:35:31 +01:00
7a3773ce9d Merge remote-tracking branch 'lammps-ro/master' into lammps-icms
Resolved Conflicts:
	doc/Manual.txt
2013-12-04 04:59:58 +01:00
0ad5823bd3 git-svn-id: svn://svn.icms.temple.edu/lammps-ro/trunk@11086 f3b2605a-c512-4ea7-a41b-209d697bcdaa 2013-12-03 15:22:07 +00:00
5f9d287fe6 git-svn-id: svn://svn.icms.temple.edu/lammps-ro/trunk@11081 f3b2605a-c512-4ea7-a41b-209d697bcdaa 2013-12-03 00:20:14 +00:00
8ee5370aeb git-svn-id: svn://svn.icms.temple.edu/lammps-ro/trunk@11080 f3b2605a-c512-4ea7-a41b-209d697bcdaa 2013-12-03 00:09:54 +00:00
1396f03367 Merge remote branch 'lammps-ro/master' into lammps-icms 2013-11-12 15:23:02 +01:00
7537cea3e3 git-svn-id: svn://svn.icms.temple.edu/lammps-ro/trunk@11016 f3b2605a-c512-4ea7-a41b-209d697bcdaa 2013-11-11 16:48:37 +00:00
fa036de299 Merge remote branch 'lammps-ro/master' into lammps-icms
Resolved Conflicts:
	doc/Manual.txt
2013-11-06 13:52:00 +01:00
767784895d git-svn-id: svn://svn.icms.temple.edu/lammps-ro/trunk@10983 f3b2605a-c512-4ea7-a41b-209d697bcdaa 2013-11-05 18:07:24 +00:00
c44a7a2673 git-svn-id: svn://svn.icms.temple.edu/lammps-ro/trunk@10982 f3b2605a-c512-4ea7-a41b-209d697bcdaa 2013-11-05 17:56:17 +00:00
29f515735a git-svn-id: svn://svn.icms.temple.edu/lammps-ro/trunk@10918 f3b2605a-c512-4ea7-a41b-209d697bcdaa 2013-11-02 00:02:37 +00:00
98b493e5bd simplify isdef() variable function semantics and add documentation 2013-10-29 17:14:39 +01:00
8b86fa2fa2 include patch by daniel schwen to check if a variable is define 2013-10-29 07:52:33 +01:00
f6d74788fa git-svn-id: svn://svn.icms.temple.edu/lammps-ro/trunk@10874 f3b2605a-c512-4ea7-a41b-209d697bcdaa 2013-10-18 23:14:05 +00:00
be4ce30372 fix for group selection bug discovered by oleg sergeev 2013-10-16 21:21:39 +02:00
8b9d983baa new variable style "getenv" to access environment variables 2013-10-07 17:02:37 +02:00
e7518d494c git-svn-id: svn://svn.icms.temple.edu/lammps-ro/trunk@10577 f3b2605a-c512-4ea7-a41b-209d697bcdaa 2013-08-13 19:02:30 +00:00
479f31f4a8 bugfix for grmask() function in atom style variables 2013-08-10 03:15:08 +02:00
51de579ec3 git-svn-id: svn://svn.icms.temple.edu/lammps-ro/trunk@10515 f3b2605a-c512-4ea7-a41b-209d697bcdaa 2013-08-02 14:43:26 +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
6a79706441 git-svn-id: svn://svn.icms.temple.edu/lammps-ro/trunk@10338 f3b2605a-c512-4ea7-a41b-209d697bcdaa 2013-07-25 00:24:25 +00:00
cccc6475d9 git-svn-id: svn://svn.icms.temple.edu/lammps-ro/trunk@10328 f3b2605a-c512-4ea7-a41b-209d697bcdaa 2013-07-24 21:01:12 +00:00
b8208f582c git-svn-id: svn://svn.icms.temple.edu/lammps-ro/trunk@10326 f3b2605a-c512-4ea7-a41b-209d697bcdaa 2013-07-24 20:10:57 +00:00
580bffefea git-svn-id: svn://svn.icms.temple.edu/lammps-ro/trunk@10273 f3b2605a-c512-4ea7-a41b-209d697bcdaa 2013-07-22 22:27:57 +00:00
e9afc1983e git-svn-id: svn://svn.icms.temple.edu/lammps-ro/trunk@10220 f3b2605a-c512-4ea7-a41b-209d697bcdaa 2013-07-03 21:11:14 +00:00
aa33af4032 git-svn-id: svn://svn.icms.temple.edu/lammps-ro/trunk@10160 f3b2605a-c512-4ea7-a41b-209d697bcdaa 2013-06-28 19:00:58 +00:00
124bfc5ba7 git-svn-id: svn://svn.icms.temple.edu/lammps-ro/trunk@9939 f3b2605a-c512-4ea7-a41b-209d697bcdaa 2013-05-30 16:29:38 +00:00
f24bd36fe5 git-svn-id: svn://svn.icms.temple.edu/lammps-ro/trunk@9524 f3b2605a-c512-4ea7-a41b-209d697bcdaa 2013-02-18 17:00:25 +00:00
180c732619 git-svn-id: svn://svn.icms.temple.edu/lammps-ro/trunk@9480 f3b2605a-c512-4ea7-a41b-209d697bcdaa 2013-02-14 15:57:17 +00:00
2d6d2de507 git-svn-id: svn://svn.icms.temple.edu/lammps-ro/trunk@9299 f3b2605a-c512-4ea7-a41b-209d697bcdaa 2013-01-18 20:39:12 +00:00
a6eb6e4f84 git-svn-id: svn://svn.icms.temple.edu/lammps-ro/trunk@9261 f3b2605a-c512-4ea7-a41b-209d697bcdaa 2013-01-11 16:50:56 +00:00
0ef7f58ff1 git-svn-id: svn://svn.icms.temple.edu/lammps-ro/trunk@9097 f3b2605a-c512-4ea7-a41b-209d697bcdaa 2012-11-26 15:53:59 +00:00
88645b6c96 git-svn-id: svn://svn.icms.temple.edu/lammps-ro/trunk@9090 f3b2605a-c512-4ea7-a41b-209d697bcdaa 2012-11-21 16:40:14 +00:00
55c99e0463 git-svn-id: svn://svn.icms.temple.edu/lammps-ro/trunk@9082 f3b2605a-c512-4ea7-a41b-209d697bcdaa 2012-11-16 20:28:57 +00:00
8cc9aa5698 git-svn-id: svn://svn.icms.temple.edu/lammps-ro/trunk@9050 f3b2605a-c512-4ea7-a41b-209d697bcdaa 2012-11-10 01:18:09 +00:00
dba019f3e4 git-svn-id: svn://svn.icms.temple.edu/lammps-ro/trunk@8723 f3b2605a-c512-4ea7-a41b-209d697bcdaa 2012-08-28 14:21:55 +00:00
912cfaca75 git-svn-id: svn://svn.icms.temple.edu/lammps-ro/trunk@8497 f3b2605a-c512-4ea7-a41b-209d697bcdaa 2012-07-25 15:15:41 +00:00
c1e0bec7f6 git-svn-id: svn://svn.icms.temple.edu/lammps-ro/trunk@8352 f3b2605a-c512-4ea7-a41b-209d697bcdaa 2012-06-20 14:29:20 +00:00
d5b8b75313 git-svn-id: svn://svn.icms.temple.edu/lammps-ro/trunk@8269 f3b2605a-c512-4ea7-a41b-209d697bcdaa 2012-06-13 14:04:02 +00:00
ef9e700545 git-svn-id: svn://svn.icms.temple.edu/lammps-ro/trunk@8226 f3b2605a-c512-4ea7-a41b-209d697bcdaa 2012-06-06 22:47:51 +00:00
393889548e git-svn-id: svn://svn.icms.temple.edu/lammps-ro/trunk@8079 f3b2605a-c512-4ea7-a41b-209d697bcdaa 2012-05-17 22:25:39 +00:00
ccf0f9a1ac git-svn-id: svn://svn.icms.temple.edu/lammps-ro/trunk@8078 f3b2605a-c512-4ea7-a41b-209d697bcdaa 2012-05-17 21:40:06 +00:00