|
|
8277217db6
|
Merge remote-tracking branch 'lammps-ro/master' into lammps-icms
Resolved Conflicts:
doc/Manual.html
doc/Manual.txt
doc/Section_accelerate.txt
src/KOKKOS/verlet_kokkos.cpp
src/version.h
|
2014-08-28 14:46:43 -04:00 |
|
|
|
d1e51c4359
|
git-svn-id: svn://svn.icms.temple.edu/lammps-ro/trunk@12364 f3b2605a-c512-4ea7-a41b-209d697bcdaa
|
2014-08-27 16:16:07 +00:00 |
|
|
|
a0fba99324
|
git-svn-id: svn://svn.icms.temple.edu/lammps-ro/trunk@12341 f3b2605a-c512-4ea7-a41b-209d697bcdaa
|
2014-08-25 14:29:00 +00:00 |
|
|
|
24717e500c
|
bugfix for atom style suffix testing
|
2014-08-19 09:54:37 -04:00 |
|
|
|
39a94bfbdc
|
Merge remote-tracking branch 'lammps-ro/master' into lammps-icms
Resolved Conflicts:
doc/Manual.html
doc/Manual.txt
doc/package.txt
src/Depend.sh
|
2014-08-19 09:48:29 -04:00 |
|
|
|
0f6eb0877e
|
git-svn-id: svn://svn.icms.temple.edu/lammps-ro/trunk@12310 f3b2605a-c512-4ea7-a41b-209d697bcdaa
|
2014-08-14 16:30:03 +00:00 |
|
|
|
cb8a838a63
|
remove changes left behind from GLE merge
|
2014-08-08 11:25:04 -04:00 |
|
|
|
b95497e8a9
|
Merge branch 'lammps-icms' into cle-orig
|
2014-07-30 15:02:14 -04:00 |
|
|
|
909a9ff697
|
Merge remote-tracking branch 'lammps-ro/master' into lammps-icms
Resolved Conflicts:
doc/Manual.html
doc/Manual.txt
|
2014-07-29 15:13:15 -04:00 |
|
|
|
4455b66003
|
git-svn-id: svn://svn.icms.temple.edu/lammps-ro/trunk@12207 f3b2605a-c512-4ea7-a41b-209d697bcdaa
|
2014-07-28 19:58:51 +00:00 |
|
|
|
86d4432ff8
|
import colored langevin thermostat package from michele ceriotti
this is the unmodified patch without testing its functionality.
|
2014-06-23 18:15:03 -04:00 |
|
|
|
1ee7cb100d
|
Merge remote-tracking branch 'lammps-ro/master' into lammps-icms
Resolved Conflicts:
doc/Manual.html
doc/Manual.txt
src/atom_vec_hybrid.cpp
src/verlet.cpp
|
2014-06-07 19:29:51 -04:00 |
|
|
|
1f667449d1
|
git-svn-id: svn://svn.icms.temple.edu/lammps-ro/trunk@12069 f3b2605a-c512-4ea7-a41b-209d697bcdaa
|
2014-06-04 20:52:04 +00:00 |
|
|
|
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 |
|
|
|
320d269f42
|
git-svn-id: svn://svn.icms.temple.edu/lammps-ro/trunk@11939 f3b2605a-c512-4ea7-a41b-209d697bcdaa
|
2014-05-07 16:30:05 +00:00 |
|
|
|
4c9bba90f1
|
git-svn-id: svn://svn.icms.temple.edu/lammps-ro/trunk@11937 f3b2605a-c512-4ea7-a41b-209d697bcdaa
|
2014-05-07 16:15:31 +00: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 |
|
|
|
1ffcc7ff8b
|
git-svn-id: svn://svn.icms.temple.edu/lammps-ro/trunk@11791 f3b2605a-c512-4ea7-a41b-209d697bcdaa
|
2014-04-15 15:32:19 +00:00 |
|
|
|
5dd6787d0c
|
fix replicate bug, when not all settings were copied
|
2014-04-12 21:04:11 -04:00 |
|
|
|
f8daecd639
|
Merge remote branch 'lammps-ro/master' into lammps-icms
Resolved Conflicts:
doc/Manual.html
doc/Manual.txt
examples/USER/openmp/parm.pegc12e8
examples/USER/openmp/parm.pegc12e8-omp
|
2014-04-09 13:49:45 +02:00 |
|
|
|
fafdfbf5fe
|
git-svn-id: svn://svn.icms.temple.edu/lammps-ro/trunk@11739 f3b2605a-c512-4ea7-a41b-209d697bcdaa
|
2014-04-08 17:35:21 +00:00 |
|
|
|
fb3a956155
|
Merge remote branch 'lammps-ro/master' into lammps-icms
Resolved Conflicts:
src/atom.cpp
|
2014-04-08 12:56:10 +02:00 |
|
|
|
2292ba2c67
|
git-svn-id: svn://svn.icms.temple.edu/lammps-ro/trunk@11735 f3b2605a-c512-4ea7-a41b-209d697bcdaa
|
2014-04-07 22:53:02 +00:00 |
|
|
|
b260aa2b11
|
fix for bug when trying to delete atoms on a node without atoms
|
2014-04-04 04:07:13 -04:00 |
|
|
|
3d6ac732ad
|
git-svn-id: svn://svn.icms.temple.edu/lammps-ro/trunk@11616 f3b2605a-c512-4ea7-a41b-209d697bcdaa
|
2014-03-10 15:45:25 +00:00 |
|
|
|
19252df8ad
|
git-svn-id: svn://svn.icms.temple.edu/lammps-ro/trunk@11403 f3b2605a-c512-4ea7-a41b-209d697bcdaa
|
2014-01-30 21:34:55 +00:00 |
|
|
|
6fbbb51569
|
git-svn-id: svn://svn.icms.temple.edu/lammps-ro/trunk@11395 f3b2605a-c512-4ea7-a41b-209d697bcdaa
|
2014-01-30 19:47:17 +00:00 |
|
|
|
cafa578309
|
git-svn-id: svn://svn.icms.temple.edu/lammps-ro/trunk@11359 f3b2605a-c512-4ea7-a41b-209d697bcdaa
|
2014-01-28 22:39:20 +00:00 |
|
|
|
9cb5fbfb3d
|
git-svn-id: svn://svn.icms.temple.edu/lammps-ro/trunk@11353 f3b2605a-c512-4ea7-a41b-209d697bcdaa
|
2014-01-28 21:51:09 +00:00 |
|
|
|
1f0f8c82c7
|
git-svn-id: svn://svn.icms.temple.edu/lammps-ro/trunk@11352 f3b2605a-c512-4ea7-a41b-209d697bcdaa
|
2014-01-28 21:50:39 +00:00 |
|
|
|
d2b514f351
|
git-svn-id: svn://svn.icms.temple.edu/lammps-ro/trunk@11351 f3b2605a-c512-4ea7-a41b-209d697bcdaa
|
2014-01-28 21:23:26 +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 |
|
|
|
41c5be7a8e
|
git-svn-id: svn://svn.icms.temple.edu/lammps-ro/trunk@11300 f3b2605a-c512-4ea7-a41b-209d697bcdaa
|
2014-01-22 18:33:55 +00:00 |
|
|
|
bad19033d0
|
git-svn-id: svn://svn.icms.temple.edu/lammps-ro/trunk@11250 f3b2605a-c512-4ea7-a41b-209d697bcdaa
|
2014-01-17 18:43:09 +00:00 |
|
|
|
a1ef01fc1a
|
git-svn-id: svn://svn.icms.temple.edu/lammps-ro/trunk@11243 f3b2605a-c512-4ea7-a41b-209d697bcdaa
|
2014-01-14 16:17:20 +00:00 |
|
|
|
21833c99de
|
git-svn-id: svn://svn.icms.temple.edu/lammps-ro/trunk@11192 f3b2605a-c512-4ea7-a41b-209d697bcdaa
|
2014-01-08 20:38:38 +00:00 |
|
|
|
02cd6e118b
|
git-svn-id: svn://svn.icms.temple.edu/lammps-ro/trunk@11125 f3b2605a-c512-4ea7-a41b-209d697bcdaa
|
2013-12-18 13:28:46 +00:00 |
|
|
|
a9f063d9d9
|
git-svn-id: svn://svn.icms.temple.edu/lammps-ro/trunk@11114 f3b2605a-c512-4ea7-a41b-209d697bcdaa
|
2013-12-17 00:21:39 +00:00 |
|
|
|
3237d21989
|
git-svn-id: svn://svn.icms.temple.edu/lammps-ro/trunk@10966 f3b2605a-c512-4ea7-a41b-209d697bcdaa
|
2013-11-05 15:52:15 +00:00 |
|
|
|
328cbc4db9
|
git-svn-id: svn://svn.icms.temple.edu/lammps-ro/trunk@10351 f3b2605a-c512-4ea7-a41b-209d697bcdaa
|
2013-07-25 20:24:46 +00:00 |
|
|
|
48510d047b
|
git-svn-id: svn://svn.icms.temple.edu/lammps-ro/trunk@10350 f3b2605a-c512-4ea7-a41b-209d697bcdaa
|
2013-07-25 19:47:41 +00:00 |
|
|
|
856f78e50a
|
git-svn-id: svn://svn.icms.temple.edu/lammps-ro/trunk@10349 f3b2605a-c512-4ea7-a41b-209d697bcdaa
|
2013-07-25 17:47:47 +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 |
|
|
|
91b7613960
|
git-svn-id: svn://svn.icms.temple.edu/lammps-ro/trunk@9604 f3b2605a-c512-4ea7-a41b-209d697bcdaa
|
2013-03-07 17:32:03 +00:00 |
|
|
|
20ad5bdda3
|
git-svn-id: svn://svn.icms.temple.edu/lammps-ro/trunk@9602 f3b2605a-c512-4ea7-a41b-209d697bcdaa
|
2013-03-07 16:16:01 +00:00 |
|
|
|
0316286abb
|
git-svn-id: svn://svn.icms.temple.edu/lammps-ro/trunk@9601 f3b2605a-c512-4ea7-a41b-209d697bcdaa
|
2013-03-07 15:50:09 +00:00 |
|
|
|
7309370570
|
git-svn-id: svn://svn.icms.temple.edu/lammps-ro/trunk@9599 f3b2605a-c512-4ea7-a41b-209d697bcdaa
|
2013-03-07 15:35:07 +00:00 |
|
|
|
e4eb1da5f7
|
git-svn-id: svn://svn.icms.temple.edu/lammps-ro/trunk@9390 f3b2605a-c512-4ea7-a41b-209d697bcdaa
|
2013-02-01 21:14:45 +00:00 |
|
|
|
0c6b84987c
|
git-svn-id: svn://svn.icms.temple.edu/lammps-ro/trunk@9346 f3b2605a-c512-4ea7-a41b-209d697bcdaa
|
2013-01-31 16:31:03 +00:00 |
|
|
|
da49b01f76
|
git-svn-id: svn://svn.icms.temple.edu/lammps-ro/trunk@9206 f3b2605a-c512-4ea7-a41b-209d697bcdaa
|
2013-01-03 17:17:45 +00:00 |
|
