|
|
187ba17f5a
|
Merge remote-tracking branch 'lammps-ro/master' into lammps-icms
Resolved Conflicts:
doc/Manual.html
doc/Manual.txt
|
2015-04-02 13:28:41 -04:00 |
|
|
|
d497d65930
|
git-svn-id: svn://svn.icms.temple.edu/lammps-ro/trunk@13353 f3b2605a-c512-4ea7-a41b-209d697bcdaa
|
2015-04-01 14:41:30 +00:00 |
|
|
|
95e13af098
|
Merge remote-tracking branch 'lammps-ro/master' into lammps-icms
Resolved Conflicts:
src/USER-EFF/compute_temp_eff.cpp
src/USER-MISC/compute_temp_rotate.cpp
src/compute_temp.cpp
|
2015-04-01 09:03:28 -04:00 |
|
|
|
536ae8000d
|
git-svn-id: svn://svn.icms.temple.edu/lammps-ro/trunk@13349 f3b2605a-c512-4ea7-a41b-209d697bcdaa
|
2015-03-31 22:02:12 +00:00 |
|
|
|
269bff4b14
|
git-svn-id: svn://svn.icms.temple.edu/lammps-ro/trunk@13344 f3b2605a-c512-4ea7-a41b-209d697bcdaa
|
2015-03-31 18:47:58 +00:00 |
|
|
|
a029b21f77
|
Merge remote-tracking branch 'lammps-ro/master' into lammps-icms
|
2015-03-31 08:20:54 -04:00 |
|
|
|
bd37304ade
|
git-svn-id: svn://svn.icms.temple.edu/lammps-ro/trunk@13332 f3b2605a-c512-4ea7-a41b-209d697bcdaa
|
2015-03-30 23:17:06 +00:00 |
|
|
|
03d5a087c9
|
Merge remote branch 'lammps-ro/master' into lammps-icms
|
2015-03-06 12:15:05 +01:00 |
|
|
|
5f1776e2ba
|
git-svn-id: svn://svn.icms.temple.edu/lammps-ro/trunk@13193 f3b2605a-c512-4ea7-a41b-209d697bcdaa
|
2015-03-05 15:39:56 +00:00 |
|
|
|
416f6c25e5
|
Merge remote-tracking branch 'lammps-ro/master' into lammps-icms
Resolved Conflicts:
doc/Manual.html
doc/Manual.txt
|
2014-11-18 10:26:44 -05:00 |
|
|
|
b7ece0fb51
|
git-svn-id: svn://svn.icms.temple.edu/lammps-ro/trunk@12693 f3b2605a-c512-4ea7-a41b-209d697bcdaa
|
2014-11-17 18:11:29 +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 |
|
|
|
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 |
|
|
|
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 |
|
|
|
5dec8bc1fb
|
silence warnings
|
2013-02-07 13:49:46 -05: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 |
|
|
|
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 |
|
|
|
dc41c79c3c
|
git-svn-id: svn://svn.icms.temple.edu/lammps-ro/trunk@1823 f3b2605a-c512-4ea7-a41b-209d697bcdaa
|
2008-05-15 22:42:47 +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 |
|
|
|
6c6d45d796
|
git-svn-id: svn://svn.icms.temple.edu/lammps-ro/trunk@1572 f3b2605a-c512-4ea7-a41b-209d697bcdaa
|
2008-03-05 18:16:59 +00:00 |
|
|
|
271ce0268e
|
git-svn-id: svn://svn.icms.temple.edu/lammps-ro/trunk@1460 f3b2605a-c512-4ea7-a41b-209d697bcdaa
|
2008-02-04 15:51:23 +00:00 |
|
|
|
eff5d1d72b
|
Added compute style temp/com
git-svn-id: svn://svn.icms.temple.edu/lammps-ro/trunk@1457 f3b2605a-c512-4ea7-a41b-209d697bcdaa
|
2008-02-03 23:52:00 +00:00 |
|
