Commit Graph

10930 Commits

Author SHA1 Message Date
96ccc7976d Merge remote-tracking branch 'lammps-ro/master' into lammps-icms
Resolved Conflicts:
	doc/Manual.html
	doc/Manual.txt
2014-02-04 07:14:41 -05:00
b7d55ca484 git-svn-id: svn://svn.icms.temple.edu/lammps-ro/trunk@11467 f3b2605a-c512-4ea7-a41b-209d697bcdaa 2014-02-04 01:18:16 +00:00
a1b640205f git-svn-id: svn://svn.icms.temple.edu/lammps-ro/trunk@11466 f3b2605a-c512-4ea7-a41b-209d697bcdaa 2014-02-04 01:18:15 +00:00
f474d7d106 git-svn-id: svn://svn.icms.temple.edu/lammps-ro/trunk@11464 f3b2605a-c512-4ea7-a41b-209d697bcdaa 2014-02-04 01:16:40 +00:00
fc5f92579d git-svn-id: svn://svn.icms.temple.edu/lammps-ro/trunk@11463 f3b2605a-c512-4ea7-a41b-209d697bcdaa 2014-02-04 01:16:32 +00:00
45bcc86602 git-svn-id: svn://svn.icms.temple.edu/lammps-ro/trunk@11461 f3b2605a-c512-4ea7-a41b-209d697bcdaa 2014-02-04 00:26:40 +00:00
8688b7b430 git-svn-id: svn://svn.icms.temple.edu/lammps-ro/trunk@11460 f3b2605a-c512-4ea7-a41b-209d697bcdaa 2014-02-04 00:26:39 +00:00
298e177acb git-svn-id: svn://svn.icms.temple.edu/lammps-ro/trunk@11459 f3b2605a-c512-4ea7-a41b-209d697bcdaa 2014-02-04 00:23:48 +00:00
e3979f6143 git-svn-id: svn://svn.icms.temple.edu/lammps-ro/trunk@11458 f3b2605a-c512-4ea7-a41b-209d697bcdaa 2014-02-04 00:23:37 +00:00
495c5a09b3 git-svn-id: svn://svn.icms.temple.edu/lammps-ro/trunk@11457 f3b2605a-c512-4ea7-a41b-209d697bcdaa 2014-02-04 00:17:51 +00:00
743cf8b837 git-svn-id: svn://svn.icms.temple.edu/lammps-ro/trunk@11456 f3b2605a-c512-4ea7-a41b-209d697bcdaa 2014-02-03 23:35:19 +00:00
76e47e855b git-svn-id: svn://svn.icms.temple.edu/lammps-ro/trunk@11455 f3b2605a-c512-4ea7-a41b-209d697bcdaa 2014-02-03 23:34:58 +00:00
53509fac9f git-svn-id: svn://svn.icms.temple.edu/lammps-ro/trunk@11452 f3b2605a-c512-4ea7-a41b-209d697bcdaa 2014-02-03 15:25:19 +00:00
6f99bf9132 fix a few more cases of incorrect markup 2014-02-02 23:35:07 -05:00
d5e0964656 add colvars tools description and fix markup bugs 2014-02-02 19:24:13 -05:00
9ae7ad694c re-introduce christmas bugfix from paul 2014-02-02 07:39:39 -05:00
d1e8ca6a16 fix bug in convenience hack in Makefile 2014-02-01 17:24:12 -05:00
036f4f8dbf git-svn-id: svn://svn.icms.temple.edu/lammps-ro/trunk@11450 f3b2605a-c512-4ea7-a41b-209d697bcdaa 2014-02-01 18:56:30 +00:00
d5d663a105 git-svn-id: svn://svn.icms.temple.edu/lammps-ro/trunk@11449 f3b2605a-c512-4ea7-a41b-209d697bcdaa 2014-02-01 18:56:26 +00:00
19e47c5264 git-svn-id: svn://svn.icms.temple.edu/lammps-ro/trunk@11448 f3b2605a-c512-4ea7-a41b-209d697bcdaa 2014-02-01 18:11:18 +00:00
a16612ffbe git-svn-id: svn://svn.icms.temple.edu/lammps-ro/trunk@11447 f3b2605a-c512-4ea7-a41b-209d697bcdaa 2014-02-01 18:09:33 +00:00
09f02ddf7c git-svn-id: svn://svn.icms.temple.edu/lammps-ro/trunk@11446 f3b2605a-c512-4ea7-a41b-209d697bcdaa 2014-02-01 18:08:22 +00:00
532dd7c500 git-svn-id: svn://svn.icms.temple.edu/lammps-ro/trunk@11444 f3b2605a-c512-4ea7-a41b-209d697bcdaa 2014-02-01 18:05:22 +00:00
47632aab22 git-svn-id: svn://svn.icms.temple.edu/lammps-ro/trunk@11443 f3b2605a-c512-4ea7-a41b-209d697bcdaa 2014-02-01 18:05:21 +00:00
9be41fa46b git-svn-id: svn://svn.icms.temple.edu/lammps-ro/trunk@11442 f3b2605a-c512-4ea7-a41b-209d697bcdaa 2014-02-01 18:04:52 +00:00
634881f8ce git-svn-id: svn://svn.icms.temple.edu/lammps-ro/trunk@11441 f3b2605a-c512-4ea7-a41b-209d697bcdaa 2014-02-01 18:04:43 +00:00
7bf0ad314c git-svn-id: svn://svn.icms.temple.edu/lammps-ro/trunk@11440 f3b2605a-c512-4ea7-a41b-209d697bcdaa 2014-02-01 18:04:38 +00:00
8031ade7de git-svn-id: svn://svn.icms.temple.edu/lammps-ro/trunk@11439 f3b2605a-c512-4ea7-a41b-209d697bcdaa 2014-02-01 18:04:29 +00:00
e9f63600be git-svn-id: svn://svn.icms.temple.edu/lammps-ro/trunk@11437 f3b2605a-c512-4ea7-a41b-209d697bcdaa 2014-02-01 17:53:29 +00:00
c137068c47 git-svn-id: svn://svn.icms.temple.edu/lammps-ro/trunk@11436 f3b2605a-c512-4ea7-a41b-209d697bcdaa 2014-02-01 17:53:27 +00:00
f6d1f6822c git-svn-id: svn://svn.icms.temple.edu/lammps-ro/trunk@11435 f3b2605a-c512-4ea7-a41b-209d697bcdaa 2014-02-01 17:25:16 +00:00
ceb4da0039 git-svn-id: svn://svn.icms.temple.edu/lammps-ro/trunk@11434 f3b2605a-c512-4ea7-a41b-209d697bcdaa 2014-02-01 17:16:18 +00:00
57b7ebbef0 git-svn-id: svn://svn.icms.temple.edu/lammps-ro/trunk@11433 f3b2605a-c512-4ea7-a41b-209d697bcdaa 2014-02-01 17:15:50 +00:00
797ce3c8c0 Merge remote-tracking branch 'lammps-ro/master' into lammps-icms 2014-02-01 11:14:23 -05:00
a3cbd21b84 git-svn-id: svn://svn.icms.temple.edu/lammps-ro/trunk@11423 f3b2605a-c512-4ea7-a41b-209d697bcdaa r11423 2014-02-01 00:22:37 +00:00
fb522e7be9 git-svn-id: svn://svn.icms.temple.edu/lammps-ro/trunk@11422 f3b2605a-c512-4ea7-a41b-209d697bcdaa 2014-02-01 00:22:12 +00:00
10fb1ebded git-svn-id: svn://svn.icms.temple.edu/lammps-ro/trunk@11420 f3b2605a-c512-4ea7-a41b-209d697bcdaa 2014-01-31 22:48:28 +00:00
47f42c2a55 git-svn-id: svn://svn.icms.temple.edu/lammps-ro/trunk@11419 f3b2605a-c512-4ea7-a41b-209d697bcdaa 2014-01-31 22:39:42 +00:00
748dcbcb5b bugfix for computing forces in dreiding hbond pair styles 2014-01-31 17:30:50 -05:00
c25d317972 be more conservative in how to access class members of the bonus structure 2014-01-31 16:59:14 -05:00
ab64ba511c explicitly initialize pointer to NULL that gets passed to realloc() 2014-01-31 16:58:52 -05:00
2a59bed5aa cosmetic changes 2014-01-31 16:58:25 -05:00
7cb21d1cd9 git-svn-id: svn://svn.icms.temple.edu/lammps-ro/trunk@11418 f3b2605a-c512-4ea7-a41b-209d697bcdaa 2014-01-31 21:47:20 +00:00
675620a660 git-svn-id: svn://svn.icms.temple.edu/lammps-ro/trunk@11417 f3b2605a-c512-4ea7-a41b-209d697bcdaa 2014-01-31 21:43:12 +00:00
823675d6be git-svn-id: svn://svn.icms.temple.edu/lammps-ro/trunk@11416 f3b2605a-c512-4ea7-a41b-209d697bcdaa 2014-01-31 14:46:30 +00:00
6e5873ec91 fix compilation of USER-SPH for -DLAMMPS_BIGBIG 2014-01-31 06:58:55 -05:00
c6564663e8 Merge remote-tracking branch 'lammps-ro/master' into lammps-icms
Resolved Conflicts:
	doc/Manual.html
	doc/Manual.txt
	doc/Section_errors.txt
	src/REPLICA/tad.cpp
	src/lammps.h
2014-01-31 06:34:23 -05:00
479c7ec151 git-svn-id: svn://svn.icms.temple.edu/lammps-ro/trunk@11414 f3b2605a-c512-4ea7-a41b-209d697bcdaa 2014-01-31 00:18:58 +00:00
ca3998a659 git-svn-id: svn://svn.icms.temple.edu/lammps-ro/trunk@11413 f3b2605a-c512-4ea7-a41b-209d697bcdaa 2014-01-30 23:00:08 +00:00
f9e3511f2c git-svn-id: svn://svn.icms.temple.edu/lammps-ro/trunk@11412 f3b2605a-c512-4ea7-a41b-209d697bcdaa 2014-01-30 22:59:42 +00:00