|
|
4acacd8e3b
|
Merge remote-tracking branch 'lammps-ro/master' into lammps-icms
Resolved Conflicts:
doc/Manual.html
doc/Manual.txt
src/MISC/fix_efield.cpp
src/fix_addforce.cpp
src/fix_move.cpp
src/fix_setforce.cpp
|
2014-05-08 08:49:17 -04:00 |
|
|
|
53db68362e
|
git-svn-id: svn://svn.icms.temple.edu/lammps-ro/trunk@11935 f3b2605a-c512-4ea7-a41b-209d697bcdaa
|
2014-05-07 14:30:27 +00:00 |
|
|
|
4fbf7105d6
|
Merge remote-tracking branch 'lammps-ro/master' into lammps-icms
Resolved Conflicts:
doc/Manual.html
doc/Manual.txt
src/MAKE/Makefile.ubuntu
src/USER-REAXC/pair_reax_c.cpp
src/USER-REAXC/reaxc_allocate.cpp
src/USER-REAXC/reaxc_init_md.cpp
src/USER-REAXC/reaxc_list.cpp
src/USER-REAXC/reaxc_multi_body.cpp
src/USER-REAXC/reaxc_reset_tools.cpp
src/USER-REAXC/reaxc_tool_box.cpp
src/USER-REAXC/reaxc_traj.cpp
src/USER-REAXC/reaxc_types.h
src/USER-REAXC/reaxc_vector.cpp
src/write_data.cpp
|
2014-05-03 08:13:28 -04:00 |
|
|
|
c1eedcacfd
|
git-svn-id: svn://svn.icms.temple.edu/lammps-ro/trunk@11880 f3b2605a-c512-4ea7-a41b-209d697bcdaa
|
2014-05-02 15:03:34 +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 |
|
|
|
3cd3e2febd
|
Merge remote branch 'lammps-ro/master' into lammps-icms
Resolved Conflicts:
doc/Manual.txt
src/USER-OMP/pppm_cg_omp.cpp
src/USER-OMP/pppm_cg_omp.h
src/USER-OMP/pppm_omp.cpp
src/USER-OMP/pppm_omp.h
src/USER-OMP/pppm_tip4p_omp.cpp
src/kspace.h
|
2013-02-13 13:56:03 +01:00 |
|
|
|
5c635d47eb
|
git-svn-id: svn://svn.icms.temple.edu/lammps-ro/trunk@9455 f3b2605a-c512-4ea7-a41b-209d697bcdaa
|
2013-02-12 23:09:54 +00:00 |
|
|
|
005af0243c
|
next try at having thread safe temperature bias removal/restoration
|
2013-02-10 14:06:55 +01:00 |
|
|
|
52a2ba456a
|
git-svn-id: svn://svn.icms.temple.edu/lammps-ro/trunk@9437 f3b2605a-c512-4ea7-a41b-209d697bcdaa
|
2013-02-10 00:09:16 +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 |
|
|
|
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 |
|
|
|
fbb475b9cd
|
git-svn-id: svn://svn.icms.temple.edu/lammps-ro/trunk@5835 f3b2605a-c512-4ea7-a41b-209d697bcdaa
|
2011-03-25 21:13:51 +00:00 |
|
|
|
50e8739144
|
git-svn-id: svn://svn.icms.temple.edu/lammps-ro/trunk@5038 f3b2605a-c512-4ea7-a41b-209d697bcdaa
|
2010-10-14 15:10:55 +00:00 |
|
|
|
8f02ff3b29
|
git-svn-id: svn://svn.icms.temple.edu/lammps-ro/trunk@4690 f3b2605a-c512-4ea7-a41b-209d697bcdaa
|
2010-09-06 16:19:47 +00:00 |
|
|
|
ad1adc6474
|
git-svn-id: svn://svn.icms.temple.edu/lammps-ro/trunk@4504 f3b2605a-c512-4ea7-a41b-209d697bcdaa
|
2010-08-19 15:16:31 +00:00 |
|
|
|
69d350af34
|
git-svn-id: svn://svn.icms.temple.edu/lammps-ro/trunk@3481 f3b2605a-c512-4ea7-a41b-209d697bcdaa
|
2009-12-03 17:45:22 +00:00 |
|
|
|
94ddc19477
|
git-svn-id: svn://svn.icms.temple.edu/lammps-ro/trunk@2589 f3b2605a-c512-4ea7-a41b-209d697bcdaa
|
2009-02-12 21:36:52 +00:00 |
|
|
|
0cc1d090f4
|
git-svn-id: svn://svn.icms.temple.edu/lammps-ro/trunk@2330 f3b2605a-c512-4ea7-a41b-209d697bcdaa
|
2009-01-05 22:26:08 +00:00 |
|
|
|
2e8b9cf4b4
|
git-svn-id: svn://svn.icms.temple.edu/lammps-ro/trunk@1656 f3b2605a-c512-4ea7-a41b-209d697bcdaa
|
2008-03-21 00:14:38 +00:00 |
|
|
|
a49e234a37
|
git-svn-id: svn://svn.icms.temple.edu/lammps-ro/trunk@1655 f3b2605a-c512-4ea7-a41b-209d697bcdaa
|
2008-03-20 17:35:20 +00:00 |
|
|
|
4b237db3de
|
git-svn-id: svn://svn.icms.temple.edu/lammps-ro/trunk@1653 f3b2605a-c512-4ea7-a41b-209d697bcdaa
|
2008-03-20 15:32:33 +00:00 |
|
|
|
08e197abc7
|
git-svn-id: svn://svn.icms.temple.edu/lammps-ro/trunk@1652 f3b2605a-c512-4ea7-a41b-209d697bcdaa
|
2008-03-20 15:07:44 +00:00 |
|
|
|
ebe2ee9bac
|
git-svn-id: svn://svn.icms.temple.edu/lammps-ro/trunk@1651 f3b2605a-c512-4ea7-a41b-209d697bcdaa
|
2008-03-20 14:53:21 +00:00 |
|
|
|
d0e374e4c3
|
git-svn-id: svn://svn.icms.temple.edu/lammps-ro/trunk@1591 f3b2605a-c512-4ea7-a41b-209d697bcdaa
|
2008-03-11 17:15:30 +00:00 |
|
|
|
b2e9f7dc10
|
git-svn-id: svn://svn.icms.temple.edu/lammps-ro/trunk@1272 f3b2605a-c512-4ea7-a41b-209d697bcdaa
|
2008-01-02 19:24:46 +00:00 |
|
|
|
cea0208207
|
git-svn-id: svn://svn.icms.temple.edu/lammps-ro/trunk@642 f3b2605a-c512-4ea7-a41b-209d697bcdaa
|
2007-06-22 16:59:17 +00:00 |
|
|
|
aaed6ebc33
|
git-svn-id: svn://svn.icms.temple.edu/lammps-ro/trunk@622 f3b2605a-c512-4ea7-a41b-209d697bcdaa
|
2007-06-20 13:17:59 +00:00 |
|
|
|
21865de11c
|
git-svn-id: svn://svn.icms.temple.edu/lammps-ro/trunk@586 f3b2605a-c512-4ea7-a41b-209d697bcdaa
|
2007-05-23 17:00:34 +00:00 |
|
|
|
284c1f2d04
|
git-svn-id: svn://svn.icms.temple.edu/lammps-ro/trunk@255 f3b2605a-c512-4ea7-a41b-209d697bcdaa
|
2007-01-30 00:31:11 +00:00 |
|
