|
|
1e9a4cc4b8
|
Merge remote-tracking branch 'lammps-ro/master' into lammps-icms
# Resolved Conflicts:
# doc/Manual.html
# doc/Manual.txt
# src/REAX/fix_reax_bonds.cpp
# src/REAX/fix_reax_bonds.h
# src/REAX/pair_reax.cpp
# src/USER-MGPT/pair_mgpt.cpp
# src/USER-SMTBQ/pair_smtbq.cpp
# src/lammps.cpp
# src/timer.cpp
|
2015-10-31 10:54:08 -04:00 |
|
|
|
354e20f431
|
git-svn-id: svn://svn.icms.temple.edu/lammps-ro/trunk@14220 f3b2605a-c512-4ea7-a41b-209d697bcdaa
|
2015-10-30 20:04:06 +00:00 |
|
|
|
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 |
|
|
|
8428bd3d9d
|
git-svn-id: svn://svn.icms.temple.edu/lammps-ro/trunk@13348 f3b2605a-c512-4ea7-a41b-209d697bcdaa
|
2015-03-31 22:01:37 +00:00 |
|
|
|
e4a631c084
|
compilation fixes to correct inconsistent changes in the git repo
|
2015-03-31 15:33:03 -04:00 |
|
|
|
cfc5c8b277
|
git-svn-id: svn://svn.icms.temple.edu/lammps-ro/trunk@13343 f3b2605a-c512-4ea7-a41b-209d697bcdaa
|
2015-03-31 18:47:33 +00:00 |
|
|
|
85217cf1b7
|
git-svn-id: svn://svn.icms.temple.edu/lammps-ro/trunk@13339 f3b2605a-c512-4ea7-a41b-209d697bcdaa
|
2015-03-31 15:29:04 +00:00 |
|
|
|
dd00626ec5
|
git-svn-id: svn://svn.icms.temple.edu/lammps-ro/trunk@13337 f3b2605a-c512-4ea7-a41b-209d697bcdaa
|
2015-03-31 15:15:26 +00:00 |
|
|
|
6bfac86da3
|
Merge remote-tracking branch 'lammps-ro/master' into lammps-icms
|
2015-03-31 11:07:45 -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 |
|
|
|
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 |
|
|
|
a6ca3cab54
|
Merge remote-tracking branch 'lammps-ro/master' into lammps-icms
Resolved Conflicts:
src/RIGID/fix_rigid_small.cpp
|
2014-01-16 20:53:36 -05: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 |
|
|
|
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 |
|
|
|
bcab6e829a
|
git-svn-id: svn://svn.icms.temple.edu/lammps-ro/trunk@9458 f3b2605a-c512-4ea7-a41b-209d697bcdaa
|
2013-02-12 23:14:13 +00:00 |
|
|
|
005af0243c
|
next try at having thread safe temperature bias removal/restoration
|
2013-02-10 14:06:55 +01:00 |
|
|
|
dba890a5af
|
git-svn-id: svn://svn.icms.temple.edu/lammps-ro/trunk@9009 f3b2605a-c512-4ea7-a41b-209d697bcdaa
|
2012-10-25 16:29:13 +00:00 |
|
|
|
e9fa893b1c
|
git-svn-id: svn://svn.icms.temple.edu/lammps-ro/trunk@9008 f3b2605a-c512-4ea7-a41b-209d697bcdaa
|
2012-10-25 16:28:17 +00:00 |
|
|
|
66c5617afb
|
git-svn-id: svn://svn.icms.temple.edu/lammps-ro/trunk@8395 f3b2605a-c512-4ea7-a41b-209d697bcdaa
|
2012-06-25 22:03: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 |
|
|
|
ca486045cd
|
git-svn-id: svn://svn.icms.temple.edu/lammps-ro/trunk@6637 f3b2605a-c512-4ea7-a41b-209d697bcdaa
|
2011-08-08 21:36:33 +00:00 |
|
|
|
182a07a2a3
|
git-svn-id: svn://svn.icms.temple.edu/lammps-ro/trunk@6630 f3b2605a-c512-4ea7-a41b-209d697bcdaa
|
2011-08-08 21:19:54 +00:00 |
|
