Commit Graph

1019 Commits

Author SHA1 Message Date
585a65c560 update colvars to version 2015-07-21 2015-07-21 13:25:28 -04:00
c67b0f5aa3 Merge remote-tracking branch 'lammps-ro/master' into lammps-icms
# Conflicts:
#	doc/Manual.html
#	doc/Manual.txt
#	doc/read_restart.txt
#	src/atom.cpp
#	src/read_data.cpp
2015-07-18 12:29:27 -04:00
4e757218e4 Adding missing Kokkos file
git-svn-id: svn://svn.icms.temple.edu/lammps-ro/trunk@13636 f3b2605a-c512-4ea7-a41b-209d697bcdaa
2015-07-17 16:17:51 +00:00
546a777f2a avoid underflows with exponentials 2015-07-16 16:57:57 -04:00
0d27fd720d Merge remote-tracking branch 'lammps-ro/master' into lammps-icms
# Conflicts:
#	doc/Manual.html
#	doc/Manual.txt
#	lib/kokkos/Makefile.lammps
2015-07-15 06:51:10 -04:00
61ec2f78ac git-svn-id: svn://svn.icms.temple.edu/lammps-ro/trunk@13583 f3b2605a-c512-4ea7-a41b-209d697bcdaa 2015-07-14 19:57:25 +00:00
26b23a47cd git-svn-id: svn://svn.icms.temple.edu/lammps-ro/trunk@13581 f3b2605a-c512-4ea7-a41b-209d697bcdaa 2015-07-14 19:55:01 +00:00
4e9e96d713 also compile voro++ executable for other uses 2015-07-07 11:35:36 -04:00
32f313c2db Merge remote-tracking branch 'lammps-ro/master' into lammps-icms
# Conflicts:
#	doc/Manual.html
#	doc/Manual.txt
2015-07-02 08:34:17 -04:00
ade2dca6af git-svn-id: svn://svn.icms.temple.edu/lammps-ro/trunk@13506 f3b2605a-c512-4ea7-a41b-209d697bcdaa 2015-07-02 00:45:28 +00:00
2b605e29db Describes new QUIP directory structure
git-svn-id: svn://svn.icms.temple.edu/lammps-ro/trunk@13499 f3b2605a-c512-4ea7-a41b-209d697bcdaa
2015-07-01 21:02:16 +00:00
7ecae004e4 Merge branch 'lammps-icms' of bitbucket.org:akohlmey/lammps-icms into lammps-icms 2015-06-29 15:04:00 -04:00
6b8b7c14a6 compile qm/mm library with -fPIC to be compatible with shared library builds 2015-06-29 14:36:36 -04:00
0b819b40d6 Merge remote-tracking branch 'lammps-ro/master' into lammps-icms 2015-06-27 15:19:56 -04:00
12b5742f6c Updated to new QUIP directory structure
git-svn-id: svn://svn.icms.temple.edu/lammps-ro/trunk@13493 f3b2605a-c512-4ea7-a41b-209d697bcdaa
2015-06-23 23:18:51 +00:00
417a56728c more fixes for C++11 compatibility 2015-06-17 16:40:25 -04:00
d35e3291a3 removed dead code and silence warnings about C++ standard violations 2015-06-17 15:56:14 -04:00
8a6f242800 fix OpenMP incompatibility when using CUDA through nvcc 2015-06-17 13:53:43 -04:00
938c85964b make library compiles compatible with building a shared object 2015-06-05 12:13:31 -04:00
c3fd41010d git-svn-id: svn://svn.icms.temple.edu/lammps-ro/trunk@13464 f3b2605a-c512-4ea7-a41b-209d697bcdaa 2015-05-15 16:33:17 +00:00
f084911239 fix known inconsistencies with exclusions for coul/dsf styles 2015-05-14 17:48:03 -04:00
c676c2d560 git-svn-id: svn://svn.icms.temple.edu/lammps-ro/trunk@13445 f3b2605a-c512-4ea7-a41b-209d697bcdaa 2015-04-30 14:10:18 +00:00
f539e43b22 git-svn-id: svn://svn.icms.temple.edu/lammps-ro/trunk@13444 f3b2605a-c512-4ea7-a41b-209d697bcdaa 2015-04-30 14:09:42 +00:00
673154cad3 update colvars library to the latest bugfixes as of 2015-04-22 2015-04-22 20:35:20 -04:00
2a20dc2ef9 update colvars to version 2015-04-03 2015-04-18 19:43:44 -04:00
448f7b91c0 Merge remote-tracking branch 'lammps-ro/master' into lammps-icms
Resolved Conflicts:
	doc/Manual.html
	doc/Manual.txt
2015-04-12 07:33:06 -04:00
29e574b720 git-svn-id: svn://svn.icms.temple.edu/lammps-ro/trunk@13400 f3b2605a-c512-4ea7-a41b-209d697bcdaa 2015-04-11 23:13:07 +00:00
aa9068187f Merge remote-tracking branch 'lammps-ro/master' into lammps-icms 2015-04-07 06:50:49 -04:00
974e1eb022 git-svn-id: svn://svn.icms.temple.edu/lammps-ro/trunk@13396 f3b2605a-c512-4ea7-a41b-209d697bcdaa 2015-04-06 15:14:53 +00:00
2729e19d4a Added one-liner for QUIP
git-svn-id: svn://svn.icms.temple.edu/lammps-ro/trunk@13394 f3b2605a-c512-4ea7-a41b-209d697bcdaa
2015-04-06 14:37:39 +00:00
4799e0c322 GPU update from trung 2015-03-27 12:24:55 -04:00
05eacff252 Merge remote-tracking branch 'lammps-ro/master' into lammps-icms
Resolved Conflicts:
	doc/Manual.html
	doc/Manual.txt
	src/Make.py
2015-03-19 09:13:20 -04:00
4825579470 git-svn-id: svn://svn.icms.temple.edu/lammps-ro/trunk@13252 f3b2605a-c512-4ea7-a41b-209d697bcdaa 2015-03-18 21:39:32 +00:00
636ef51ae4 git-svn-id: svn://svn.icms.temple.edu/lammps-ro/trunk@13251 f3b2605a-c512-4ea7-a41b-209d697bcdaa 2015-03-18 20:45:12 +00:00
a982178cea self-configuring variant of python library support 2015-03-18 15:13:02 -04:00
54233c58b1 Merge remote-tracking branch 'lammps-ro/master' into lammps-icms
Resolved Conflicts:
	doc/Manual.html
	doc/Manual.txt
2015-03-18 07:26:15 -04:00
5e0e0c3838 git-svn-id: svn://svn.icms.temple.edu/lammps-ro/trunk@13248 f3b2605a-c512-4ea7-a41b-209d697bcdaa 2015-03-17 23:13:10 +00:00
141569b290 git-svn-id: svn://svn.icms.temple.edu/lammps-ro/trunk@13246 f3b2605a-c512-4ea7-a41b-209d697bcdaa 2015-03-17 23:09:56 +00:00
ad91adbedc git-svn-id: svn://svn.icms.temple.edu/lammps-ro/trunk@13241 f3b2605a-c512-4ea7-a41b-209d697bcdaa 2015-03-17 16:08:01 +00:00
c63d258cc0 git-svn-id: svn://svn.icms.temple.edu/lammps-ro/trunk@13239 f3b2605a-c512-4ea7-a41b-209d697bcdaa 2015-03-17 16:06:12 +00:00
945fea8e40 update colvars library to state of 2015-03-15 2015-03-16 14:00:45 -04:00
2a773a9a97 update colvars to 2015-03-12 version 2015-03-13 11:08:31 -04:00
5a0a8f1335 git-svn-id: svn://svn.icms.temple.edu/lammps-ro/trunk@13207 f3b2605a-c512-4ea7-a41b-209d697bcdaa 2015-03-09 14:50:53 +00:00
13e37b7d0d update colvars library to state of feb 27th 2015-03-06 10:49:39 -05:00
09bb220083 Merge remote-tracking branch 'lammps-ro/master' into lammps-icms
Resolved Conflicts:
	doc/Manual.html
	doc/Manual.txt
2015-02-25 17:03:53 -05:00
02d90d07e6 git-svn-id: svn://svn.icms.temple.edu/lammps-ro/trunk@13151 f3b2605a-c512-4ea7-a41b-209d697bcdaa 2015-02-24 16:29:22 +00:00
067833cf07 git-svn-id: svn://svn.icms.temple.edu/lammps-ro/trunk@13126 f3b2605a-c512-4ea7-a41b-209d697bcdaa 2015-02-19 18:20:52 +00:00
f082916333 update colvars to version 2015-02-04 2015-02-17 14:22:20 -05:00
4fdb97ee48 Merge remote-tracking branch 'lammps-ro/master' into lammps-icms
Resolved Conflicts:
	doc/Manual.html
	doc/Manual.txt
2015-02-05 10:36:13 -05:00
a2aa6c5be0 git-svn-id: svn://svn.icms.temple.edu/lammps-ro/trunk@13057 f3b2605a-c512-4ea7-a41b-209d697bcdaa 2015-02-04 22:09:15 +00:00