|
|
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 |
|
|
|
e5cc471307
|
Merge branch 'master' into lammps-icms
|
2012-11-26 08:47:57 -05:00 |
|
|
|
ed53c9d2d5
|
git-svn-id: svn://svn.icms.temple.edu/lammps-ro/trunk@9036 f3b2605a-c512-4ea7-a41b-209d697bcdaa
|
2012-11-07 15:59:05 +00:00 |
|
|
|
5a75a6c827
|
Merge branch 'master' into lammps-icms
Resolved Conflicts:
src/REPLICA/verlet_split.cpp
src/USER-OMP/fix_omp.cpp
|
2012-10-26 09:50:01 -04:00 |
|
|
|
13dd457ae7
|
git-svn-id: svn://svn.icms.temple.edu/lammps-ro/trunk@9001 f3b2605a-c512-4ea7-a41b-209d697bcdaa
|
2012-10-25 15:23:26 +00:00 |
|
|
|
e2283d1609
|
git-svn-id: svn://svn.icms.temple.edu/lammps-ro/trunk@9000 f3b2605a-c512-4ea7-a41b-209d697bcdaa
|
2012-10-25 15:21:37 +00:00 |
|
|
|
788b01cd71
|
Merge branch 'master' into lammps-icms
|
2012-08-18 17:17:35 -04:00 |
|
|
|
d4215d8844
|
git-svn-id: svn://svn.icms.temple.edu/lammps-ro/trunk@8675 f3b2605a-c512-4ea7-a41b-209d697bcdaa
|
2012-08-16 21:16:03 +00:00 |
|
|
|
ffc41c52c5
|
Merge branch 'master' into lammps-icms
Resolved Conflicts:
lib/meam/Makefile.gfortran
lib/poems/Makefile.g++
lib/reax/Makefile.gfortran
python/lammps.py
src/USER-CUDA/cuda.cpp
|
2012-08-15 08:38:04 -04:00 |
|
|
|
7f5e8cb896
|
git-svn-id: svn://svn.icms.temple.edu/lammps-ro/trunk@8656 f3b2605a-c512-4ea7-a41b-209d697bcdaa
|
2012-08-14 20:13:20 +00:00 |
|
|
|
01830d476b
|
Merge branch 'master' into lammps-icms
Resolved Conflicts:
python/lammps.py
src/MAKE/Makefile.mingw
src/MAKE/Makefile.openmpi
src/MAKE/Makefile.serial
src/MAKE/Makefile.serial_debug
src/USER-CUDA/verlet_cuda.cpp
|
2012-08-14 03:35:29 -04:00 |
|
|
|
9bb3b04ec4
|
git-svn-id: svn://svn.icms.temple.edu/lammps-ro/trunk@8633 f3b2605a-c512-4ea7-a41b-209d697bcdaa
|
2012-08-13 22:27:24 +00:00 |
|
|
|
8df0f9c2e6
|
git-svn-id: svn://svn.icms.temple.edu/lammps-ro/trunk@8631 f3b2605a-c512-4ea7-a41b-209d697bcdaa
|
2012-08-13 22:13:23 +00:00 |
|
|
|
0ea3d01f09
|
git-svn-id: svn://svn.icms.temple.edu/lammps-ro/trunk@8616 f3b2605a-c512-4ea7-a41b-209d697bcdaa
|
2012-08-13 16:12:54 +00:00 |
|
|
|
c6878811f0
|
git-svn-id: svn://svn.icms.temple.edu/lammps-ro/trunk@8602 f3b2605a-c512-4ea7-a41b-209d697bcdaa
|
2012-08-10 23:13:26 +00:00 |
|
|
|
959946a023
|
import patch from joe jordan to find the lammps DSO automatically
|
2012-04-27 10:37:04 -04:00 |
|
|
|
4c98b2d1a9
|
git-svn-id: svn://svn.icms.temple.edu/lammps-ro/trunk@7710 f3b2605a-c512-4ea7-a41b-209d697bcdaa
|
2012-02-06 18:19:20 +00:00 |
|
|
|
5a158918de
|
git-svn-id: svn://svn.icms.temple.edu/lammps-ro/trunk@7237 f3b2605a-c512-4ea7-a41b-209d697bcdaa
|
2011-11-28 22:42:51 +00:00 |
|
|
|
453aba29e5
|
git-svn-id: svn://svn.icms.temple.edu/lammps-ro/trunk@5201 f3b2605a-c512-4ea7-a41b-209d697bcdaa
|
2010-11-02 15:07:40 +00:00 |
|
