|
|
47c2913862
|
Merge remote-tracking branch 'lammps-ro/master' into lammps-icms
|
2015-10-16 06:21:14 -04:00 |
|
|
|
c7170a4296
|
Added Vashishta potential
git-svn-id: svn://svn.icms.temple.edu/lammps-ro/trunk@14117 f3b2605a-c512-4ea7-a41b-209d697bcdaa
|
2015-10-15 17:39:43 +00:00 |
|
|
|
edf114fd25
|
Changed DATA to DATE in headers
git-svn-id: svn://svn.icms.temple.edu/lammps-ro/trunk@14116 f3b2605a-c512-4ea7-a41b-209d697bcdaa
|
2015-10-15 17:36:54 +00:00 |
|
|
|
3af181ab6c
|
Merge remote-tracking branch 'lammps-ro/master' into lammps-icms
|
2015-09-23 09:55:15 -04:00 |
|
|
|
d472396a46
|
Modifed ZBL to accomodate mixing
git-svn-id: svn://svn.icms.temple.edu/lammps-ro/trunk@14050 f3b2605a-c512-4ea7-a41b-209d697bcdaa
|
2015-09-23 00:43:23 +00:00 |
|
|
|
c6213f36d3
|
Merge remote-tracking branch 'lammps-ro/master' into lammps-icms
Resolved Conflicts:
doc/Manual.html
src/pair_hybrid.cpp
src/respa.cpp
|
2015-07-29 13:13:51 -04:00 |
|
|
|
0b5f034699
|
git-svn-id: svn://svn.icms.temple.edu/lammps-ro/trunk@13752 f3b2605a-c512-4ea7-a41b-209d697bcdaa
|
2015-07-28 15:21:59 +00:00 |
|
|
|
66a82e3772
|
git-svn-id: svn://svn.icms.temple.edu/lammps-ro/trunk@13751 f3b2605a-c512-4ea7-a41b-209d697bcdaa
|
2015-07-28 15:21:03 +00:00 |
|
|
|
dbaf66018c
|
Merge remote-tracking branch 'lammps-ro/master' into lammps-icms
# Conflicts:
# doc/Manual.html
# doc/Manual.txt
|
2015-07-25 07:38:21 -04:00 |
|
|
|
303d9b9f54
|
git-svn-id: svn://svn.icms.temple.edu/lammps-ro/trunk@13706 f3b2605a-c512-4ea7-a41b-209d697bcdaa
|
2015-07-24 14:16:56 +00:00 |
|
|
|
997cd33ea5
|
Merge remote-tracking branch 'lammps-ro/master' into lammps-icms
|
2015-07-24 06:53:03 -04:00 |
|
|
|
5b9dbb2d68
|
git-svn-id: svn://svn.icms.temple.edu/lammps-ro/trunk@13692 f3b2605a-c512-4ea7-a41b-209d697bcdaa
|
2015-07-23 14:56:20 +00:00 |
|
|
|
e552ffbb5a
|
Merge remote-tracking branch 'lammps-ro/master' into lammps-icms
# Conflicts:
# doc/Manual.html
# doc/Manual.txt
# potentials/AlCu.bop.table
# potentials/CCu_v1.bop.table
# potentials/CuH.bop.table
# src/atom.cpp
|
2015-07-09 06:45:53 -04:00 |
|
|
|
eb6c99bf19
|
git-svn-id: svn://svn.icms.temple.edu/lammps-ro/trunk@13554 f3b2605a-c512-4ea7-a41b-209d697bcdaa
|
2015-07-08 15:31:25 +00:00 |
|
|
|
a222aa29d9
|
git-svn-id: svn://svn.icms.temple.edu/lammps-ro/trunk@13553 f3b2605a-c512-4ea7-a41b-209d697bcdaa
|
2015-07-08 15:31:07 +00:00 |
|
|
|
d4ff848ea8
|
git-svn-id: svn://svn.icms.temple.edu/lammps-ro/trunk@13552 f3b2605a-c512-4ea7-a41b-209d697bcdaa
|
2015-07-08 15:20:38 +00:00 |
|
|
|
596a3a92ae
|
git-svn-id: svn://svn.icms.temple.edu/lammps-ro/trunk@13547 f3b2605a-c512-4ea7-a41b-209d697bcdaa
|
2015-07-08 15:00:14 +00:00 |
|
|
|
9414009de0
|
git-svn-id: svn://svn.icms.temple.edu/lammps-ro/trunk@13545 f3b2605a-c512-4ea7-a41b-209d697bcdaa
|
2015-07-08 14:47:33 +00:00 |
|
|
|
5699b1e50e
|
strip off ^Ms
|
2015-07-07 11:34:43 -04:00 |
|
|
|
468d139cac
|
re-introduce past cleanups and bugfixes for BOP
|
2015-07-07 08:23:30 -04:00 |
|
|
|
42ff3a7aba
|
Merge remote-tracking branch 'lammps-ro/master' into lammps-icms
# Conflicts:
# doc/Manual.html
# doc/Manual.txt
|
2015-07-07 07:39:44 -04:00 |
|
|
|
29557ef393
|
git-svn-id: svn://svn.icms.temple.edu/lammps-ro/trunk@13519 f3b2605a-c512-4ea7-a41b-209d697bcdaa
|
2015-07-06 14:10:25 +00:00 |
|
|
|
7af1fc13f8
|
Merge remote-tracking branch 'lammps-ro/master' into lammps-icms
Resolved Conflicts:
doc/Manual.html
doc/Manual.txt
src/QEQ/fix_qeq.cpp
|
2015-02-20 08:09:55 -05:00 |
|
|
|
36c6120f3d
|
git-svn-id: svn://svn.icms.temple.edu/lammps-ro/trunk@13140 f3b2605a-c512-4ea7-a41b-209d697bcdaa
|
2015-02-19 23:59:09 +00:00 |
|
|
|
8589d37527
|
git-svn-id: svn://svn.icms.temple.edu/lammps-ro/trunk@13137 f3b2605a-c512-4ea7-a41b-209d697bcdaa
|
2015-02-19 23:46:18 +00:00 |
|
|
|
9613feca98
|
Merge remote-tracking branch 'lammps-ro/master' into lammps-icms
Resolved Conflicts:
src/USER-OMP/pair_nb3b_harmonic_omp.h
|
2014-10-16 18:12:51 -04:00 |
|
|
|
e2ff85f14c
|
Tweaked attributions
git-svn-id: svn://svn.icms.temple.edu/lammps-ro/trunk@12636 f3b2605a-c512-4ea7-a41b-209d697bcdaa
|
2014-10-14 20:48:57 +00:00 |
|
|
|
9f554da42e
|
Merge remote-tracking branch 'lammps-ro/master' into lammps-icms
Resolved Conflicts:
src/USER-FEP/fix_adapt_fep.cpp
|
2014-10-11 20:43:03 -04:00 |
|
|
|
b1fea4af6c
|
git-svn-id: svn://svn.icms.temple.edu/lammps-ro/trunk@12633 f3b2605a-c512-4ea7-a41b-209d697bcdaa
|
2014-10-10 21:15:24 +00:00 |
|
|
|
a05fa107d8
|
Merge remote-tracking branch 'lammps-ro/master' into lammps-icms
Resolved Conflicts:
doc/Manual.html
doc/Manual.txt
lib/cuda/Makefile.defaults
lib/cuda/Makefile.lammps
lib/cuda/pair_cg_cmm_coul_cut_cuda.cu
lib/cuda/pair_cg_cmm_coul_debye_cuda.cu
lib/cuda/pair_cg_cmm_coul_long_cuda.cu
lib/cuda/pair_cg_cmm_cuda.cu
lib/cuda/pair_cg_cmm_cuda_kernel_nc.cu
src/USER-FEP/fix_adapt_fep.cpp
src/molecule.cpp
|
2014-10-09 13:03:12 -04:00 |
|
|
|
1c28231331
|
Added metadata line to each potential file
git-svn-id: svn://svn.icms.temple.edu/lammps-ro/trunk@12625 f3b2605a-c512-4ea7-a41b-209d697bcdaa
|
2014-10-09 03:24:00 +00:00 |
|
|
|
9ad09005a6
|
git-svn-id: svn://svn.icms.temple.edu/lammps-ro/trunk@12617 f3b2605a-c512-4ea7-a41b-209d697bcdaa
|
2014-10-07 21:55:45 +00:00 |
|
|
|
4bb43ca885
|
Added warning to README file
git-svn-id: svn://svn.icms.temple.edu/lammps-ro/trunk@12587 f3b2605a-c512-4ea7-a41b-209d697bcdaa
|
2014-10-06 22:53:40 +00:00 |
|
|
|
d12eca24b8
|
Merge remote branch 'lammps-ro/master' into lammps-icms
Resolved Conflicts:
doc/Manual.html
doc/Manual.txt
src/lmptype.h
|
2014-09-06 15:25:49 +02:00 |
|
|
|
b3e0966911
|
git-svn-id: svn://svn.icms.temple.edu/lammps-ro/trunk@12418 f3b2605a-c512-4ea7-a41b-209d697bcdaa
|
2014-09-05 22:59:31 +00:00 |
|
|
|
11c32cb8d4
|
Merge remote-tracking branch 'lammps-ro/master' into lammps-icms
Resolved Conflicts:
doc/Manual.html
doc/Manual.txt
|
2014-07-14 11:43:52 -04:00 |
|
|
|
0d4c0446b7
|
git-svn-id: svn://svn.icms.temple.edu/lammps-ro/trunk@12181 f3b2605a-c512-4ea7-a41b-209d697bcdaa
|
2014-07-11 22:10:48 +00:00 |
|
|
|
de6d21a1b5
|
import FeC tersoff potential provided by Peter Klaver on lammps-users
|
2014-05-05 12:08:14 -04:00 |
|
|
|
634881f8ce
|
git-svn-id: svn://svn.icms.temple.edu/lammps-ro/trunk@11441 f3b2605a-c512-4ea7-a41b-209d697bcdaa
|
2014-02-01 18:04:43 +00:00 |
|
|
|
bbc2b231ba
|
git-svn-id: svn://svn.icms.temple.edu/lammps-ro/trunk@10943 f3b2605a-c512-4ea7-a41b-209d697bcdaa
|
2013-11-04 17:23:17 +00:00 |
|
|
|
61f0ca1390
|
git-svn-id: svn://svn.icms.temple.edu/lammps-ro/trunk@10424 f3b2605a-c512-4ea7-a41b-209d697bcdaa
|
2013-07-26 16:36:53 +00:00 |
|
|
|
5a0cd49c32
|
git-svn-id: svn://svn.icms.temple.edu/lammps-ro/trunk@10419 f3b2605a-c512-4ea7-a41b-209d697bcdaa
|
2013-07-26 16:04:51 +00:00 |
|
|
|
0e4a0f8609
|
git-svn-id: svn://svn.icms.temple.edu/lammps-ro/trunk@10418 f3b2605a-c512-4ea7-a41b-209d697bcdaa
|
2013-07-26 16:04:33 +00:00 |
|
|
|
b05bc24af6
|
git-svn-id: svn://svn.icms.temple.edu/lammps-ro/trunk@10188 f3b2605a-c512-4ea7-a41b-209d697bcdaa
|
2013-06-28 22:23:48 +00:00 |
|
|
|
e1b6faf8ed
|
git-svn-id: svn://svn.icms.temple.edu/lammps-ro/trunk@10185 f3b2605a-c512-4ea7-a41b-209d697bcdaa
|
2013-06-28 21:30:26 +00:00 |
|
|
|
1f4b523d6b
|
git-svn-id: svn://svn.icms.temple.edu/lammps-ro/trunk@10183 f3b2605a-c512-4ea7-a41b-209d697bcdaa
|
2013-06-28 21:28:15 +00:00 |
|
|
|
471694a7e7
|
Added Strachan citation to rdx, removed Al_Al0_AlN
git-svn-id: svn://svn.icms.temple.edu/lammps-ro/trunk@9889 f3b2605a-c512-4ea7-a41b-209d697bcdaa
|
2013-05-17 15:18:19 +00:00 |
|
|
|
e7f6d3b60c
|
Added ReaxFF.lg citation
git-svn-id: svn://svn.icms.temple.edu/lammps-ro/trunk@9888 f3b2605a-c512-4ea7-a41b-209d697bcdaa
|
2013-05-17 15:06:33 +00:00 |
|
|
|
860009b734
|
Added citations to headers
git-svn-id: svn://svn.icms.temple.edu/lammps-ro/trunk@9880 f3b2605a-c512-4ea7-a41b-209d697bcdaa
|
2013-05-14 15:11:58 +00:00 |
|
|
|
45a4e8a1a6
|
git-svn-id: svn://svn.icms.temple.edu/lammps-ro/trunk@9697 f3b2605a-c512-4ea7-a41b-209d697bcdaa
|
2013-03-21 14:41:56 +00:00 |
|
