Commit Graph

5820 Commits

Author SHA1 Message Date
b341cb4e1e Merge branch 'lammps-icms' of git://git.icms.temple.edu/lammps-icms into lammps-icms 2013-07-25 09:17:23 +02:00
1bc62d40b2 more mostly cosmetic issues found by clang 2013-07-24 23:24:18 +02:00
980446c646 handle clang warnings 2013-07-24 22:54:59 +02:00
901614940a fix bug from uninitialized variable 2013-07-24 22:54:19 +02:00
de14e165bd cannot override CC and CXX unconditionally 2013-07-24 20:05:50 +02:00
ec8e9e75ba support compiler interposing for clang analyzer 2013-07-24 17:49:05 +02:00
45df2c2d3e adapt to changes from upstream 2013-07-24 13:59:54 +02:00
f6484736ec Merge remote branch 'lammps-ro/master' into lammps-icms
Resolved Conflicts:
	doc/Manual.txt
	src/input.cpp
	tools/msi2lmp/test/reference/crambin-class1.data~lammps-ro_master~2
	tools/msi2lmp/test/reference/nylon-class1.data~lammps-ro_master~2
	tools/restart2data.cpp
2013-07-24 13:33:50 +02:00
e9820ddf72 add error message description to the header 2013-07-24 10:28:41 +02:00
3772ce4c53 better checking for using the proper r-RESPA level 2013-07-24 09:50:32 +02:00
f4507c2f1f fix compilation problem with last commit 2013-07-24 08:59:25 +02:00
b8d24cb627 git-svn-id: svn://svn.icms.temple.edu/lammps-ro/trunk@10316 f3b2605a-c512-4ea7-a41b-209d697bcdaa 2013-07-23 23:07:54 +00:00
5796e10597 git-svn-id: svn://svn.icms.temple.edu/lammps-ro/trunk@10315 f3b2605a-c512-4ea7-a41b-209d697bcdaa 2013-07-23 22:29:50 +00:00
db71c4fc9e add (untested) support for using GPU styles on the outermost r-RESPA level 2013-07-23 23:03:29 +02:00
ec60529f40 git-svn-id: svn://svn.icms.temple.edu/lammps-ro/trunk@10312 f3b2605a-c512-4ea7-a41b-209d697bcdaa 2013-07-23 19:06:22 +00:00
87d674ca21 git-svn-id: svn://svn.icms.temple.edu/lammps-ro/trunk@10311 f3b2605a-c512-4ea7-a41b-209d697bcdaa 2013-07-23 19:06:11 +00:00
cb7f385d43 git-svn-id: svn://svn.icms.temple.edu/lammps-ro/trunk@10310 f3b2605a-c512-4ea7-a41b-209d697bcdaa 2013-07-23 19:01:37 +00:00
4b21fc7c81 git-svn-id: svn://svn.icms.temple.edu/lammps-ro/trunk@10306 f3b2605a-c512-4ea7-a41b-209d697bcdaa 2013-07-23 16:20:57 +00:00
d79e494435 git-svn-id: svn://svn.icms.temple.edu/lammps-ro/trunk@10303 f3b2605a-c512-4ea7-a41b-209d697bcdaa 2013-07-23 16:16:28 +00:00
04b2bbfc43 git-svn-id: svn://svn.icms.temple.edu/lammps-ro/trunk@10302 f3b2605a-c512-4ea7-a41b-209d697bcdaa 2013-07-23 16:14:44 +00:00
7b96d1c2f8 git-svn-id: svn://svn.icms.temple.edu/lammps-ro/trunk@10301 f3b2605a-c512-4ea7-a41b-209d697bcdaa 2013-07-23 16:13:59 +00:00
dda38788f7 git-svn-id: svn://svn.icms.temple.edu/lammps-ro/trunk@10300 f3b2605a-c512-4ea7-a41b-209d697bcdaa 2013-07-23 16:13:20 +00:00
d7ce1099e6 git-svn-id: svn://svn.icms.temple.edu/lammps-ro/trunk@10297 f3b2605a-c512-4ea7-a41b-209d697bcdaa 2013-07-23 15:36:14 +00:00
196c284e00 git-svn-id: svn://svn.icms.temple.edu/lammps-ro/trunk@10295 f3b2605a-c512-4ea7-a41b-209d697bcdaa 2013-07-23 15:26:24 +00:00
ad2266e4bf git-svn-id: svn://svn.icms.temple.edu/lammps-ro/trunk@10292 f3b2605a-c512-4ea7-a41b-209d697bcdaa 2013-07-23 15:21:27 +00:00
ba877e83ca git-svn-id: svn://svn.icms.temple.edu/lammps-ro/trunk@10291 f3b2605a-c512-4ea7-a41b-209d697bcdaa 2013-07-23 15:21:17 +00:00
42408bc41d git-svn-id: svn://svn.icms.temple.edu/lammps-ro/trunk@10290 f3b2605a-c512-4ea7-a41b-209d697bcdaa 2013-07-23 15:18:51 +00:00
2584cbe902 git-svn-id: svn://svn.icms.temple.edu/lammps-ro/trunk@10289 f3b2605a-c512-4ea7-a41b-209d697bcdaa 2013-07-23 15:16:11 +00:00
b49a5519f2 git-svn-id: svn://svn.icms.temple.edu/lammps-ro/trunk@10285 f3b2605a-c512-4ea7-a41b-209d697bcdaa 2013-07-23 15:10:07 +00:00
366484eb34 git-svn-id: svn://svn.icms.temple.edu/lammps-ro/trunk@10284 f3b2605a-c512-4ea7-a41b-209d697bcdaa 2013-07-23 15:02:51 +00:00
481bcc774b git-svn-id: svn://svn.icms.temple.edu/lammps-ro/trunk@10283 f3b2605a-c512-4ea7-a41b-209d697bcdaa 2013-07-23 15:01:19 +00:00
a8b5501008 undo part of the bugfix to be in sync with steve's version 2013-07-23 15:20:17 +02:00
00d46d8490 added /omp version of tip4p/cut 2013-07-23 13:06:19 +02:00
69fd52746c Merge branch 'lammps-ro/master' (early part) into lammps-icms
Resolved Conflicts:
	doc/Manual.txt
	src/USER-COLVARS/fix_colvars.cpp
	src/variable.cpp
	tools/msi2lmp/README
	tools/msi2lmp/src/ReadCarFile.c
	tools/msi2lmp/src/msi2lmp.c
	tools/msi2lmp/src/msi2lmp.h
2013-07-23 12:55:58 +02:00
2135141fe9 git-svn-id: svn://svn.icms.temple.edu/lammps-ro/trunk@10282 f3b2605a-c512-4ea7-a41b-209d697bcdaa 2013-07-22 23:02:25 +00:00
40f46faac5 git-svn-id: svn://svn.icms.temple.edu/lammps-ro/trunk@10278 f3b2605a-c512-4ea7-a41b-209d697bcdaa 2013-07-22 22:55:46 +00:00
c102c621e3 git-svn-id: svn://svn.icms.temple.edu/lammps-ro/trunk@10277 f3b2605a-c512-4ea7-a41b-209d697bcdaa 2013-07-22 22:54:22 +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
e3bc276ce6 git-svn-id: svn://svn.icms.temple.edu/lammps-ro/trunk@10272 f3b2605a-c512-4ea7-a41b-209d697bcdaa 2013-07-22 22:21:25 +00:00
fb3e1ba893 git-svn-id: svn://svn.icms.temple.edu/lammps-ro/trunk@10271 f3b2605a-c512-4ea7-a41b-209d697bcdaa 2013-07-22 22:20:18 +00:00
57da8e53df git-svn-id: svn://svn.icms.temple.edu/lammps-ro/trunk@10270 f3b2605a-c512-4ea7-a41b-209d697bcdaa 2013-07-22 22:16:56 +00:00
aa85ae4266 added tip4p/cut style 2013-07-23 00:14:58 +02:00
7ba4c87055 correct error messages 2013-07-23 00:14:29 +02:00
d255952ed9 correct error messages and docs. add /omp version for tip4p/long 2013-07-22 23:24:14 +02:00
94011f1fa0 add a coulomb-only pair style for tip4p 2013-07-22 23:06:37 +02:00
24ad8092d5 make output conform to colvar library conventions 2013-07-22 13:46:32 +02:00
07ea228eda add write_data support to some more styles 2013-07-22 07:01:43 +02:00
5c8cc08225 update error docs 2013-07-22 07:01:16 +02:00
063e4edfc5 cleaner logic for one-time initialization 2013-07-21 20:20:20 +02:00
94335444f8 move one time initialization into a separate method
when continuning from a binary restart, we need to make sure the colvars proxy module has been instantiated.
2013-07-21 15:47:01 +02:00