|
|
290cbb9b91
|
Merge remote-tracking branch 'lammps-ro/master' into lammps-icms
|
2016-08-05 06:42:17 -04:00 |
|
|
|
0bffc1711e
|
git-svn-id: svn://svn.icms.temple.edu/lammps-ro/trunk@15435 f3b2605a-c512-4ea7-a41b-209d697bcdaa
|
2016-08-04 16:39:15 +00:00 |
|
|
|
b9913826d9
|
Merge remote-tracking branch 'lammps-ro/master' into lammps-icms
# Resolved Conflicts:
# doc/Manual.txt
# doc/fix_nh.txt
# src/create_atoms.cpp
|
2016-01-16 08:09:15 -05:00 |
|
|
|
984a1afa72
|
git-svn-id: svn://svn.icms.temple.edu/lammps-ro/trunk@14449 f3b2605a-c512-4ea7-a41b-209d697bcdaa
|
2016-01-15 15:53:23 +00:00 |
|
|
|
7770aa6200
|
correct logic for assigning molecule ids
|
2016-01-13 06:18:33 -05:00 |
|
|
|
607c4aa2a3
|
Merge remote-tracking branch 'lammps-ro/master' into lammps-icms
# Resolved Conflicts:
# doc/Manual.html
# doc/Manual.txt
# src/USER-SMTBQ/pair_smtbq.cpp
|
2016-01-12 07:02:29 -05:00 |
|
|
|
e72cef0c3a
|
git-svn-id: svn://svn.icms.temple.edu/lammps-ro/trunk@14421 f3b2605a-c512-4ea7-a41b-209d697bcdaa
|
2016-01-11 22:00:29 +00:00 |
|
|
|
1e9a4cc4b8
|
Merge remote-tracking branch 'lammps-ro/master' into lammps-icms
# Resolved Conflicts:
# doc/Manual.html
# doc/Manual.txt
# src/REAX/fix_reax_bonds.cpp
# src/REAX/fix_reax_bonds.h
# src/REAX/pair_reax.cpp
# src/USER-MGPT/pair_mgpt.cpp
# src/USER-SMTBQ/pair_smtbq.cpp
# src/lammps.cpp
# src/timer.cpp
|
2015-10-31 10:54:08 -04:00 |
|
|
|
354e20f431
|
git-svn-id: svn://svn.icms.temple.edu/lammps-ro/trunk@14220 f3b2605a-c512-4ea7-a41b-209d697bcdaa
|
2015-10-30 20:04:06 +00:00 |
|
|
|
d3a1cb6675
|
Merge remote-tracking branch 'lammps-ro/master' into lammps-icms
Resolved Conflicts:
doc/Manual.html
doc/Manual.txt
|
2015-02-09 12:05:50 -05:00 |
|
|
|
48019ede12
|
git-svn-id: svn://svn.icms.temple.edu/lammps-ro/trunk@13071 f3b2605a-c512-4ea7-a41b-209d697bcdaa
|
2015-02-06 16:32:49 +00:00 |
|
|
|
eb94b9a4ab
|
Merge remote-tracking branch 'lammps-ro/master' into lammps-icms
|
2015-01-29 07:23:11 -05:00 |
|
|
|
86daf16069
|
git-svn-id: svn://svn.icms.temple.edu/lammps-ro/trunk@12996 f3b2605a-c512-4ea7-a41b-209d697bcdaa
|
2015-01-28 15:55:56 +00:00 |
|
|
|
4a07b74790
|
Merge remote-tracking branch 'lammps-ro/master' into lammps-icms
Resolved Conflicts:
doc/Manual.html
doc/Manual.txt
src/USER-REAXC/reaxc_init_md.cpp
src/fix_recenter.cpp
src/neighbor.cpp
|
2014-10-31 09:16:10 -04:00 |
|
|
|
fdd3c860d0
|
git-svn-id: svn://svn.icms.temple.edu/lammps-ro/trunk@12675 f3b2605a-c512-4ea7-a41b-209d697bcdaa
|
2014-10-30 17:43:04 +00:00 |
|
|
|
664cf51d7b
|
git-svn-id: svn://svn.icms.temple.edu/lammps-ro/trunk@12673 f3b2605a-c512-4ea7-a41b-209d697bcdaa
|
2014-10-30 17:35:21 +00:00 |
|
|
|
fa56793bdc
|
Merge remote-tracking branch 'lammps-ro/master' into lammps-icms
Resolved Conflicts:
src/KSPACE/pair_lj_cut_tip4p_long.cpp
src/KSPACE/pppm.cpp
src/molecule.cpp
|
2014-08-08 11:26:44 -04:00 |
|
|
|
1541a02bc6
|
git-svn-id: svn://svn.icms.temple.edu/lammps-ro/trunk@12276 f3b2605a-c512-4ea7-a41b-209d697bcdaa
|
2014-08-07 14:23:22 +00:00 |
|
|
|
3a6c9b21e5
|
properly account for added topology data
|
2014-08-04 17:51:29 -04:00 |
|
|
|
cf005551ea
|
git-svn-id: svn://svn.icms.temple.edu/lammps-ro/trunk@12200 f3b2605a-c512-4ea7-a41b-209d697bcdaa
|
2014-07-28 18:46:50 +00:00 |
|
|
|
de0c8d1f14
|
git-svn-id: svn://svn.icms.temple.edu/lammps-ro/trunk@11946 f3b2605a-c512-4ea7-a41b-209d697bcdaa
|
2014-05-08 14:51:32 +00:00 |
|
|
|
af5d91115f
|
git-svn-id: svn://svn.icms.temple.edu/lammps-ro/trunk@11875 f3b2605a-c512-4ea7-a41b-209d697bcdaa
|
2014-05-02 14:28:56 +00:00 |
|
|
|
1f0f8c82c7
|
git-svn-id: svn://svn.icms.temple.edu/lammps-ro/trunk@11352 f3b2605a-c512-4ea7-a41b-209d697bcdaa
|
2014-01-28 21:50:39 +00:00 |
|
|
|
0ce16af78b
|
git-svn-id: svn://svn.icms.temple.edu/lammps-ro/trunk@11328 f3b2605a-c512-4ea7-a41b-209d697bcdaa
|
2014-01-25 22:46:08 +00:00 |
|
|
|
41c5be7a8e
|
git-svn-id: svn://svn.icms.temple.edu/lammps-ro/trunk@11300 f3b2605a-c512-4ea7-a41b-209d697bcdaa
|
2014-01-22 18:33:55 +00:00 |
|
|
|
127eb167c1
|
git-svn-id: svn://svn.icms.temple.edu/lammps-ro/trunk@11293 f3b2605a-c512-4ea7-a41b-209d697bcdaa
|
2014-01-22 17:44:32 +00:00 |
|
|
|
bad19033d0
|
git-svn-id: svn://svn.icms.temple.edu/lammps-ro/trunk@11250 f3b2605a-c512-4ea7-a41b-209d697bcdaa
|
2014-01-17 18:43:09 +00:00 |
|
|
|
a1ef01fc1a
|
git-svn-id: svn://svn.icms.temple.edu/lammps-ro/trunk@11243 f3b2605a-c512-4ea7-a41b-209d697bcdaa
|
2014-01-14 16:17:20 +00:00 |
|
|
|
16652ef654
|
git-svn-id: svn://svn.icms.temple.edu/lammps-ro/trunk@11196 f3b2605a-c512-4ea7-a41b-209d697bcdaa
|
2014-01-08 20:47:11 +00:00 |
|
|
|
21833c99de
|
git-svn-id: svn://svn.icms.temple.edu/lammps-ro/trunk@11192 f3b2605a-c512-4ea7-a41b-209d697bcdaa
|
2014-01-08 20:38:38 +00:00 |
|
|
|
6792813662
|
git-svn-id: svn://svn.icms.temple.edu/lammps-ro/trunk@10887 f3b2605a-c512-4ea7-a41b-209d697bcdaa
|
2013-10-30 14:13:30 +00:00 |
|
|
|
d2530875e3
|
git-svn-id: svn://svn.icms.temple.edu/lammps-ro/trunk@10514 f3b2605a-c512-4ea7-a41b-209d697bcdaa
|
2013-08-02 14:41:59 +00:00 |
|
|
|
aa33af4032
|
git-svn-id: svn://svn.icms.temple.edu/lammps-ro/trunk@10160 f3b2605a-c512-4ea7-a41b-209d697bcdaa
|
2013-06-28 19:00:58 +00:00 |
|
|
|
db8eda0253
|
git-svn-id: svn://svn.icms.temple.edu/lammps-ro/trunk@9913 f3b2605a-c512-4ea7-a41b-209d697bcdaa
|
2013-05-24 18:55:24 +00:00 |
|
|
|
37fc180bf7
|
git-svn-id: svn://svn.icms.temple.edu/lammps-ro/trunk@9708 f3b2605a-c512-4ea7-a41b-209d697bcdaa
|
2013-03-22 22:32:52 +00:00 |
|
|
|
912cfaca75
|
git-svn-id: svn://svn.icms.temple.edu/lammps-ro/trunk@8497 f3b2605a-c512-4ea7-a41b-209d697bcdaa
|
2012-07-25 15:15:41 +00:00 |
|
|
|
f38a94ae8a
|
git-svn-id: svn://svn.icms.temple.edu/lammps-ro/trunk@8457 f3b2605a-c512-4ea7-a41b-209d697bcdaa
|
2012-07-02 14:14:01 +00:00 |
|
|
|
0d3734ead4
|
git-svn-id: svn://svn.icms.temple.edu/lammps-ro/trunk@8399 f3b2605a-c512-4ea7-a41b-209d697bcdaa
|
2012-06-25 23:41:39 +00:00 |
|
|
|
66c5617afb
|
git-svn-id: svn://svn.icms.temple.edu/lammps-ro/trunk@8395 f3b2605a-c512-4ea7-a41b-209d697bcdaa
|
2012-06-25 22:03:31 +00:00 |
|
|
|
ba6063c7a3
|
git-svn-id: svn://svn.icms.temple.edu/lammps-ro/trunk@8324 f3b2605a-c512-4ea7-a41b-209d697bcdaa
|
2012-06-19 14:20:28 +00:00 |
|
|
|
ef9e700545
|
git-svn-id: svn://svn.icms.temple.edu/lammps-ro/trunk@8226 f3b2605a-c512-4ea7-a41b-209d697bcdaa
|
2012-06-06 22:47:51 +00:00 |
|
|
|
d319e4a651
|
git-svn-id: svn://svn.icms.temple.edu/lammps-ro/trunk@8201 f3b2605a-c512-4ea7-a41b-209d697bcdaa
|
2012-06-01 16:56:23 +00:00 |
|
|
|
75d99d30f5
|
git-svn-id: svn://svn.icms.temple.edu/lammps-ro/trunk@8199 f3b2605a-c512-4ea7-a41b-209d697bcdaa
|
2012-06-01 16:41:08 +00:00 |
|
|
|
c2777b94c2
|
git-svn-id: svn://svn.icms.temple.edu/lammps-ro/trunk@7851 f3b2605a-c512-4ea7-a41b-209d697bcdaa
|
2012-02-28 17:41:29 +00:00 |
|
|
|
3450c008aa
|
git-svn-id: svn://svn.icms.temple.edu/lammps-ro/trunk@7850 f3b2605a-c512-4ea7-a41b-209d697bcdaa
|
2012-02-28 17:29:18 +00:00 |
|
|
|
52568d2738
|
git-svn-id: svn://svn.icms.temple.edu/lammps-ro/trunk@7849 f3b2605a-c512-4ea7-a41b-209d697bcdaa
|
2012-02-28 17:19:20 +00:00 |
|
|
|
99331544c4
|
git-svn-id: svn://svn.icms.temple.edu/lammps-ro/trunk@7721 f3b2605a-c512-4ea7-a41b-209d697bcdaa
|
2012-02-07 23:27:14 +00:00 |
|
|
|
6e49ba9d3b
|
git-svn-id: svn://svn.icms.temple.edu/lammps-ro/trunk@7298 f3b2605a-c512-4ea7-a41b-209d697bcdaa
|
2011-12-06 00:02:24 +00:00 |
|
|
|
19e8c92a90
|
git-svn-id: svn://svn.icms.temple.edu/lammps-ro/trunk@7003 f3b2605a-c512-4ea7-a41b-209d697bcdaa
|
2011-09-23 18:06:55 +00:00 |
|
|
|
d51c47d9ab
|
git-svn-id: svn://svn.icms.temple.edu/lammps-ro/trunk@5705 f3b2605a-c512-4ea7-a41b-209d697bcdaa
|
2011-02-22 22:09:18 +00:00 |
|
