Commit Graph

70 Commits

Author SHA1 Message Date
f2cc64ee8b Merge remote-tracking branch 'lammps-ro/master' into lammps-icms
Resolved Conflicts:
	doc/Manual.html
	doc/Manual.txt
	src/MC/fix_bond_create.cpp
	src/read_data.cpp
2014-02-08 10:31:25 -05:00
784d229527 git-svn-id: svn://svn.icms.temple.edu/lammps-ro/trunk@11507 f3b2605a-c512-4ea7-a41b-209d697bcdaa 2014-02-07 21:17:22 +00:00
67cca89924 fix first part of the bug reported by simon gravelle 2014-02-05 11:47:48 -05:00
78f68cec44 correct logic when checking against data files 2014-01-30 17:01:14 -05:00
8a07871047 Merge remote-tracking branch 'lammps-ro/master' into lammps-icms
Resolved Conflicts:
	doc/Manual.txt
	src/REPLICA/neb.h
	src/USER-REAXC/fix_qeq_reax.cpp
	src/read_data.h
2014-01-29 07:08:08 -05:00
1f0f8c82c7 git-svn-id: svn://svn.icms.temple.edu/lammps-ro/trunk@11352 f3b2605a-c512-4ea7-a41b-209d697bcdaa 2014-01-28 21:50:39 +00: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
0ce16af78b git-svn-id: svn://svn.icms.temple.edu/lammps-ro/trunk@11328 f3b2605a-c512-4ea7-a41b-209d697bcdaa 2014-01-25 22:46:08 +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
43f8c0516e Merge remote-tracking branch 'lammps-ro/master' into lammps-icms
Resolved Conflicts:
	doc/Manual.txt
2014-01-09 10:41:34 -05:00
21833c99de git-svn-id: svn://svn.icms.temple.edu/lammps-ro/trunk@11192 f3b2605a-c512-4ea7-a41b-209d697bcdaa 2014-01-08 20:38:38 +00:00
a6d3d8691b fix pointer arithmetic bug in read_data 2014-01-06 17:47:54 -05:00
20eb2af2f6 Merge remote branch 'lammps-ro/master' into lammps-icms 2013-12-18 14:31:43 +01:00
16dde18ab2 git-svn-id: svn://svn.icms.temple.edu/lammps-ro/trunk@11124 f3b2605a-c512-4ea7-a41b-209d697bcdaa 2013-12-17 15:30:08 +00:00
5a9727b558 disable bogus warning for data files without style markers 2013-11-21 14:28:08 +01:00
4adec729eb improve windows compatibility for gzip support 2013-11-03 02:27:06 +01:00
ecf9f1c829 we need to also strip off coulomb styles suffixes when comparing styles 2013-10-26 23:46:34 +02:00
c36dda649a use comments in data file to check for consistencies 2013-10-26 17:56:13 +02:00
99f67ba8bb git-svn-id: svn://svn.icms.temple.edu/lammps-ro/trunk@10825 f3b2605a-c512-4ea7-a41b-209d697bcdaa 2013-09-23 17:30:16 +00:00
971b4e98df git-svn-id: svn://svn.icms.temple.edu/lammps-ro/trunk@10346 f3b2605a-c512-4ea7-a41b-209d697bcdaa 2013-07-25 15:49:50 +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
5b0af4dedb git-svn-id: svn://svn.icms.temple.edu/lammps-ro/trunk@10324 f3b2605a-c512-4ea7-a41b-209d697bcdaa 2013-07-24 15:58:48 +00:00
0b8e46c7e3 git-svn-id: svn://svn.icms.temple.edu/lammps-ro/trunk@10229 f3b2605a-c512-4ea7-a41b-209d697bcdaa 2013-07-08 19:36:22 +00:00
8492c4149e git-svn-id: svn://svn.icms.temple.edu/lammps-ro/trunk@9787 f3b2605a-c512-4ea7-a41b-209d697bcdaa 2013-04-23 20:35:26 +00:00
fa24d1db95 git-svn-id: svn://svn.icms.temple.edu/lammps-ro/trunk@9473 f3b2605a-c512-4ea7-a41b-209d697bcdaa 2013-02-13 18:20:52 +00:00
0c6b84987c git-svn-id: svn://svn.icms.temple.edu/lammps-ro/trunk@9346 f3b2605a-c512-4ea7-a41b-209d697bcdaa 2013-01-31 16:31:03 +00:00
d8efe2a7d3 git-svn-id: svn://svn.icms.temple.edu/lammps-ro/trunk@9044 f3b2605a-c512-4ea7-a41b-209d697bcdaa 2012-11-09 18:53:01 +00:00
53a1f74ef1 git-svn-id: svn://svn.icms.temple.edu/lammps-ro/trunk@9040 f3b2605a-c512-4ea7-a41b-209d697bcdaa 2012-11-09 16:08:11 +00:00
06d12cd6ec git-svn-id: svn://svn.icms.temple.edu/lammps-ro/trunk@8438 f3b2605a-c512-4ea7-a41b-209d697bcdaa 2012-06-29 21:10:03 +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
caabcf6db4 git-svn-id: svn://svn.icms.temple.edu/lammps-ro/trunk@8106 f3b2605a-c512-4ea7-a41b-209d697bcdaa 2012-05-21 14:37:50 +00:00
ce8f089859 git-svn-id: svn://svn.icms.temple.edu/lammps-ro/trunk@8105 f3b2605a-c512-4ea7-a41b-209d697bcdaa 2012-05-19 00:34:04 +00:00
09740d261b git-svn-id: svn://svn.icms.temple.edu/lammps-ro/trunk@8067 f3b2605a-c512-4ea7-a41b-209d697bcdaa 2012-05-17 17:05:05 +00:00
52568d2738 git-svn-id: svn://svn.icms.temple.edu/lammps-ro/trunk@7849 f3b2605a-c512-4ea7-a41b-209d697bcdaa 2012-02-28 17:19:20 +00:00
4f48544d41 git-svn-id: svn://svn.icms.temple.edu/lammps-ro/trunk@7379 f3b2605a-c512-4ea7-a41b-209d697bcdaa 2011-12-16 21:15:49 +00:00
9224da83ab git-svn-id: svn://svn.icms.temple.edu/lammps-ro/trunk@7303 f3b2605a-c512-4ea7-a41b-209d697bcdaa 2011-12-08 00:32:34 +00:00
51aef530de git-svn-id: svn://svn.icms.temple.edu/lammps-ro/trunk@7195 f3b2605a-c512-4ea7-a41b-209d697bcdaa 2011-10-25 16:05:57 +00:00
ca8dfd3d7c git-svn-id: svn://svn.icms.temple.edu/lammps-ro/trunk@7146 f3b2605a-c512-4ea7-a41b-209d697bcdaa 2011-10-20 14:56:49 +00:00
19e8c92a90 git-svn-id: svn://svn.icms.temple.edu/lammps-ro/trunk@7003 f3b2605a-c512-4ea7-a41b-209d697bcdaa 2011-09-23 18:06:55 +00:00
37df8b5cf0 git-svn-id: svn://svn.icms.temple.edu/lammps-ro/trunk@6477 f3b2605a-c512-4ea7-a41b-209d697bcdaa 2011-06-29 14:52:56 +00:00
1fedcb6e5e git-svn-id: svn://svn.icms.temple.edu/lammps-ro/trunk@6370 f3b2605a-c512-4ea7-a41b-209d697bcdaa 2011-06-13 17:29:06 +00:00
889ad4ff5f git-svn-id: svn://svn.icms.temple.edu/lammps-ro/trunk@6283 f3b2605a-c512-4ea7-a41b-209d697bcdaa 2011-06-01 15:52:05 +00:00
428bdd0b09 git-svn-id: svn://svn.icms.temple.edu/lammps-ro/trunk@5992 f3b2605a-c512-4ea7-a41b-209d697bcdaa 2011-04-21 20:05:45 +00:00
ff0cac6cc6 git-svn-id: svn://svn.icms.temple.edu/lammps-ro/trunk@5950 f3b2605a-c512-4ea7-a41b-209d697bcdaa 2011-04-15 22:57:40 +00:00
452107d9cb git-svn-id: svn://svn.icms.temple.edu/lammps-ro/trunk@5949 f3b2605a-c512-4ea7-a41b-209d697bcdaa 2011-04-15 22:51:43 +00:00
8ff0659bae git-svn-id: svn://svn.icms.temple.edu/lammps-ro/trunk@5947 f3b2605a-c512-4ea7-a41b-209d697bcdaa 2011-04-15 22:25:19 +00:00
819524ebd6 git-svn-id: svn://svn.icms.temple.edu/lammps-ro/trunk@5932 f3b2605a-c512-4ea7-a41b-209d697bcdaa 2011-04-13 21:40:14 +00:00
1f2a7add78 git-svn-id: svn://svn.icms.temple.edu/lammps-ro/trunk@5836 f3b2605a-c512-4ea7-a41b-209d697bcdaa 2011-03-26 00:50:29 +00:00
d51c47d9ab git-svn-id: svn://svn.icms.temple.edu/lammps-ro/trunk@5705 f3b2605a-c512-4ea7-a41b-209d697bcdaa 2011-02-22 22:09:18 +00:00