|
|
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 |
|
|
|
573db9e2f7
|
Merge remote-tracking branch 'lammps-ro/master' into lammps-icms
Resolved Conflicts:
doc/Manual.html
doc/Manual.txt
doc/fix_oneway.txt
doc/fix_temp_csvr.txt
src/fix_move.cpp
src/fix_nh.cpp
src/fix_temp_csvr.cpp
src/neigh_stencil.cpp
src/pair.cpp
src/pair_hybrid.cpp
src/read_data.cpp
tools/msi2lmp/src/msi2lmp.c
tools/msi2lmp/src/msi2lmp.h
Signed-off-by: Axel Kohlmeyer <akohlmey@gmail.com>
|
2014-03-12 17:43:22 -04:00 |
|
|
|
5e1d34a23d
|
git-svn-id: svn://svn.icms.temple.edu/lammps-ro/trunk@11617 f3b2605a-c512-4ea7-a41b-209d697bcdaa
|
2014-03-10 15:56:49 +00:00 |
|
|
|
396883b6bb
|
Merge remote branch 'lammps-ro/master' into lammps-icms
Resolved Conflicts:
doc/Manual.txt
src/lammps.cpp
|
2013-07-25 13:01:36 +02:00 |
|
|
|
8bcd618af1
|
git-svn-id: svn://svn.icms.temple.edu/lammps-ro/trunk@10319 f3b2605a-c512-4ea7-a41b-209d697bcdaa
|
2013-07-24 14:15:39 +00:00 |
|
|
|
0e04550043
|
massive patch to flag non-numeric input
|
2013-06-23 14:34:38 +02: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 |
|
|
|
a64357160f
|
git-svn-id: svn://svn.icms.temple.edu/lammps-ro/trunk@9108 f3b2605a-c512-4ea7-a41b-209d697bcdaa
|
2012-11-26 18:29:31 +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 |
|
|
|
1f2a7add78
|
git-svn-id: svn://svn.icms.temple.edu/lammps-ro/trunk@5836 f3b2605a-c512-4ea7-a41b-209d697bcdaa
|
2011-03-26 00:50:29 +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 |
|
|
|
9600268de9
|
git-svn-id: svn://svn.icms.temple.edu/lammps-ro/trunk@4320 f3b2605a-c512-4ea7-a41b-209d697bcdaa
|
2010-06-18 19:49:12 +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 |
|
|
|
746690d402
|
git-svn-id: svn://svn.icms.temple.edu/lammps-ro/trunk@2958 f3b2605a-c512-4ea7-a41b-209d697bcdaa
|
2009-07-02 18:01:55 +00:00 |
|
|
|
180f47525d
|
git-svn-id: svn://svn.icms.temple.edu/lammps-ro/trunk@2795 f3b2605a-c512-4ea7-a41b-209d697bcdaa
|
2009-04-30 20:59:46 +00:00 |
|
|
|
a4d85b50ac
|
git-svn-id: svn://svn.icms.temple.edu/lammps-ro/trunk@2783 f3b2605a-c512-4ea7-a41b-209d697bcdaa
|
2009-04-29 17:22:30 +00:00 |
|
|
|
d4991f42ec
|
git-svn-id: svn://svn.icms.temple.edu/lammps-ro/trunk@2782 f3b2605a-c512-4ea7-a41b-209d697bcdaa
|
2009-04-29 17:19:57 +00:00 |
|
|
|
16ef076c31
|
git-svn-id: svn://svn.icms.temple.edu/lammps-ro/trunk@2780 f3b2605a-c512-4ea7-a41b-209d697bcdaa
|
2009-04-29 16:54:06 +00:00 |
|
