|
|
c931a450c0
|
Merge remote-tracking branch 'lammps-ro/master' into atc-merge
Resolved Conflicts:
doc/Manual.txt
src/USER-ATC/Install.sh
tools/msi2lmp/biosym_frc_files/README
|
2013-08-08 14:02:03 +02:00 |
|
|
|
2629a8389d
|
ATC version 2.0, date: Aug7
git-svn-id: svn://svn.icms.temple.edu/lammps-ro/trunk@10562 f3b2605a-c512-4ea7-a41b-209d697bcdaa
|
2013-08-07 21:34:59 +00:00 |
|
|
|
666de878ad
|
ATC version 2.0, date: Aug7
git-svn-id: svn://svn.icms.temple.edu/lammps-ro/trunk@10558 f3b2605a-c512-4ea7-a41b-209d697bcdaa
|
2013-08-07 21:29:05 +00:00 |
|
|
|
6420945660
|
git-svn-id: svn://svn.icms.temple.edu/lammps-ro/trunk@10535 f3b2605a-c512-4ea7-a41b-209d697bcdaa
|
2013-08-05 14:13:12 +00:00 |
|
|
|
b6012ff420
|
Merge remote branch 'lammps-ro/master' into lammps-icms
|
2013-08-02 13:21:49 +02:00 |
|
|
|
f839dbf2c5
|
git-svn-id: svn://svn.icms.temple.edu/lammps-ro/trunk@10510 f3b2605a-c512-4ea7-a41b-209d697bcdaa
|
2013-08-01 16:25:10 +00:00 |
|
|
|
77f06b1dfe
|
Merge remote branch 'lammps-ro/master' into lammps-icms
Resolved Conflicts:
doc/Manual.txt
doc/Section_start.txt
src/citeme.cpp
src/citeme.h
src/lammps.cpp
src/neighbor.cpp
|
2013-07-31 14:39:31 +02:00 |
|
|
|
13b38d09e5
|
test if I can commit
git-svn-id: svn://svn.icms.temple.edu/lammps-ro/trunk@10498 f3b2605a-c512-4ea7-a41b-209d697bcdaa
|
2013-07-30 21:52:03 +00:00 |
|
|
|
c6a0482023
|
Merge remote branch 'lammps-ro/master' into lammps-icms
Resolved Conflicts:
doc/Manual.txt
src/USER-OMP/pair_tip4p_cut_omp.cpp
src/USER-OMP/pair_tip4p_long_omp.cpp
|
2013-07-30 17:57:22 +02:00 |
|
|
|
dedb247fcd
|
anticipate patches from upstream to 12 Aug 2013 version
|
2013-07-30 10:12:29 +02:00 |
|
|
|
137702f471
|
git-svn-id: svn://svn.icms.temple.edu/lammps-ro/trunk@10459 f3b2605a-c512-4ea7-a41b-209d697bcdaa
|
2013-07-29 15:10:40 +00:00 |
|
|
|
9550535392
|
Merge remote branch 'lammps-ro/master' into lammps-icms
Resolved Conflicts:
doc/Manual.txt
lib/cuda/Makefile.lammps
src/GPU/fix_gpu.cpp
|
2013-07-27 12:34:08 +02:00 |
|
|
|
9e639c529d
|
git-svn-id: svn://svn.icms.temple.edu/lammps-ro/trunk@10458 f3b2605a-c512-4ea7-a41b-209d697bcdaa
|
2013-07-26 21:54:21 +00:00 |
|
|
|
b12b9fced9
|
git-svn-id: svn://svn.icms.temple.edu/lammps-ro/trunk@10409 f3b2605a-c512-4ea7-a41b-209d697bcdaa
|
2013-07-26 15:38:06 +00:00 |
|
|
|
60e58c44cf
|
Merge remote branch 'lammps-ro/master' into lammps-icms
Resolved Conflicts:
doc/Manual.txt
|
2013-07-26 13:15:49 +02:00 |
|
|
|
7d3d8b5b9d
|
git-svn-id: svn://svn.icms.temple.edu/lammps-ro/trunk@10395 f3b2605a-c512-4ea7-a41b-209d697bcdaa
|
2013-07-25 23:59:16 +00:00 |
|
|
|
38305bf20c
|
git-svn-id: svn://svn.icms.temple.edu/lammps-ro/trunk@10387 f3b2605a-c512-4ea7-a41b-209d697bcdaa
|
2013-07-25 23:17:16 +00:00 |
|
|
|
da8124b43b
|
git-svn-id: svn://svn.icms.temple.edu/lammps-ro/trunk@10386 f3b2605a-c512-4ea7-a41b-209d697bcdaa
|
2013-07-25 23:17:11 +00:00 |
|
|
|
d7e0099571
|
git-svn-id: svn://svn.icms.temple.edu/lammps-ro/trunk@10265 f3b2605a-c512-4ea7-a41b-209d697bcdaa
|
2013-07-18 13:58:43 +00:00 |
|
|
|
2eee5bf13f
|
update for change in style names
|
2013-07-18 11:04:00 +02:00 |
|
|
|
7a2f87e326
|
add docs for new pair style
|
2013-07-01 10:29:12 +02:00 |
|
|
|
c7183e199a
|
Merge remote branch 'lammps-ro/master' into lammps-icms
Resolved Conflicts:
doc/Manual.txt
lib/cuda/Makefile.lammps
src/MOLECULE/dihedral_charmm.cpp
src/pair.h
|
2013-06-29 13:25:29 +02:00 |
|
|
|
05f12d0a82
|
git-svn-id: svn://svn.icms.temple.edu/lammps-ro/trunk@10187 f3b2605a-c512-4ea7-a41b-209d697bcdaa
|
2013-06-28 22:23:17 +00:00 |
|
|
|
97ca2c81ce
|
Merge branch 'lammps-icms' into colvars-update
|
2013-05-26 12:39:24 +02:00 |
|
|
|
34c103e2c9
|
Merge remote-tracking branch 'lammps-ro/master' into lammps-icms
Resolved Conflicts:
doc/Manual.txt
src/Depend.sh
|
2013-05-26 11:57:22 +02:00 |
|
|
|
859db8d77b
|
git-svn-id: svn://svn.icms.temple.edu/lammps-ro/trunk@9915 f3b2605a-c512-4ea7-a41b-209d697bcdaa
|
2013-05-24 20:07:56 +00:00 |
|
|
|
b4a109bfe8
|
git-svn-id: svn://svn.icms.temple.edu/lammps-ro/trunk@9908 f3b2605a-c512-4ea7-a41b-209d697bcdaa
|
2013-05-24 14:11:43 +00:00 |
|
|
|
2e722ce5df
|
improvements to serialization/deserialization feature
|
2013-05-24 15:14:38 +02:00 |
|
|
|
92b0626589
|
Merge remote-tracking branch 'lammps-ro/master' into lammps-icms
Resolved Conflicts:
src/Depend.sh
|
2013-05-15 14:56:30 +02:00 |
|
|
|
d46b65f17c
|
Added remap keyword to change_box command
git-svn-id: svn://svn.icms.temple.edu/lammps-ro/trunk@9882 f3b2605a-c512-4ea7-a41b-209d697bcdaa
|
2013-05-14 18:02:10 +00:00 |
|
|
|
8a912603a5
|
Merge remote-tracking branch 'lammps-ro/master' into lammps-icms
Resolved Conflicts:
doc/Manual.txt
|
2013-03-12 18:44:52 +01:00 |
|
|
|
3ba07ca1e6
|
git-svn-id: svn://svn.icms.temple.edu/lammps-ro/trunk@9641 f3b2605a-c512-4ea7-a41b-209d697bcdaa
|
2013-03-11 21:37:15 +00:00 |
|
|
|
a920f23204
|
git-svn-id: svn://svn.icms.temple.edu/lammps-ro/trunk@9632 f3b2605a-c512-4ea7-a41b-209d697bcdaa
|
2013-03-11 20:47:14 +00:00 |
|
|
|
115df8a116
|
Merge remote branch 'lammps-ro/master' into lammps-icms
Resolved Conflicts:
doc/Manual.txt
src/KSPACE/pair_lj_long_coul_long.cpp
src/KSPACE/pair_lj_long_coul_long.h
src/pair.h
|
2013-03-05 13:25:28 +01:00 |
|
|
|
9659cf6739
|
Updated fix reax/c/bonds command to remove time averaging. Update the pair_coeff command to use chemical symbols instead of integers
git-svn-id: svn://svn.icms.temple.edu/lammps-ro/trunk@9561 f3b2605a-c512-4ea7-a41b-209d697bcdaa
|
2013-03-04 19:42:18 +00:00 |
|
|
|
3ae5083560
|
Updated fix reax/c/bonds command to remove time averaging. Update the pair_coeff command to use chemical symbols instead of integers
git-svn-id: svn://svn.icms.temple.edu/lammps-ro/trunk@9560 f3b2605a-c512-4ea7-a41b-209d697bcdaa
|
2013-03-04 19:19:54 +00:00 |
|
|
|
7b25847ee5
|
Merge remote-tracking branch 'lammps-ro/master' into lammps-icms
Resolved Conflicts:
doc/Manual.txt
|
2013-02-16 12:25:40 +01:00 |
|
|
|
edc95d9a42
|
Added fix_species
git-svn-id: svn://svn.icms.temple.edu/lammps-ro/trunk@9517 f3b2605a-c512-4ea7-a41b-209d697bcdaa
|
2013-02-15 21:29:41 +00:00 |
|
|
|
7ebdff8bbd
|
git-svn-id: svn://svn.icms.temple.edu/lammps-ro/trunk@9514 f3b2605a-c512-4ea7-a41b-209d697bcdaa
|
2013-02-15 21:00:56 +00:00 |
|
|
|
2654f62891
|
git-svn-id: svn://svn.icms.temple.edu/lammps-ro/trunk@9513 f3b2605a-c512-4ea7-a41b-209d697bcdaa
|
2013-02-15 20:19:33 +00:00 |
|
|
|
1fa419fa85
|
Merge branch 'master' into lammps-icms
Resolved Conflicts:
doc/Manual.txt
src/USER-MISC/dihedral_table.h
src/comm.cpp
|
2013-02-03 08:23:39 -05:00 |
|
|
|
3f839cf8f0
|
git-svn-id: svn://svn.icms.temple.edu/lammps-ro/trunk@9381 f3b2605a-c512-4ea7-a41b-209d697bcdaa
|
2013-02-01 16:59:27 +00:00 |
|
|
|
bdd81705cc
|
Merge branch 'master' into lammps-icms
Resolved Conflicts:
doc/Manual.txt
|
2013-02-01 08:29:23 -05:00 |
|
|
|
3d334d0a4c
|
git-svn-id: svn://svn.icms.temple.edu/lammps-ro/trunk@9365 f3b2605a-c512-4ea7-a41b-209d697bcdaa
|
2013-02-01 00:06:14 +00:00 |
|
|
|
e729c74316
|
git-svn-id: svn://svn.icms.temple.edu/lammps-ro/trunk@9361 f3b2605a-c512-4ea7-a41b-209d697bcdaa
|
2013-01-31 20:15:10 +00:00 |
|
|
|
f8ac8768d0
|
git-svn-id: svn://svn.icms.temple.edu/lammps-ro/trunk@9358 f3b2605a-c512-4ea7-a41b-209d697bcdaa
|
2013-01-31 19:32:24 +00:00 |
|
|
|
222322ed1b
|
Merge branch 'master' into lammps-icms
Resolved Conflicts:
doc/Manual.html
doc/Manual.txt
|
2013-01-26 08:26:51 -05:00 |
|
|
|
19a0bc490e
|
Updated ReaxFF ZnO citation
git-svn-id: svn://svn.icms.temple.edu/lammps-ro/trunk@9331 f3b2605a-c512-4ea7-a41b-209d697bcdaa
|
2013-01-25 20:01:07 +00:00 |
|
|
|
c8086bffe6
|
Updated ReaxFF ZnO citation
git-svn-id: svn://svn.icms.temple.edu/lammps-ro/trunk@9330 f3b2605a-c512-4ea7-a41b-209d697bcdaa
|
2013-01-25 19:39:24 +00:00 |
|
|
|
e1709a4489
|
Merge branch 'master' into lammps-icms
Resolved Conflicts:
src/USER-OMP/msm_omp.cpp
src/USER-OMP/msm_omp.h
src/USER-OMP/pair_born_coul_msm_omp.cpp
src/USER-OMP/pair_born_coul_msm_omp.h
src/USER-OMP/pair_buck_coul_msm_omp.cpp
src/USER-OMP/pair_buck_coul_msm_omp.h
src/USER-OMP/pair_coul_msm_omp.cpp
src/USER-OMP/pair_coul_msm_omp.h
src/USER-OMP/pair_lj_charmm_coul_msm_omp.cpp
src/USER-OMP/pair_lj_charmm_coul_msm_omp.h
src/USER-OMP/pair_lj_cut_coul_msm_omp.cpp
src/USER-OMP/pair_lj_cut_coul_msm_omp.h
|
2013-01-18 07:50:51 -05:00 |
|
