|
|
29ae4bd8dc
|
Merge remote-tracking branch 'lammps-ro/master' into lammps-icms
Resolved Conflicts:
doc/Manual.html
doc/Manual.txt
lib/cuda/Makefile.lammps
lib/gpu/lal_coul_long.cu
src/VORONOI/compute_voronoi_atom.cpp
src/version.h
|
2014-07-01 12:08:09 -04:00 |
|
|
|
67ae64329e
|
git-svn-id: svn://svn.icms.temple.edu/lammps-ro/trunk@12146 f3b2605a-c512-4ea7-a41b-209d697bcdaa
|
2014-06-27 17:25:22 +00:00 |
|
|
|
e0d8c669c4
|
adjust code for different neighbor list handling to support intel ocl
|
2014-06-24 12:52:30 -04:00 |
|
|
|
4d4647f487
|
import library part of trung's update to the GPU package with reinit support
|
2014-06-24 12:32:40 -04:00 |
|
|
|
8dddba1112
|
Pruned unnecessary libraries
git-svn-id: svn://svn.icms.temple.edu/lammps-ro/trunk@12141 f3b2605a-c512-4ea7-a41b-209d697bcdaa
|
2014-06-20 16:46:39 +00:00 |
|
|
|
bcec3c56e4
|
Merge branch 'patch_14_06_2014' into lammps-icms
Resolved Conflicts:
doc/Manual.html
doc/Manual.txt
lib/cuda/Makefile.lammps
src/pair.cpp
|
2014-06-15 13:25:09 +02:00 |
|
|
|
598be75009
|
anticipate 14 June 2014 patch
|
2014-06-15 13:19:31 +02:00 |
|
|
|
e88b2465e7
|
various little updates and local changes
|
2014-06-15 13:15:30 +02:00 |
|
|
|
2ec1442e97
|
git-svn-id: svn://svn.icms.temple.edu/lammps-ro/trunk@12132 f3b2605a-c512-4ea7-a41b-209d697bcdaa
|
2014-06-14 19:34:19 +00:00 |
|
|
|
b8f6904ce3
|
git-svn-id: svn://svn.icms.temple.edu/lammps-ro/trunk@12128 f3b2605a-c512-4ea7-a41b-209d697bcdaa
|
2014-06-13 22:09:12 +00:00 |
|
|
|
fc07ea5d0f
|
detect and disallow using fix adapt with GPU pair styles.
|
2014-06-13 10:14:17 -04:00 |
|
|
|
cbdad2a2b3
|
Merge remote branch 'lammps-ro/master' into lammps-icms
Resolved Conflicts:
src/group.cpp
|
2014-06-04 14:16:34 +02:00 |
|
|
|
5593d42f32
|
git-svn-id: svn://svn.icms.temple.edu/lammps-ro/trunk@12063 f3b2605a-c512-4ea7-a41b-209d697bcdaa
|
2014-06-03 13:19:06 +00:00 |
|
|
|
895ca766ee
|
Merge remote branch 'lammps-ro/master' into lammps-kokkos
Resolved Conflicts:
doc/Manual.html
doc/Manual.txt
doc/package.txt
|
2014-06-02 10:45:39 +02:00 |
|
|
|
4e3bc9d059
|
git-svn-id: svn://svn.icms.temple.edu/lammps-ro/trunk@12053 f3b2605a-c512-4ea7-a41b-209d697bcdaa
|
2014-05-30 13:48:37 +00:00 |
|
|
|
3cfef73208
|
git-svn-id: svn://svn.icms.temple.edu/lammps-ro/trunk@12041 f3b2605a-c512-4ea7-a41b-209d697bcdaa
|
2014-05-29 22:52:05 +00:00 |
|
|
|
596099f730
|
fix makefile settings variable name bug
|
2014-05-15 16:00:28 -04:00 |
|
|
|
d17c0325d4
|
git-svn-id: svn://svn.icms.temple.edu/lammps-ro/trunk@11969 f3b2605a-c512-4ea7-a41b-209d697bcdaa
|
2014-05-12 15:08:14 +00:00 |
|
|
|
8c9c0ffd53
|
step version of colvars library
|
2014-05-08 17:26:11 -04:00 |
|
|
|
9dbddf920b
|
merge in latest changes from upstream colvars code
|
2014-05-08 17:17:28 -04:00 |
|
|
|
b38cb2573e
|
update colvars library to produce no more warnings with g++ -Wall
|
2014-05-08 17:17:06 -04:00 |
|
|
|
104376fcba
|
Merge remote-tracking branch 'lammps-ro/master' into lammps-icms
Resolved Conflicts:
doc/Manual.html
doc/Manual.txt
lib/gpu/lal_sw.cu
src/GRANULAR/fix_pour.cpp
|
2014-04-30 06:43:53 -04:00 |
|
|
|
99f44f64cc
|
git-svn-id: svn://svn.icms.temple.edu/lammps-ro/trunk@11842 f3b2605a-c512-4ea7-a41b-209d697bcdaa
|
2014-04-29 23:10:42 +00:00 |
|
|
|
e83e04c92d
|
update for GeForce TITAN GPU and CUDA RPM.
|
2014-04-18 16:04:42 -04:00 |
|
|
|
287db2231a
|
git-svn-id: svn://svn.icms.temple.edu/lammps-ro/trunk@11821 f3b2605a-c512-4ea7-a41b-209d697bcdaa
|
2014-04-18 14:07:18 +00:00 |
|
|
|
b928719b48
|
update voro++ library to version 0.4.7 from svn repo on 2014-04-17
|
2014-04-17 15:36:42 -04:00 |
|
|
|
5fcfc9f575
|
various little cleanups to silence compiler warnings
clarify/simplify some code and initialize variables where needed.
also remove dead code and unused class members
|
2014-04-10 18:21:12 +02:00 |
|
|
|
018e4a29de
|
git-svn-id: svn://svn.icms.temple.edu/lammps-ro/trunk@11724 f3b2605a-c512-4ea7-a41b-209d697bcdaa
|
2014-04-07 19:42:46 +00:00 |
|
|
|
20bb47e06a
|
Merge remote branch 'lammps-ro/master' into lammps-icms
Resolved Conflicts:
doc/Manual.html
doc/Manual.txt
doc/fix_qmmm.txt
doc/fix_recenter.txt
lib/README
lib/qmmm/README
src/Makefile
src/USER-QMMM/README
|
2014-04-05 12:58:39 +02:00 |
|
|
|
e29324f449
|
Updated the QM/MM library readme file to contain more detailed explanations of the build procedures for a QM/MM executable.
|
2014-04-05 05:51:04 -04:00 |
|
|
|
44b68e7651
|
git-svn-id: svn://svn.icms.temple.edu/lammps-ro/trunk@11715 f3b2605a-c512-4ea7-a41b-209d697bcdaa
|
2014-04-04 20:38:19 +00:00 |
|
|
|
d94e1e1ac5
|
git-svn-id: svn://svn.icms.temple.edu/lammps-ro/trunk@11711 f3b2605a-c512-4ea7-a41b-209d697bcdaa
|
2014-04-04 20:08:01 +00:00 |
|
|
|
ce73977732
|
some clarifications to QM/MM interface code
|
2014-04-01 13:49:38 +02:00 |
|
|
|
f803908919
|
Merge remote-tracking branch 'lammps-ro/master' into lammps-icms
|
2014-03-25 11:10:20 -04:00 |
|
|
|
374dd09015
|
remove code under development
git-svn-id: svn://svn.icms.temple.edu/lammps-ro/trunk@11671 f3b2605a-c512-4ea7-a41b-209d697bcdaa
|
2014-03-24 21:07:56 +00:00 |
|
|
|
4920531bac
|
adjust accelerator code to the slightly different macros for neighborlist access that we have in LAMMPS-ICMS over upstream and thus make dpd/gpu work.
|
2014-03-23 11:49:19 -04:00 |
|
|
|
a1c872ffb4
|
git-svn-id: svn://svn.icms.temple.edu/lammps-ro/trunk@11667 f3b2605a-c512-4ea7-a41b-209d697bcdaa
|
2014-03-21 20:42:38 +00:00 |
|
|
|
b50e278331
|
import missing file from trung
|
2014-03-21 15:29:16 +01:00 |
|
|
|
0f7f4a1e43
|
Merge remote branch 'lammps-ro/master' into lammps-icms
Resolved Conflicts:
doc/Manual.html
doc/Manual.txt
lib/gpu/lal_device.cpp
|
2014-03-21 13:58:34 +01:00 |
|
|
|
8d9e3945dd
|
git-svn-id: svn://svn.icms.temple.edu/lammps-ro/trunk@11661 f3b2605a-c512-4ea7-a41b-209d697bcdaa
|
2014-03-20 15:00:40 +00:00 |
|
|
|
67afd6fb68
|
git-svn-id: svn://svn.icms.temple.edu/lammps-ro/trunk@11660 f3b2605a-c512-4ea7-a41b-209d697bcdaa
|
2014-03-20 14:50:49 +00:00 |
|
|
|
430aed042a
|
Merge remote-tracking branch 'lammps-ro/master' into lammps-icms
Conflicts:
doc/Manual.html
doc/Manual.txt
tools/msi2lmp/src/msi2lmp.c
|
2014-03-20 10:50:23 -04:00 |
|
|
|
68c5f66685
|
Removing untested feature to fix bug affecting Windows builds
git-svn-id: svn://svn.icms.temple.edu/lammps-ro/trunk@11655 f3b2605a-c512-4ea7-a41b-209d697bcdaa
|
2014-03-19 21:55:08 +00:00 |
|
|
|
b07a3929d3
|
select bitness for GPU library
|
2014-02-17 11:13:05 -05: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 |
|
|
|
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 |
|
|
|
64138f3433
|
git-svn-id: svn://svn.icms.temple.edu/lammps-ro/trunk@11363 f3b2605a-c512-4ea7-a41b-209d697bcdaa
|
2014-01-29 00:08:18 +00:00 |
|
|
|
1e28f6b218
|
git-svn-id: svn://svn.icms.temple.edu/lammps-ro/trunk@11362 f3b2605a-c512-4ea7-a41b-209d697bcdaa
|
2014-01-29 00:07:38 +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 |
|
|
|
28194a14eb
|
git-svn-id: svn://svn.icms.temple.edu/lammps-ro/trunk@11335 f3b2605a-c512-4ea7-a41b-209d697bcdaa
|
2014-01-25 23:53:12 +00:00 |
|
