|
|
5a75a6c827
|
Merge branch 'master' into lammps-icms
Resolved Conflicts:
src/REPLICA/verlet_split.cpp
src/USER-OMP/fix_omp.cpp
|
2012-10-26 09:50:01 -04:00 |
|
|
|
8663c92293
|
git-svn-id: svn://svn.icms.temple.edu/lammps-ro/trunk@9012 f3b2605a-c512-4ea7-a41b-209d697bcdaa
|
2012-10-25 16:36:45 +00:00 |
|
|
|
7d1c3ed324
|
git-svn-id: svn://svn.icms.temple.edu/lammps-ro/trunk@9010 f3b2605a-c512-4ea7-a41b-209d697bcdaa
|
2012-10-25 16:33:16 +00:00 |
|
|
|
dba890a5af
|
git-svn-id: svn://svn.icms.temple.edu/lammps-ro/trunk@9009 f3b2605a-c512-4ea7-a41b-209d697bcdaa
|
2012-10-25 16:29:13 +00:00 |
|
|
|
e9fa893b1c
|
git-svn-id: svn://svn.icms.temple.edu/lammps-ro/trunk@9008 f3b2605a-c512-4ea7-a41b-209d697bcdaa
|
2012-10-25 16:28:17 +00:00 |
|
|
|
43b161eb33
|
git-svn-id: svn://svn.icms.temple.edu/lammps-ro/trunk@9007 f3b2605a-c512-4ea7-a41b-209d697bcdaa
|
2012-10-25 16:24:52 +00:00 |
|
|
|
6f4bba7edf
|
git-svn-id: svn://svn.icms.temple.edu/lammps-ro/trunk@9006 f3b2605a-c512-4ea7-a41b-209d697bcdaa
|
2012-10-25 16:24:37 +00:00 |
|
|
|
cb9d45386c
|
git-svn-id: svn://svn.icms.temple.edu/lammps-ro/trunk@9004 f3b2605a-c512-4ea7-a41b-209d697bcdaa
|
2012-10-25 15:47:22 +00:00 |
|
|
|
ccbe10ff39
|
git-svn-id: svn://svn.icms.temple.edu/lammps-ro/trunk@9003 f3b2605a-c512-4ea7-a41b-209d697bcdaa
|
2012-10-25 15:42:25 +00:00 |
|
|
|
6dcb5fb23d
|
git-svn-id: svn://svn.icms.temple.edu/lammps-ro/trunk@9002 f3b2605a-c512-4ea7-a41b-209d697bcdaa
|
2012-10-25 15:35:14 +00:00 |
|
|
|
13dd457ae7
|
git-svn-id: svn://svn.icms.temple.edu/lammps-ro/trunk@9001 f3b2605a-c512-4ea7-a41b-209d697bcdaa
|
2012-10-25 15:23:26 +00:00 |
|
|
|
e2283d1609
|
git-svn-id: svn://svn.icms.temple.edu/lammps-ro/trunk@9000 f3b2605a-c512-4ea7-a41b-209d697bcdaa
|
2012-10-25 15:21:37 +00:00 |
|
|
|
f865058700
|
git-svn-id: svn://svn.icms.temple.edu/lammps-ro/trunk@8999 f3b2605a-c512-4ea7-a41b-209d697bcdaa
|
2012-10-25 15:21:33 +00:00 |
|
|
|
3930d66dfb
|
Merge branch 'master' into lammps-icms
|
2012-10-24 11:54:07 -04:00 |
|
|
|
fdce177203
|
git-svn-id: svn://svn.icms.temple.edu/lammps-ro/trunk@8996 f3b2605a-c512-4ea7-a41b-209d697bcdaa
|
2012-10-23 16:57:29 +00:00 |
|
|
|
c524604ec7
|
git-svn-id: svn://svn.icms.temple.edu/lammps-ro/trunk@8995 f3b2605a-c512-4ea7-a41b-209d697bcdaa
|
2012-10-23 16:56:18 +00:00 |
|
|
|
2c1a5cccf7
|
git-svn-id: svn://svn.icms.temple.edu/lammps-ro/trunk@8993 f3b2605a-c512-4ea7-a41b-209d697bcdaa
|
2012-10-23 15:54:24 +00:00 |
|
|
|
6394161a7c
|
git-svn-id: svn://svn.icms.temple.edu/lammps-ro/trunk@8992 f3b2605a-c512-4ea7-a41b-209d697bcdaa
|
2012-10-23 15:51:01 +00:00 |
|
|
|
1af5a6d629
|
Merge branch 'master' into lammps-icms
|
2012-10-23 07:30:53 -04:00 |
|
|
|
68415eae0e
|
git-svn-id: svn://svn.icms.temple.edu/lammps-ro/trunk@8990 f3b2605a-c512-4ea7-a41b-209d697bcdaa
|
2012-10-22 14:37:14 +00:00 |
|
|
|
5f377d2d45
|
git-svn-id: svn://svn.icms.temple.edu/lammps-ro/trunk@8989 f3b2605a-c512-4ea7-a41b-209d697bcdaa
|
2012-10-22 14:37:08 +00:00 |
|
|
|
d028daec92
|
git-svn-id: svn://svn.icms.temple.edu/lammps-ro/trunk@8988 f3b2605a-c512-4ea7-a41b-209d697bcdaa
|
2012-10-22 14:32:18 +00:00 |
|
|
|
be1593f66e
|
git-svn-id: svn://svn.icms.temple.edu/lammps-ro/trunk@8987 f3b2605a-c512-4ea7-a41b-209d697bcdaa
|
2012-10-22 14:31:31 +00:00 |
|
|
|
dc90a51226
|
remove support for kspace proxy styles
|
2012-10-22 05:13:57 -04:00 |
|
|
|
23d0292fe4
|
adjust for name change in tip4p styles and removal of proxy styles
|
2012-10-22 05:01:32 -04:00 |
|
|
|
ce7ea49079
|
Merge branch 'master' into lammps-icms
Resolved Conflicts:
src/USER-OMP/pair_lj_cut_tip4p_long_proxy_omp.cpp
|
2012-10-22 04:18:55 -04:00 |
|
|
|
081640f422
|
git-svn-id: svn://svn.icms.temple.edu/lammps-ro/trunk@8986 f3b2605a-c512-4ea7-a41b-209d697bcdaa
|
2012-10-19 21:28:57 +00:00 |
|
|
|
25f111feaa
|
git-svn-id: svn://svn.icms.temple.edu/lammps-ro/trunk@8985 f3b2605a-c512-4ea7-a41b-209d697bcdaa
|
2012-10-19 16:11:21 +00:00 |
|
|
|
493410e7ed
|
git-svn-id: svn://svn.icms.temple.edu/lammps-ro/trunk@8984 f3b2605a-c512-4ea7-a41b-209d697bcdaa
|
2012-10-19 16:06:05 +00:00 |
|
|
|
b8baeea982
|
git-svn-id: svn://svn.icms.temple.edu/lammps-ro/trunk@8983 f3b2605a-c512-4ea7-a41b-209d697bcdaa
|
2012-10-19 16:04:11 +00:00 |
|
|
|
c62169953b
|
git-svn-id: svn://svn.icms.temple.edu/lammps-ro/trunk@8982 f3b2605a-c512-4ea7-a41b-209d697bcdaa
|
2012-10-19 16:02:26 +00:00 |
|
|
|
0e28d227fe
|
git-svn-id: svn://svn.icms.temple.edu/lammps-ro/trunk@8981 f3b2605a-c512-4ea7-a41b-209d697bcdaa
|
2012-10-19 15:50:04 +00:00 |
|
|
|
e4e9c4cb88
|
git-svn-id: svn://svn.icms.temple.edu/lammps-ro/trunk@8979 f3b2605a-c512-4ea7-a41b-209d697bcdaa
|
2012-10-19 15:44:22 +00:00 |
|
|
|
18c8747162
|
git-svn-id: svn://svn.icms.temple.edu/lammps-ro/trunk@8978 f3b2605a-c512-4ea7-a41b-209d697bcdaa
|
2012-10-19 15:39:31 +00:00 |
|
|
|
ad302a878b
|
git-svn-id: svn://svn.icms.temple.edu/lammps-ro/trunk@8977 f3b2605a-c512-4ea7-a41b-209d697bcdaa
|
2012-10-19 15:36:54 +00:00 |
|
|
|
8ac15dc83f
|
git-svn-id: svn://svn.icms.temple.edu/lammps-ro/trunk@8976 f3b2605a-c512-4ea7-a41b-209d697bcdaa
|
2012-10-19 15:34:11 +00:00 |
|
|
|
f97c62c76e
|
git-svn-id: svn://svn.icms.temple.edu/lammps-ro/trunk@8975 f3b2605a-c512-4ea7-a41b-209d697bcdaa
|
2012-10-19 15:27:15 +00:00 |
|
|
|
8ba1c4c565
|
Merge branch 'master' into lammps-icms
Resolved Conflicts:
src/REPLICA/prd.cpp
|
2012-10-19 10:00:40 -04:00 |
|
|
|
7b8bede0f1
|
Changes to coulomb tables.
git-svn-id: svn://svn.icms.temple.edu/lammps-ro/trunk@8974 f3b2605a-c512-4ea7-a41b-209d697bcdaa
|
2012-10-17 23:28:42 +00:00 |
|
|
|
0b10887ad4
|
Changes to coulomb tables.
git-svn-id: svn://svn.icms.temple.edu/lammps-ro/trunk@8973 f3b2605a-c512-4ea7-a41b-209d697bcdaa
|
2012-10-17 23:27:34 +00:00 |
|
|
|
6a4b2a601c
|
git-svn-id: svn://svn.icms.temple.edu/lammps-ro/trunk@8972 f3b2605a-c512-4ea7-a41b-209d697bcdaa
|
2012-10-16 18:51:02 +00:00 |
|
|
|
fd4f2472af
|
git-svn-id: svn://svn.icms.temple.edu/lammps-ro/trunk@8971 f3b2605a-c512-4ea7-a41b-209d697bcdaa
|
2012-10-16 18:50:35 +00:00 |
|
|
|
07b7faaf4d
|
git-svn-id: svn://svn.icms.temple.edu/lammps-ro/trunk@8970 f3b2605a-c512-4ea7-a41b-209d697bcdaa
|
2012-10-16 18:31:13 +00:00 |
|
|
|
0c03748009
|
git-svn-id: svn://svn.icms.temple.edu/lammps-ro/trunk@8968 f3b2605a-c512-4ea7-a41b-209d697bcdaa
|
2012-10-15 16:08:02 +00:00 |
|
|
|
640235a4f8
|
git-svn-id: svn://svn.icms.temple.edu/lammps-ro/trunk@8966 f3b2605a-c512-4ea7-a41b-209d697bcdaa
|
2012-10-15 15:14:29 +00:00 |
|
|
|
8c55ffbce0
|
git-svn-id: svn://svn.icms.temple.edu/lammps-ro/trunk@8965 f3b2605a-c512-4ea7-a41b-209d697bcdaa
|
2012-10-15 15:14:07 +00:00 |
|
|
|
f9334b12df
|
git-svn-id: svn://svn.icms.temple.edu/lammps-ro/trunk@8964 f3b2605a-c512-4ea7-a41b-209d697bcdaa
|
2012-10-15 14:42:06 +00:00 |
|
|
|
64c87e863c
|
git-svn-id: svn://svn.icms.temple.edu/lammps-ro/trunk@8963 f3b2605a-c512-4ea7-a41b-209d697bcdaa
|
2012-10-15 14:18:13 +00:00 |
|
|
|
3a8f0cc4e4
|
git-svn-id: svn://svn.icms.temple.edu/lammps-ro/trunk@8961 f3b2605a-c512-4ea7-a41b-209d697bcdaa
|
2012-10-13 00:00:36 +00:00 |
|
|
|
8b2448329b
|
git-svn-id: svn://svn.icms.temple.edu/lammps-ro/trunk@8960 f3b2605a-c512-4ea7-a41b-209d697bcdaa
|
2012-10-12 23:53:08 +00:00 |
|
