|
|
cfb62d3358
|
import improved documentation for pppm/disp from rolf
|
2015-02-11 08:09:31 -05:00 |
|
|
|
d3a1cb6675
|
Merge remote-tracking branch 'lammps-ro/master' into lammps-icms
Resolved Conflicts:
doc/Manual.html
doc/Manual.txt
|
2015-02-09 12:05:50 -05:00 |
|
|
|
36421c5c12
|
git-svn-id: svn://svn.icms.temple.edu/lammps-ro/trunk@13080 f3b2605a-c512-4ea7-a41b-209d697bcdaa
|
2015-02-07 00:26:42 +00: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 |
|
|
|
6c48e6f6d5
|
git-svn-id: svn://svn.icms.temple.edu/lammps-ro/trunk@13062 f3b2605a-c512-4ea7-a41b-209d697bcdaa
|
2015-02-04 22:23:48 +00:00 |
|
|
|
dee608a73a
|
git-svn-id: svn://svn.icms.temple.edu/lammps-ro/trunk@13051 f3b2605a-c512-4ea7-a41b-209d697bcdaa
|
2015-02-04 21:27:11 +00:00 |
|
|
|
6140416eba
|
git-svn-id: svn://svn.icms.temple.edu/lammps-ro/trunk@13043 f3b2605a-c512-4ea7-a41b-209d697bcdaa
|
2015-02-04 21:08:58 +00:00 |
|
|
|
a695874c7f
|
git-svn-id: svn://svn.icms.temple.edu/lammps-ro/trunk@13032 f3b2605a-c512-4ea7-a41b-209d697bcdaa
|
2015-02-04 18:13:25 +00:00 |
|
|
|
c3cb0e9124
|
Merge remote-tracking branch 'lammps-ro/master' into lammps-icms
Resolved Conflicts:
doc/Manual.html
doc/Manual.txt
src/USER-FEP/pair_lj_cut_coul_cut_soft.cpp
src/USER-FEP/pair_lj_cut_coul_long_soft.cpp
src/USER-FEP/pair_lj_cut_soft.cpp
|
2015-02-02 15:23:42 -05:00 |
|
|
|
d98318fd76
|
git-svn-id: svn://svn.icms.temple.edu/lammps-ro/trunk@13015 f3b2605a-c512-4ea7-a41b-209d697bcdaa
|
2015-01-30 22:25: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 |
|
|
|
5b0ba7980c
|
git-svn-id: svn://svn.icms.temple.edu/lammps-ro/trunk@12982 f3b2605a-c512-4ea7-a41b-209d697bcdaa
|
2015-01-20 23:48:30 +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 |
|
|
|
38664b904f
|
git-svn-id: svn://svn.icms.temple.edu/lammps-ro/trunk@12959 f3b2605a-c512-4ea7-a41b-209d697bcdaa
|
2015-01-19 23:54:49 +00:00 |
|
|
|
a080316187
|
git-svn-id: svn://svn.icms.temple.edu/lammps-ro/trunk@12953 f3b2605a-c512-4ea7-a41b-209d697bcdaa
|
2015-01-19 22:27:57 +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 |
|
|
|
af8e1ea843
|
git-svn-id: svn://svn.icms.temple.edu/lammps-ro/trunk@12931 f3b2605a-c512-4ea7-a41b-209d697bcdaa
|
2015-01-10 00:18:07 +00:00 |
|
|
|
97f296304d
|
git-svn-id: svn://svn.icms.temple.edu/lammps-ro/trunk@12926 f3b2605a-c512-4ea7-a41b-209d697bcdaa
|
2015-01-09 17:16:14 +00:00 |
|
|
|
eea5a1692d
|
Merge remote-tracking branch 'lammps-ro/master' into lammps-icms
Resolved Conflicts:
doc/Manual.html
doc/Manual.txt
|
2015-01-08 06:40:31 -05:00 |
|
|
|
22bfbbda3a
|
git-svn-id: svn://svn.icms.temple.edu/lammps-ro/trunk@12889 f3b2605a-c512-4ea7-a41b-209d697bcdaa
|
2015-01-06 21:10:16 +00: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 |
|
|
|
2139d30bc4
|
git-svn-id: svn://svn.icms.temple.edu/lammps-ro/trunk@12876 f3b2605a-c512-4ea7-a41b-209d697bcdaa
|
2015-01-05 22:47:09 +00:00 |
|
|
|
30ff5e89ff
|
Merge remote-tracking branch 'lammps-ro/master' into lammps-icms
Resolved Conflicts:
doc/Manual.html
doc/Manual.txt
|
2014-12-23 08:21:23 -05:00 |
|
|
|
31b5481be2
|
git-svn-id: svn://svn.icms.temple.edu/lammps-ro/trunk@12855 f3b2605a-c512-4ea7-a41b-209d697bcdaa
|
2014-12-22 23:37:30 +00:00 |
|
|
|
fde857bbfc
|
Merge remote-tracking branch 'lammps-ro/master' into lammps-icms
Resolved Conflicts:
doc/Manual.html
doc/Manual.txt
|
2014-12-20 20:24:02 -05:00 |
|
|
|
20d022472f
|
git-svn-id: svn://svn.icms.temple.edu/lammps-ro/trunk@12846 f3b2605a-c512-4ea7-a41b-209d697bcdaa
|
2014-12-20 00:36:33 +00:00 |
|
|
|
50583f19d9
|
Merge remote-tracking branch 'lammps-ro/master' into lammps-icms
Resolved Conflicts:
doc/Manual.html
doc/Manual.txt
|
2014-12-18 11:30:26 -05:00 |
|
|
|
7948ae9178
|
git-svn-id: svn://svn.icms.temple.edu/lammps-ro/trunk@12836 f3b2605a-c512-4ea7-a41b-209d697bcdaa
|
2014-12-17 16:11:28 +00:00 |
|
|
|
9d5bca50f2
|
Merge remote-tracking branch 'lammps-ro/master' into lammps-icms
Resolved Conflicts:
doc/Manual.html
doc/Manual.txt
|
2014-12-10 08:31:15 -05:00 |
|
|
|
bfb56a8918
|
git-svn-id: svn://svn.icms.temple.edu/lammps-ro/trunk@12824 f3b2605a-c512-4ea7-a41b-209d697bcdaa
|
2014-12-09 19:43:05 +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 |
|
|
|
16953742f7
|
git-svn-id: svn://svn.icms.temple.edu/lammps-ro/trunk@12802 f3b2605a-c512-4ea7-a41b-209d697bcdaa
|
2014-11-26 16:05:53 +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 |
|
|
|
2bd1303e75
|
git-svn-id: svn://svn.icms.temple.edu/lammps-ro/trunk@12781 f3b2605a-c512-4ea7-a41b-209d697bcdaa
|
2014-11-24 17:43:22 +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 |
|
|
|
94769a0e19
|
git-svn-id: svn://svn.icms.temple.edu/lammps-ro/trunk@12760 f3b2605a-c512-4ea7-a41b-209d697bcdaa
|
2014-11-20 21:08:49 +00:00 |
|
|
|
00a18085eb
|
Merge remote-tracking branch 'lammps-ro/master' into lammps-icms
Resolved Conflicts:
doc/Manual.html
doc/Manual.txt
|
2014-11-20 10:51:29 -05:00 |
|
|
|
e835f4b6f1
|
git-svn-id: svn://svn.icms.temple.edu/lammps-ro/trunk@12738 f3b2605a-c512-4ea7-a41b-209d697bcdaa
|
2014-11-19 18:20:56 +00:00 |
|
|
|
0617d87047
|
git-svn-id: svn://svn.icms.temple.edu/lammps-ro/trunk@12732 f3b2605a-c512-4ea7-a41b-209d697bcdaa
|
2014-11-19 17:28:25 +00:00 |
|
|
|
d865a1d8e5
|
Merge remote-tracking branch 'lammps-ro/master' into lammps-icms
Resolved Conflicts:
doc/Manual.html
doc/Manual.txt
src/USER-MISC/README
|
2014-11-19 11:11:34 -05:00 |
|
|
|
c291b2b3de
|
git-svn-id: svn://svn.icms.temple.edu/lammps-ro/trunk@12725 f3b2605a-c512-4ea7-a41b-209d697bcdaa
|
2014-11-18 21:01:54 +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 |
|
|
|
351a98482d
|
git-svn-id: svn://svn.icms.temple.edu/lammps-ro/trunk@12712 f3b2605a-c512-4ea7-a41b-209d697bcdaa
|
2014-11-17 23:57:22 +00:00 |
|
|
|
45f40ad299
|
git-svn-id: svn://svn.icms.temple.edu/lammps-ro/trunk@12701 f3b2605a-c512-4ea7-a41b-209d697bcdaa
|
2014-11-17 18:36:53 +00:00 |
|
|
|
b6889dfc6a
|
git-svn-id: svn://svn.icms.temple.edu/lammps-ro/trunk@12696 f3b2605a-c512-4ea7-a41b-209d697bcdaa
|
2014-11-17 18:28:38 +00: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 |
|
|
|
bd63d4b967
|
git-svn-id: svn://svn.icms.temple.edu/lammps-ro/trunk@12680 f3b2605a-c512-4ea7-a41b-209d697bcdaa
|
2014-11-05 16:36:12 +00:00 |
|
|
|
4a07b74790
|
Merge remote-tracking branch 'lammps-ro/master' into lammps-icms
Resolved Conflicts:
doc/Manual.html
doc/Manual.txt
src/USER-REAXC/reaxc_init_md.cpp
src/fix_recenter.cpp
src/neighbor.cpp
|
2014-10-31 09:16:10 -04:00 |
|
|
|
aee4de2f0a
|
git-svn-id: svn://svn.icms.temple.edu/lammps-ro/trunk@12671 f3b2605a-c512-4ea7-a41b-209d697bcdaa
|
2014-10-30 16:58:14 +00:00 |
|
|
|
a8e2433a2a
|
Merge remote branch 'lammps-ro/master' into lammps-icms
Resolved Conflicts:
doc/Manual.html
doc/Manual.txt
|
2014-10-30 11:23:57 +01:00 |
|
