|
|
dbaf66018c
|
Merge remote-tracking branch 'lammps-ro/master' into lammps-icms
# Conflicts:
# doc/Manual.html
# doc/Manual.txt
|
2015-07-25 07:38:21 -04:00 |
|
|
|
2a05c2eaec
|
git-svn-id: svn://svn.icms.temple.edu/lammps-ro/trunk@13723 f3b2605a-c512-4ea7-a41b-209d697bcdaa
|
2015-07-24 23:22:18 +00:00 |
|
|
|
bbef0a814a
|
git-svn-id: svn://svn.icms.temple.edu/lammps-ro/trunk@13722 f3b2605a-c512-4ea7-a41b-209d697bcdaa
|
2015-07-24 23:15:45 +00:00 |
|
|
|
6295fc6908
|
git-svn-id: svn://svn.icms.temple.edu/lammps-ro/trunk@13616 f3b2605a-c512-4ea7-a41b-209d697bcdaa
|
2015-07-16 22:30:07 +00:00 |
|
|
|
f7bc08d83d
|
git-svn-id: svn://svn.icms.temple.edu/lammps-ro/trunk@13601 f3b2605a-c512-4ea7-a41b-209d697bcdaa
|
2015-07-15 21:29:44 +00:00 |
|
|
|
f80fb40454
|
Merge remote-tracking branch 'lammps-ro/master' into lammps-icms
|
2015-07-14 11:19:37 -04:00 |
|
|
|
ac35671f8a
|
git-svn-id: svn://svn.icms.temple.edu/lammps-ro/trunk@13568 f3b2605a-c512-4ea7-a41b-209d697bcdaa
|
2015-07-13 15:00:47 +00:00 |
|
|
|
e991597c60
|
include update/bugfix for compute ackland/atom from brian barnes
|
2015-07-01 13:34:23 -04:00 |
|
|
|
417a56728c
|
more fixes for C++11 compatibility
|
2015-06-17 16:40:25 -04:00 |
|
|
|
d35e3291a3
|
removed dead code and silence warnings about C++ standard violations
|
2015-06-17 15:56:14 -04:00 |
|
|
|
db1599c2ec
|
remove trailing whitespace from SRP code
|
2015-06-15 16:44:33 -04:00 |
|
|
|
a58542235c
|
create unique fix ids, so that pair_style srp can be used multiple times
|
2015-06-15 16:42:02 -04:00 |
|
|
|
8e12509c39
|
patch from tim sirk that allows applying pair_style srp to all bonds
|
2015-06-15 16:37:38 -04:00 |
|
|
|
6106843d57
|
git-svn-id: svn://svn.icms.temple.edu/lammps-ro/trunk@13467 f3b2605a-c512-4ea7-a41b-209d697bcdaa
|
2015-05-15 16:51:23 +00:00 |
|
|
|
5bc5c72e4b
|
fix compilation with cygwin
|
2015-04-24 14:13:34 -04: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 |
|
|
|
5f0a752513
|
Merge remote-tracking branch 'lammps-ro/master' into lammps-icms
|
2015-03-25 06:26:42 -04:00 |
|
|
|
25b928b276
|
git-svn-id: svn://svn.icms.temple.edu/lammps-ro/trunk@13282 f3b2605a-c512-4ea7-a41b-209d697bcdaa
|
2015-03-24 15:34:07 +00:00 |
|
|
|
a4f7f9c868
|
Merge remote-tracking branch 'lammps-ro/master' into lammps-icms
Resolved Conflicts:
doc/Manual.html
doc/Manual.txt
|
2015-03-05 08:05:18 -05:00 |
|
|
|
b33a0164de
|
git-svn-id: svn://svn.icms.temple.edu/lammps-ro/trunk@13170 f3b2605a-c512-4ea7-a41b-209d697bcdaa
|
2015-03-04 16:33:18 +00:00 |
|
|
|
00834f6d84
|
git-svn-id: svn://svn.icms.temple.edu/lammps-ro/trunk@13127 f3b2605a-c512-4ea7-a41b-209d697bcdaa
|
2015-02-19 18:23:31 +00:00 |
|
|
|
b1dcc1da55
|
dead code removal from warnings flagged by clang++ but not g++
|
2015-02-17 14:02:41 -05:00 |
|
|
|
4fdb97ee48
|
Merge remote-tracking branch 'lammps-ro/master' into lammps-icms
Resolved Conflicts:
doc/Manual.html
doc/Manual.txt
|
2015-02-05 10:36:13 -05:00 |
|
|
|
25e63c7a08
|
git-svn-id: svn://svn.icms.temple.edu/lammps-ro/trunk@13037 f3b2605a-c512-4ea7-a41b-209d697bcdaa
|
2015-02-04 20:59:58 +00:00 |
|
|
|
8d532d93e9
|
Merge remote-tracking branch 'lammps-ro/master' into lammps-icms
Resolved Conflicts:
doc/Manual.html
doc/Manual.txt
doc/fix_adapt.txt
doc/fix_adapt_fep.txt
|
2015-01-20 07:09:33 -05:00 |
|
|
|
4a975dd8cf
|
git-svn-id: svn://svn.icms.temple.edu/lammps-ro/trunk@12957 f3b2605a-c512-4ea7-a41b-209d697bcdaa
|
2015-01-19 23:49:20 +00:00 |
|
|
|
72ac6ea854
|
git-svn-id: svn://svn.icms.temple.edu/lammps-ro/trunk@12956 f3b2605a-c512-4ea7-a41b-209d697bcdaa
|
2015-01-19 23:43:48 +00:00 |
|
|
|
db7aa98b6e
|
git-svn-id: svn://svn.icms.temple.edu/lammps-ro/trunk@12938 f3b2605a-c512-4ea7-a41b-209d697bcdaa
|
2015-01-14 16:22:39 +00:00 |
|
|
|
fb862de443
|
fix compilation with -DLAMMPS_BIGBIG
|
2015-01-14 07:37:56 -05:00 |
|
|
|
5838c3c542
|
Merge remote-tracking branch 'lammps-ro/master' into lammps-icms
Resolved Conflicts:
doc/Manual.html
doc/Manual.txt
src/RIGID/fix_rigid.cpp
|
2015-01-06 09:26:22 -05:00 |
|
|
|
1aefa8d624
|
git-svn-id: svn://svn.icms.temple.edu/lammps-ro/trunk@12859 f3b2605a-c512-4ea7-a41b-209d697bcdaa
|
2015-01-05 15:41:14 +00:00 |
|
|
|
ced125c2b4
|
git-svn-id: svn://svn.icms.temple.edu/lammps-ro/trunk@12819 f3b2605a-c512-4ea7-a41b-209d697bcdaa
|
2014-12-05 22:05:02 +00:00 |
|
|
|
d64c77b83c
|
import maintenance patch from michele ceriotti for fix gle and fix ipi
|
2014-12-04 17:30:34 -05:00 |
|
|
|
4529a6c726
|
Merge remote-tracking branch 'lammps-ro/master' into lammps-icms
Resolved Conflicts:
src/USER-COLVARS/colvarproxy_lammps.h
|
2014-12-04 08:44:59 -05:00 |
|
|
|
aeb7fec23a
|
git-svn-id: svn://svn.icms.temple.edu/lammps-ro/trunk@12814 f3b2605a-c512-4ea7-a41b-209d697bcdaa
|
2014-12-02 02:15:39 +00:00 |
|
|
|
74ba3d3095
|
Merge remote-tracking branch 'lammps-ro/master' into lammps-icms
Resolved Conflicts:
doc/Manual.html
doc/Manual.txt
|
2014-12-01 11:27:44 -05:00 |
|
|
|
362f7ad110
|
git-svn-id: svn://svn.icms.temple.edu/lammps-ro/trunk@12808 f3b2605a-c512-4ea7-a41b-209d697bcdaa
|
2014-12-01 15:16:00 +00:00 |
|
|
|
b893e39fba
|
add missing C++ emacs cookies to recently added header files
|
2014-11-26 12:27:08 -05:00 |
|
|
|
eb8b18913b
|
git-svn-id: svn://svn.icms.temple.edu/lammps-ro/trunk@12798 f3b2605a-c512-4ea7-a41b-209d697bcdaa
|
2014-11-26 16:03:06 +00:00 |
|
|
|
cb0a9998bd
|
use MPI_STATUS_IGNORE where possible
|
2014-11-25 17:44:03 -05:00 |
|
|
|
475aa20270
|
Merge remote-tracking branch 'lammps-ro/master' into lammps-icms
Resolved Conflicts:
doc/Manual.html
doc/Manual.txt
doc/Section_intro.txt
doc/fix_gle.txt
doc/fix_ipi.txt
examples/USER/i-pi/README
src/USER-MISC/README
src/USER-MISC/fix_gle.cpp
src/USER-MISC/fix_ipi.cpp
src/USER-MISC/fix_ipi.h
|
2014-11-25 15:01:31 -05:00 |
|
