|
|
0f7f4a1e43
|
Merge remote branch 'lammps-ro/master' into lammps-icms
Resolved Conflicts:
doc/Manual.html
doc/Manual.txt
lib/gpu/lal_device.cpp
|
2014-03-21 13:58:34 +01:00 |
|
|
|
1ce84626f2
|
git-svn-id: svn://svn.icms.temple.edu/lammps-ro/trunk@11662 f3b2605a-c512-4ea7-a41b-209d697bcdaa
|
2014-03-20 15:00:59 +00:00 |
|
|
|
d181769e88
|
Merge remote-tracking branch 'lammps-ro/master' into lammps-icms
Resolved Conflicts:
src/MAKE/Makefile.mingw32-cross
src/MAKE/Makefile.mingw32-cross-mpi
src/MAKE/Makefile.mingw64-cross
src/MAKE/Makefile.mingw64-cross-mpi
|
2014-01-30 07:54:10 -05:00 |
|
|
|
89a4708824
|
git-svn-id: svn://svn.icms.temple.edu/lammps-ro/trunk@11381 f3b2605a-c512-4ea7-a41b-209d697bcdaa
|
2014-01-29 22:22:56 +00:00 |
|
|
|
39b1597778
|
Merge remote-tracking branch 'lammps-ro/master' into lammps-icms
Resolved Conflicts:
doc/Manual.txt
src/RIGID/fix_shake.cpp
src/variable.cpp
src/write_data.cpp
|
2014-01-26 21:35:32 -05:00 |
|
|
|
dc585528b2
|
git-svn-id: svn://svn.icms.temple.edu/lammps-ro/trunk@11334 f3b2605a-c512-4ea7-a41b-209d697bcdaa
|
2014-01-25 23:52:50 +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 |
|
|
|
46e8e6c120
|
Merge remote-tracking branch 'lammps-ro/master' into lammps-icms
Resolved Conflicts:
doc/Manual.txt
src/MAKE/Makefile.openmpi
src/MANYBODY/fix_qeq_comb.cpp
src/MANYBODY/pair_nb3b_harmonic.cpp
src/RIGID/fix_rigid_small.cpp
src/RIGID/fix_shake.cpp
src/USER-REAXC/fix_qeq_reax.cpp
src/USER-REAXC/fix_reaxc_bonds.cpp
src/read_data.cpp
src/special.h
|
2014-01-18 11:52:59 -05:00 |
|
|
|
0f89823d78
|
git-svn-id: svn://svn.icms.temple.edu/lammps-ro/trunk@11260 f3b2605a-c512-4ea7-a41b-209d697bcdaa
|
2014-01-17 22:03:37 +00:00 |
|
|
|
cb1ad361fb
|
git-svn-id: svn://svn.icms.temple.edu/lammps-ro/trunk@11256 f3b2605a-c512-4ea7-a41b-209d697bcdaa
|
2014-01-17 21:17:42 +00:00 |
|
|
|
2da0db319c
|
Merge remote-tracking branch 'lammps-ro/master' into lammps-icms
Resolved Conflicts:
doc/Manual.txt
|
2013-08-24 12:35:11 +02:00 |
|
|
|
6ad1c9618b
|
git-svn-id: svn://svn.icms.temple.edu/lammps-ro/trunk@10670 f3b2605a-c512-4ea7-a41b-209d697bcdaa
|
2013-08-23 14:47:08 +00:00 |
|
|
|
afef1c8814
|
git-svn-id: svn://svn.icms.temple.edu/lammps-ro/trunk@10548 f3b2605a-c512-4ea7-a41b-209d697bcdaa
|
2013-08-06 17:30:53 +00:00 |
|
|
|
99be52f5ab
|
make code compile again after merge of 14Aug2013 version
|
2013-07-31 16:30:45 +02: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 |
|
|
|
c612b724df
|
git-svn-id: svn://svn.icms.temple.edu/lammps-ro/trunk@10492 f3b2605a-c512-4ea7-a41b-209d697bcdaa
|
2013-07-30 20:40:02 +00:00 |
|
|
|
897c3be1ab
|
re-instate new timer interface
|
2013-07-27 12:36:17 +02:00 |
|
|
|
6fc75ee1da
|
git-svn-id: svn://svn.icms.temple.edu/lammps-ro/trunk@10402 f3b2605a-c512-4ea7-a41b-209d697bcdaa
|
2013-07-26 14:59:50 +00:00 |
|
|
|
b0007d45b7
|
git-svn-id: svn://svn.icms.temple.edu/lammps-ro/trunk@10199 f3b2605a-c512-4ea7-a41b-209d697bcdaa
|
2013-06-29 21:27:42 +00:00 |
|
|
|
2dbe3f80a2
|
git-svn-id: svn://svn.icms.temple.edu/lammps-ro/trunk@10103 f3b2605a-c512-4ea7-a41b-209d697bcdaa
|
2013-06-27 20:02:55 +00:00 |
|
|
|
f1effd1c0d
|
git-svn-id: svn://svn.icms.temple.edu/lammps-ro/trunk@8689 f3b2605a-c512-4ea7-a41b-209d697bcdaa
|
2012-08-21 13:53:49 +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 |
|
|
|
f884a7ec85
|
git-svn-id: svn://svn.icms.temple.edu/lammps-ro/trunk@7647 f3b2605a-c512-4ea7-a41b-209d697bcdaa
|
2012-02-01 16:27:41 +00:00 |
|
|
|
24a85166bf
|
git-svn-id: svn://svn.icms.temple.edu/lammps-ro/trunk@7276 f3b2605a-c512-4ea7-a41b-209d697bcdaa
|
2011-12-02 15:55:55 +00:00 |
|
|
|
c6bbdcfbf2
|
git-svn-id: svn://svn.icms.temple.edu/lammps-ro/trunk@7184 f3b2605a-c512-4ea7-a41b-209d697bcdaa
|
2011-10-24 20:28:02 +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 |
|
|
|
ccfaead990
|
git-svn-id: svn://svn.icms.temple.edu/lammps-ro/trunk@6701 f3b2605a-c512-4ea7-a41b-209d697bcdaa
|
2011-08-17 14:30:14 +00:00 |
|
|
|
d5b03afdc7
|
git-svn-id: svn://svn.icms.temple.edu/lammps-ro/trunk@6368 f3b2605a-c512-4ea7-a41b-209d697bcdaa
|
2011-06-13 15:17:44 +00:00 |
|
|
|
76226269f8
|
git-svn-id: svn://svn.icms.temple.edu/lammps-ro/trunk@6342 f3b2605a-c512-4ea7-a41b-209d697bcdaa
|
2011-06-08 20:26:11 +00:00 |
|
|
|
2faeae220c
|
git-svn-id: svn://svn.icms.temple.edu/lammps-ro/trunk@6341 f3b2605a-c512-4ea7-a41b-209d697bcdaa
|
2011-06-08 20:24:44 +00:00 |
|
|
|
d9824c7583
|
git-svn-id: svn://svn.icms.temple.edu/lammps-ro/trunk@6305 f3b2605a-c512-4ea7-a41b-209d697bcdaa
|
2011-06-07 15:25:20 +00:00 |
|
|
|
96fb599b2d
|
git-svn-id: svn://svn.icms.temple.edu/lammps-ro/trunk@6055 f3b2605a-c512-4ea7-a41b-209d697bcdaa
|
2011-05-02 15:03:20 +00:00 |
|
|
|
c837659cdb
|
git-svn-id: svn://svn.icms.temple.edu/lammps-ro/trunk@5541 f3b2605a-c512-4ea7-a41b-209d697bcdaa
|
2011-01-12 15:27:55 +00:00 |
|
|
|
2e87b46aa4
|
Getting rid of extra CR characters at ends of lines.
git-svn-id: svn://svn.icms.temple.edu/lammps-ro/trunk@5287 f3b2605a-c512-4ea7-a41b-209d697bcdaa
|
2010-11-23 19:56:33 +00:00 |
|
|
|
229a2cd7ff
|
Getting rid of extra CR characters at ends of lines.
git-svn-id: svn://svn.icms.temple.edu/lammps-ro/trunk@5286 f3b2605a-c512-4ea7-a41b-209d697bcdaa
|
2010-11-23 19:54:30 +00:00 |
|
|
|
4e52d8d927
|
Changes from Mike Brown.
git-svn-id: svn://svn.icms.temple.edu/lammps-ro/trunk@5278 f3b2605a-c512-4ea7-a41b-209d697bcdaa
|
2010-11-23 00:41:14 +00:00 |
|
