|
|
950f06cff4
|
Merge remote-tracking branch 'lammps-ro/master' into lammps-icms
Resolved Conflicts:
doc/Manual.html
doc/Manual.txt
|
2014-05-28 08:18:20 -04:00 |
|
|
|
ad67df11ca
|
anticipate user-reaxc bugfix from ray
|
2014-05-27 16:52:04 -04:00 |
|
|
|
97b1b3af14
|
anticipate fix rigid improvement from steve
|
2014-05-27 16:51:50 -04:00 |
|
|
|
21141894f7
|
git-svn-id: svn://svn.icms.temple.edu/lammps-ro/trunk@12035 f3b2605a-c512-4ea7-a41b-209d697bcdaa
|
2014-05-27 19:22:07 +00:00 |
|
|
|
3b6deb5005
|
git-svn-id: svn://svn.icms.temple.edu/lammps-ro/trunk@12034 f3b2605a-c512-4ea7-a41b-209d697bcdaa
|
2014-05-27 19:22:06 +00:00 |
|
|
|
3cf8560b94
|
git-svn-id: svn://svn.icms.temple.edu/lammps-ro/trunk@12033 f3b2605a-c512-4ea7-a41b-209d697bcdaa
|
2014-05-27 19:21:49 +00:00 |
|
|
|
53ae7f08c3
|
git-svn-id: svn://svn.icms.temple.edu/lammps-ro/trunk@12032 f3b2605a-c512-4ea7-a41b-209d697bcdaa
|
2014-05-27 17:04:25 +00:00 |
|
|
|
58a7b4748e
|
git-svn-id: svn://svn.icms.temple.edu/lammps-ro/trunk@12031 f3b2605a-c512-4ea7-a41b-209d697bcdaa
|
2014-05-27 17:04:19 +00:00 |
|
|
|
0d2f6d9db4
|
git-svn-id: svn://svn.icms.temple.edu/lammps-ro/trunk@12030 f3b2605a-c512-4ea7-a41b-209d697bcdaa
|
2014-05-27 14:35:49 +00:00 |
|
|
|
2da52d8d9d
|
git-svn-id: svn://svn.icms.temple.edu/lammps-ro/trunk@12029 f3b2605a-c512-4ea7-a41b-209d697bcdaa
|
2014-05-27 14:25:40 +00:00 |
|
|
|
e09f40c9d0
|
git-svn-id: svn://svn.icms.temple.edu/lammps-ro/trunk@12028 f3b2605a-c512-4ea7-a41b-209d697bcdaa
|
2014-05-27 14:02:43 +00:00 |
|
|
|
a30a91c46e
|
Merge remote-tracking branch 'lammps-ro/master' into lammps-icms
Resolved Conflicts:
doc/Manual.html
doc/Manual.txt
|
2014-05-24 15:36:20 -04:00 |
|
|
|
e5e877dd3f
|
git-svn-id: svn://svn.icms.temple.edu/lammps-ro/trunk@12025 f3b2605a-c512-4ea7-a41b-209d697bcdaa
|
2014-05-23 22:53:15 +00:00 |
|
|
|
15149f6377
|
git-svn-id: svn://svn.icms.temple.edu/lammps-ro/trunk@12024 f3b2605a-c512-4ea7-a41b-209d697bcdaa
|
2014-05-23 22:53:14 +00:00 |
|
|
|
d3d9748dee
|
git-svn-id: svn://svn.icms.temple.edu/lammps-ro/trunk@12023 f3b2605a-c512-4ea7-a41b-209d697bcdaa
|
2014-05-23 18:37:20 +00:00 |
|
|
|
49c0f92b04
|
git-svn-id: svn://svn.icms.temple.edu/lammps-ro/trunk@12022 f3b2605a-c512-4ea7-a41b-209d697bcdaa
|
2014-05-23 18:17:02 +00:00 |
|
|
|
702714f341
|
git-svn-id: svn://svn.icms.temple.edu/lammps-ro/trunk@12021 f3b2605a-c512-4ea7-a41b-209d697bcdaa
|
2014-05-23 18:16:31 +00:00 |
|
|
|
cd5b0af443
|
Merge branch 'lammps-icms' of bitbucket.org:akohlmey/lammps-icms into lammps-icms
Resolved Conflicts:
doc/dump_image.txt
|
2014-05-23 11:13:03 -04:00 |
|
|
|
122cdf2c39
|
Merge remote-tracking branch 'lammps-ro/master' into lammps-icms
Resolved Conflicts:
doc/Manual.html
doc/Manual.txt
doc/Section_errors.txt
doc/Section_start.txt
src/USER-FEP/Install.sh
src/USER-OMP/pair_lj_charmm_coul_long_soft_omp.cpp
Signed-off-by: Axel Kohlmeyer <akohlmey@gmail.com>
|
2014-05-23 06:37:33 -04:00 |
|
|
|
e9652224bf
|
git-svn-id: svn://svn.icms.temple.edu/lammps-ro/trunk@12019 f3b2605a-c512-4ea7-a41b-209d697bcdaa
|
2014-05-22 14:43:36 +00:00 |
|
|
|
10d5936eaf
|
git-svn-id: svn://svn.icms.temple.edu/lammps-ro/trunk@12018 f3b2605a-c512-4ea7-a41b-209d697bcdaa
|
2014-05-22 14:43:35 +00:00 |
|
|
|
a59a131024
|
git-svn-id: svn://svn.icms.temple.edu/lammps-ro/trunk@12017 f3b2605a-c512-4ea7-a41b-209d697bcdaa
|
2014-05-22 14:38:26 +00:00 |
|
|
|
d45d192091
|
git-svn-id: svn://svn.icms.temple.edu/lammps-ro/trunk@12016 f3b2605a-c512-4ea7-a41b-209d697bcdaa
|
2014-05-22 14:20:18 +00:00 |
|
|
|
051dfb0706
|
git-svn-id: svn://svn.icms.temple.edu/lammps-ro/trunk@12015 f3b2605a-c512-4ea7-a41b-209d697bcdaa
|
2014-05-22 14:08:24 +00:00 |
|
|
|
eeb19e88b8
|
git-svn-id: svn://svn.icms.temple.edu/lammps-ro/trunk@12014 f3b2605a-c512-4ea7-a41b-209d697bcdaa
|
2014-05-22 14:01:37 +00:00 |
|
|
|
afabef3465
|
git-svn-id: svn://svn.icms.temple.edu/lammps-ro/trunk@12013 f3b2605a-c512-4ea7-a41b-209d697bcdaa
|
2014-05-22 13:59:35 +00:00 |
|
|
|
736ec5ce5e
|
git-svn-id: svn://svn.icms.temple.edu/lammps-ro/trunk@12012 f3b2605a-c512-4ea7-a41b-209d697bcdaa
|
2014-05-22 13:59:13 +00:00 |
|
|
|
b97a4d3c38
|
git-svn-id: svn://svn.icms.temple.edu/lammps-ro/trunk@12011 f3b2605a-c512-4ea7-a41b-209d697bcdaa
|
2014-05-22 13:59:06 +00:00 |
|
|
|
e8ec5114a9
|
git-svn-id: svn://svn.icms.temple.edu/lammps-ro/trunk@12010 f3b2605a-c512-4ea7-a41b-209d697bcdaa
|
2014-05-22 13:59:00 +00:00 |
|
|
|
ffd2b39471
|
git-svn-id: svn://svn.icms.temple.edu/lammps-ro/trunk@12009 f3b2605a-c512-4ea7-a41b-209d697bcdaa
|
2014-05-22 13:58:51 +00:00 |
|
|
|
e604870656
|
properly implement optimized version of lj/charmm/coul/long/soft
|
2014-05-21 18:44:45 -04:00 |
|
|
|
c1e8a7b16d
|
energy calculation was wrong in the last commit. fixed it.
|
2014-05-21 17:37:38 -04:00 |
|
|
|
9f1835e1d7
|
explain some FFmpeg related warnings in dump movie docs
|
2014-05-21 17:25:08 -04:00 |
|
|
|
3afe9d6aed
|
bugfix and cleanup for lj/charmm/coul/long/omp
|
2014-05-21 17:24:16 -04:00 |
|
|
|
3bd25198e9
|
undo unintentional changes in upstream
|
2014-05-21 11:04:24 -04:00 |
|
|
|
716d62503a
|
Merge remote-tracking branch 'lammps-ro/master' into lammps-icms
|
2014-05-21 11:01:21 -04:00 |
|
|
|
e1cac193eb
|
Merge branch 'lammps-icms' of bitbucket.org:akohlmey/lammps-icms into lammps-icms
|
2014-05-21 11:01:13 -04:00 |
|
|
|
e222e8b16c
|
import new files for USER-FEP and /omp version.
|
2014-05-21 11:00:46 -04:00 |
|
|
|
89f1808b8e
|
git-svn-id: svn://svn.icms.temple.edu/lammps-ro/trunk@12008 f3b2605a-c512-4ea7-a41b-209d697bcdaa
|
2014-05-20 21:58:50 +00:00 |
|
|
|
07c88a1f42
|
git-svn-id: svn://svn.icms.temple.edu/lammps-ro/trunk@12007 f3b2605a-c512-4ea7-a41b-209d697bcdaa
|
2014-05-20 16:28:10 +00:00 |
|
|
|
0957af7566
|
git-svn-id: svn://svn.icms.temple.edu/lammps-ro/trunk@12006 f3b2605a-c512-4ea7-a41b-209d697bcdaa
|
2014-05-20 16:27:58 +00:00 |
|
|
|
6da7b2f37c
|
git-svn-id: svn://svn.icms.temple.edu/lammps-ro/trunk@12005 f3b2605a-c512-4ea7-a41b-209d697bcdaa
|
2014-05-20 16:27:35 +00:00 |
|
|
|
4b8aa5d4e7
|
git-svn-id: svn://svn.icms.temple.edu/lammps-ro/trunk@12004 f3b2605a-c512-4ea7-a41b-209d697bcdaa
|
2014-05-20 16:27:24 +00:00 |
|
|
|
6225a86370
|
improved documentation for errors and windows packages
|
2014-05-19 16:59:05 -04:00 |
|
|
|
23892d4fc5
|
git-svn-id: svn://svn.icms.temple.edu/lammps-ro/trunk@12003 f3b2605a-c512-4ea7-a41b-209d697bcdaa
|
2014-05-19 16:29:35 +00:00 |
|
|
|
0fc4a50dc0
|
Merge remote-tracking branch 'lammps-ro/master' into lammps-icms
|
2014-05-17 07:24:09 -04:00 |
|
|
|
99004826bc
|
git-svn-id: svn://svn.icms.temple.edu/lammps-ro/trunk@12002 f3b2605a-c512-4ea7-a41b-209d697bcdaa
|
2014-05-16 22:06:45 +00:00 |
|
|
|
ca0c3cbe3e
|
git-svn-id: svn://svn.icms.temple.edu/lammps-ro/trunk@12001 f3b2605a-c512-4ea7-a41b-209d697bcdaa
|
2014-05-16 22:06:33 +00:00 |
|
|
|
32d641d3f9
|
git-svn-id: svn://svn.icms.temple.edu/lammps-ro/trunk@12000 f3b2605a-c512-4ea7-a41b-209d697bcdaa
|
2014-05-16 20:57:10 +00:00 |
|
|
|
21c6f77ac1
|
Merge remote-tracking branch 'lammps-ro/master' into lammps-icms
|
2014-05-16 10:38:35 -04:00 |
|
