|
|
42ff3a7aba
|
Merge remote-tracking branch 'lammps-ro/master' into lammps-icms
# Conflicts:
# doc/Manual.html
# doc/Manual.txt
|
2015-07-07 07:39:44 -04:00 |
|
|
|
e60ccb6f9a
|
git-svn-id: svn://svn.icms.temple.edu/lammps-ro/trunk@13533 f3b2605a-c512-4ea7-a41b-209d697bcdaa
|
2015-07-06 16:45:58 +00:00 |
|
|
|
819276d7bb
|
git-svn-id: svn://svn.icms.temple.edu/lammps-ro/trunk@13532 f3b2605a-c512-4ea7-a41b-209d697bcdaa
|
2015-07-06 16:44:56 +00:00 |
|
|
|
0ab61a40ca
|
git-svn-id: svn://svn.icms.temple.edu/lammps-ro/trunk@13531 f3b2605a-c512-4ea7-a41b-209d697bcdaa
|
2015-07-06 16:44:22 +00:00 |
|
|
|
fc933f28ff
|
git-svn-id: svn://svn.icms.temple.edu/lammps-ro/trunk@13530 f3b2605a-c512-4ea7-a41b-209d697bcdaa
|
2015-07-06 16:35:48 +00:00 |
|
|
|
a0163ac956
|
git-svn-id: svn://svn.icms.temple.edu/lammps-ro/trunk@13529 f3b2605a-c512-4ea7-a41b-209d697bcdaa
|
2015-07-06 16:34:33 +00:00 |
|
|
|
1cfff72295
|
git-svn-id: svn://svn.icms.temple.edu/lammps-ro/trunk@13528 f3b2605a-c512-4ea7-a41b-209d697bcdaa
|
2015-07-06 16:34:14 +00:00 |
|
|
|
5aafb05486
|
git-svn-id: svn://svn.icms.temple.edu/lammps-ro/trunk@13527 f3b2605a-c512-4ea7-a41b-209d697bcdaa
|
2015-07-06 16:33:37 +00:00 |
|
|
|
da4f029cfb
|
git-svn-id: svn://svn.icms.temple.edu/lammps-ro/trunk@13526 f3b2605a-c512-4ea7-a41b-209d697bcdaa
|
2015-07-06 16:33:23 +00:00 |
|
|
|
4155d70748
|
git-svn-id: svn://svn.icms.temple.edu/lammps-ro/trunk@13525 f3b2605a-c512-4ea7-a41b-209d697bcdaa
|
2015-07-06 16:32:04 +00:00 |
|
|
|
32f313c2db
|
Merge remote-tracking branch 'lammps-ro/master' into lammps-icms
# Conflicts:
# doc/Manual.html
# doc/Manual.txt
|
2015-07-02 08:34:17 -04:00 |
|
|
|
7579964db7
|
git-svn-id: svn://svn.icms.temple.edu/lammps-ro/trunk@13505 f3b2605a-c512-4ea7-a41b-209d697bcdaa
|
2015-07-02 00:44:28 +00:00 |
|
|
|
b3242e1962
|
git-svn-id: svn://svn.icms.temple.edu/lammps-ro/trunk@13504 f3b2605a-c512-4ea7-a41b-209d697bcdaa
|
2015-07-02 00:44:17 +00:00 |
|
|
|
f9de6b9e61
|
Merge remote branch 'lammps-ro/master' into lammps-icms
Resolved Conflicts:
doc/Manual.html
doc/Manual.txt
|
2015-05-16 13:45:33 +02:00 |
|
|
|
07f62aea1a
|
git-svn-id: svn://svn.icms.temple.edu/lammps-ro/trunk@13471 f3b2605a-c512-4ea7-a41b-209d697bcdaa
|
2015-05-15 19:36:25 +00:00 |
|
|
|
723da5079a
|
git-svn-id: svn://svn.icms.temple.edu/lammps-ro/trunk@13470 f3b2605a-c512-4ea7-a41b-209d697bcdaa
|
2015-05-15 19:27:25 +00:00 |
|
|
|
c3fd41010d
|
git-svn-id: svn://svn.icms.temple.edu/lammps-ro/trunk@13464 f3b2605a-c512-4ea7-a41b-209d697bcdaa
|
2015-05-15 16:33:17 +00:00 |
|
|
|
21db4bc68c
|
update to USER-FEP docs and examples
|
2015-05-15 00:59:50 -04:00 |
|
|
|
b342877199
|
Merge remote-tracking branch 'lammps-ro/master' into lammps-icms
Resolved Conflicts:
doc/Manual.html
doc/Manual.txt
|
2015-04-03 06:33:31 -04:00 |
|
|
|
2b7001c88b
|
git-svn-id: svn://svn.icms.temple.edu/lammps-ro/trunk@13375 f3b2605a-c512-4ea7-a41b-209d697bcdaa
|
2015-04-02 18:26:07 +00:00 |
|
|
|
1514cff5c8
|
git-svn-id: svn://svn.icms.temple.edu/lammps-ro/trunk@13374 f3b2605a-c512-4ea7-a41b-209d697bcdaa
|
2015-04-02 18:23:40 +00:00 |
|
|
|
e94a49d745
|
git-svn-id: svn://svn.icms.temple.edu/lammps-ro/trunk@13370 f3b2605a-c512-4ea7-a41b-209d697bcdaa
|
2015-04-02 14:08:41 +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 |
|
|
|
152c329021
|
git-svn-id: svn://svn.icms.temple.edu/lammps-ro/trunk@13340 f3b2605a-c512-4ea7-a41b-209d697bcdaa
|
2015-03-31 17:24:51 +00:00 |
|
|
|
54233c58b1
|
Merge remote-tracking branch 'lammps-ro/master' into lammps-icms
Resolved Conflicts:
doc/Manual.html
doc/Manual.txt
|
2015-03-18 07:26:15 -04:00 |
|
|
|
03662ee700
|
git-svn-id: svn://svn.icms.temple.edu/lammps-ro/trunk@13238 f3b2605a-c512-4ea7-a41b-209d697bcdaa
|
2015-03-17 16:06:01 +00:00 |
|
|
|
d6d368f447
|
Merge remote branch 'lammps-ro/master' into lammps-icms
Resolved Conflicts:
doc/Manual.html
doc/Manual.txt
|
2015-03-07 14:41:45 +01:00 |
|
|
|
bf8dc7e069
|
git-svn-id: svn://svn.icms.temple.edu/lammps-ro/trunk@13200 f3b2605a-c512-4ea7-a41b-209d697bcdaa
|
2015-03-06 15:38:29 +00:00 |
|
|
|
09bb220083
|
Merge remote-tracking branch 'lammps-ro/master' into lammps-icms
Resolved Conflicts:
doc/Manual.html
doc/Manual.txt
|
2015-02-25 17:03:53 -05:00 |
|
|
|
cb912c1954
|
git-svn-id: svn://svn.icms.temple.edu/lammps-ro/trunk@13150 f3b2605a-c512-4ea7-a41b-209d697bcdaa
|
2015-02-24 16:28:56 +00:00 |
|
|
|
7af1fc13f8
|
Merge remote-tracking branch 'lammps-ro/master' into lammps-icms
Resolved Conflicts:
doc/Manual.html
doc/Manual.txt
src/QEQ/fix_qeq.cpp
|
2015-02-20 08:09:55 -05:00 |
|
|
|
ce3595660f
|
git-svn-id: svn://svn.icms.temple.edu/lammps-ro/trunk@13139 f3b2605a-c512-4ea7-a41b-209d697bcdaa
|
2015-02-19 23:58:54 +00:00 |
|
|
|
7043895ff4
|
git-svn-id: svn://svn.icms.temple.edu/lammps-ro/trunk@13138 f3b2605a-c512-4ea7-a41b-209d697bcdaa
|
2015-02-19 23:57:47 +00:00 |
|
|
|
ac19c2ea2e
|
Merge remote-tracking branch 'lammps-ro/master' into lammps-icms
Resolved Conflicts:
doc/Manual.html
doc/Manual.txt
src/USER-CUDA/pppm_cuda.cpp
|
2015-01-21 11:14:31 -05:00 |
|
|
|
b3a0ee76a0
|
git-svn-id: svn://svn.icms.temple.edu/lammps-ro/trunk@12972 f3b2605a-c512-4ea7-a41b-209d697bcdaa
|
2015-01-20 22:45:03 +00:00 |
|
|
|
c5ea04961d
|
git-svn-id: svn://svn.icms.temple.edu/lammps-ro/trunk@12971 f3b2605a-c512-4ea7-a41b-209d697bcdaa
|
2015-01-20 22:38:29 +00:00 |
|
|
|
fc6be0ef34
|
Merge remote-tracking branch 'lammps-ro/master' into lammps-icms
Resolved Conflicts:
doc/Manual.html
doc/Manual.txt
src/USER-OMP/fix_rigid_nh_omp.cpp
|
2015-01-12 10:02:37 -05:00 |
|
|
|
e5ed30891c
|
git-svn-id: svn://svn.icms.temple.edu/lammps-ro/trunk@12916 f3b2605a-c512-4ea7-a41b-209d697bcdaa
|
2015-01-09 16:14:28 +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 |
|
|
|
6d4200ec45
|
git-svn-id: svn://svn.icms.temple.edu/lammps-ro/trunk@12800 f3b2605a-c512-4ea7-a41b-209d697bcdaa
|
2014-11-26 16:05:29 +00:00 |
|
|
|
1bfeda4e3e
|
git-svn-id: svn://svn.icms.temple.edu/lammps-ro/trunk@12799 f3b2605a-c512-4ea7-a41b-209d697bcdaa
|
2014-11-26 16:04:35 +00: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 |
|
|
|
6f94c97e48
|
git-svn-id: svn://svn.icms.temple.edu/lammps-ro/trunk@12786 f3b2605a-c512-4ea7-a41b-209d697bcdaa
|
2014-11-24 19:52:27 +00:00 |
|
|
|
223eea1510
|
git-svn-id: svn://svn.icms.temple.edu/lammps-ro/trunk@12784 f3b2605a-c512-4ea7-a41b-209d697bcdaa
|
2014-11-24 19:38:27 +00:00 |
|
|
|
a52ad2d6dd
|
git-svn-id: svn://svn.icms.temple.edu/lammps-ro/trunk@12772 f3b2605a-c512-4ea7-a41b-209d697bcdaa
|
2014-11-24 17:14:39 +00:00 |
|
|
|
72bf576c1a
|
Merge remote-tracking branch 'lammps-ro/master' into lammps-icms
Resolved Conflicts:
doc/Manual.html
doc/Manual.txt
src/compute_force_molecule.cpp
|
2014-11-21 10:05:55 -05:00 |
|
|
|
d845ef5e8f
|
ATC version 2.0, date: Nov20
git-svn-id: svn://svn.icms.temple.edu/lammps-ro/trunk@12758 f3b2605a-c512-4ea7-a41b-209d697bcdaa
|
2014-11-20 18:59:07 +00:00 |
|
|
|
7d179faa17
|
update colvars example outputs
|
2014-11-06 16:46:41 -05:00 |
|
|
|
8014e5cf0d
|
Merge remote-tracking branch 'lammps-ro/master' into lammps-icms
Resolved Conflicts:
doc/Manual.html
doc/Manual.txt
|
2014-11-06 11:03:09 -05:00 |
|
|
|
79034a7dcf
|
git-svn-id: svn://svn.icms.temple.edu/lammps-ro/trunk@12682 f3b2605a-c512-4ea7-a41b-209d697bcdaa
|
2014-11-05 21:37:16 +00:00 |
|
