|
|
906ebc261e
|
Integrate AIREBO-M by merging it into regular AIREBO and building wrapper classes
|
2016-03-15 16:39:31 -04:00 |
|
|
|
e7d896a459
|
Merge remote-tracking branch 'lammps-ro/master' into lammps-icms
# Resolved Conflicts:
# doc/Manual.txt
# doc/improper_distance.txt
# doc/pair_mdf.txt
# python/lammps.py
# src/MANYBODY/pair_polymorphic.cpp
# src/MANYBODY/pair_polymorphic.h
|
2015-12-10 06:29:32 -05:00 |
|
|
|
d43c4a1bf5
|
git-svn-id: svn://svn.icms.temple.edu/lammps-ro/trunk@14315 f3b2605a-c512-4ea7-a41b-209d697bcdaa
|
2015-12-09 17:22:00 +00:00 |
|
|
|
6f443bf17f
|
git-svn-id: svn://svn.icms.temple.edu/lammps-ro/trunk@14314 f3b2605a-c512-4ea7-a41b-209d697bcdaa
|
2015-12-09 17:18:22 +00:00 |
|
|
|
3d659aba57
|
git-svn-id: svn://svn.icms.temple.edu/lammps-ro/trunk@14313 f3b2605a-c512-4ea7-a41b-209d697bcdaa
|
2015-12-09 17:16:42 +00:00 |
|
|
|
bac5a15bfc
|
git-svn-id: svn://svn.icms.temple.edu/lammps-ro/trunk@14312 f3b2605a-c512-4ea7-a41b-209d697bcdaa
|
2015-12-09 17:16:11 +00:00 |
|
|
|
f7355d5761
|
git-svn-id: svn://svn.icms.temple.edu/lammps-ro/trunk@14311 f3b2605a-c512-4ea7-a41b-209d697bcdaa
|
2015-12-09 17:11:45 +00:00 |
|
|
|
15c3a77823
|
git-svn-id: svn://svn.icms.temple.edu/lammps-ro/trunk@14310 f3b2605a-c512-4ea7-a41b-209d697bcdaa
|
2015-12-09 17:09:56 +00:00 |
|
|
|
c78f2449b2
|
git-svn-id: svn://svn.icms.temple.edu/lammps-ro/trunk@14309 f3b2605a-c512-4ea7-a41b-209d697bcdaa
|
2015-12-09 17:05:37 +00:00 |
|
|
|
55954dac5c
|
Merge remote-tracking branch 'lammps-ro/master' into lammps-icms
# Resolved Conflicts:
# doc/Manual.html
# doc/Manual.txt
|
2015-10-24 06:50:12 -04:00 |
|
|
|
2045669c53
|
adapt potential file header to common conventions
|
2015-10-23 18:09:48 -04:00 |
|
|
|
2a1a318ce7
|
git-svn-id: svn://svn.icms.temple.edu/lammps-ro/trunk@14206 f3b2605a-c512-4ea7-a41b-209d697bcdaa
|
2015-10-23 19:36:51 +00:00 |
|
|
|
07554c8efe
|
Merge remote-tracking branch 'lammps-ro/master' into lammps-icms
# Resolved Conflicts:
# doc/Manual.html
# doc/Manual.txt
# lib/colvars/colvarmodule.h
# src/Makefile
# src/min_cg.cpp
# src/min_fire.cpp
# src/min_quickmin.cpp
# src/min_sd.cpp
# src/respa.cpp
# src/version.h
|
2015-10-23 07:08:37 -04:00 |
|
|
|
238c17e0c7
|
git-svn-id: svn://svn.icms.temple.edu/lammps-ro/trunk@14188 f3b2605a-c512-4ea7-a41b-209d697bcdaa
|
2015-10-23 00:34:56 +00:00 |
|
|
|
9057c42350
|
git-svn-id: svn://svn.icms.temple.edu/lammps-ro/trunk@14187 f3b2605a-c512-4ea7-a41b-209d697bcdaa
|
2015-10-23 00:30:53 +00:00 |
|
|
|
d8c16fb28d
|
git-svn-id: svn://svn.icms.temple.edu/lammps-ro/trunk@14171 f3b2605a-c512-4ea7-a41b-209d697bcdaa
|
2015-10-22 22:56:04 +00:00 |
|
|
|
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 |
|
