|
|
0b97aa46bd
|
more files to ignore
|
2011-12-11 21:49:39 -05:00 |
|
|
|
c252853d30
|
import tersoff/zbl bugfix from LAMMPS-ICMS
|
2011-12-11 20:43:58 -05:00 |
|
|
|
3b72d88e35
|
add fix spring/self enhancement from LAMMPS-ICMS
|
2011-12-11 20:22:08 -05:00 |
|
|
|
d7aab37be4
|
Merge branch 'master' into openmp-master
Resolved Conflicts:
doc/processors.txt
|
2011-12-10 18:45:47 -05:00 |
|
|
|
7cb225f64a
|
add documentation for FLD /omp styles.
|
2011-12-09 19:59:57 -05:00 |
|
|
|
a1c0b66824
|
more files to ignore
|
2011-12-09 19:52:58 -05:00 |
|
|
|
65bcbb9073
|
correct permissions
|
2011-12-09 19:51:20 -05:00 |
|
|
|
4d9b004a40
|
update load balancing styles
|
2011-12-09 19:50:29 -05:00 |
|
|
|
092b1c73b2
|
added OpenMP versions of some FLD pair styles
|
2011-12-09 19:49:47 -05:00 |
|
|
|
adbeb0277b
|
git-svn-id: svn://svn.icms.temple.edu/lammps-ro/trunk@7336 f3b2605a-c512-4ea7-a41b-209d697bcdaa
|
2011-12-10 00:33:20 +00:00 |
|
|
|
43a79f1a56
|
git-svn-id: svn://svn.icms.temple.edu/lammps-ro/trunk@7335 f3b2605a-c512-4ea7-a41b-209d697bcdaa
|
2011-12-09 22:45:19 +00:00 |
|
|
|
d08826bb58
|
convert MPI stubs library to use C bindings
|
2011-12-09 15:45:04 -05:00 |
|
|
|
c97d2cac54
|
avoid memory leak when turning load balancing off
|
2011-12-09 15:08:23 -05:00 |
|
|
|
77d1c7cd36
|
add documentation for load balancing
|
2011-12-09 14:47:10 -05:00 |
|
|
|
7b3a54ed86
|
cleanup and simplification of load balancing support
|
2011-12-09 14:16:04 -05:00 |
|
|
|
18fca0812b
|
make verlet/split compatible with new timer class
|
2011-12-09 13:47:28 -05:00 |
|
|
|
58c001ef73
|
git-svn-id: svn://svn.icms.temple.edu/lammps-ro/trunk@7334 f3b2605a-c512-4ea7-a41b-209d697bcdaa
|
2011-12-09 16:47:47 +00:00 |
|
|
|
5baa07d3af
|
git-svn-id: svn://svn.icms.temple.edu/lammps-ro/trunk@7333 f3b2605a-c512-4ea7-a41b-209d697bcdaa
|
2011-12-09 16:46:31 +00:00 |
|
|
|
7060c62c8d
|
git-svn-id: svn://svn.icms.temple.edu/lammps-ro/trunk@7332 f3b2605a-c512-4ea7-a41b-209d697bcdaa
|
2011-12-09 16:46:14 +00:00 |
|
|
|
3ad813f032
|
git-svn-id: svn://svn.icms.temple.edu/lammps-ro/trunk@7331 f3b2605a-c512-4ea7-a41b-209d697bcdaa
|
2011-12-09 16:46:09 +00:00 |
|
|
|
7eccb3b489
|
git-svn-id: svn://svn.icms.temple.edu/lammps-ro/trunk@7330 f3b2605a-c512-4ea7-a41b-209d697bcdaa
|
2011-12-09 15:44:15 +00:00 |
|
|
|
333d86f4dd
|
and another conflict issue fixed
|
2011-12-09 09:43:05 -05:00 |
|
|
|
0844548555
|
resolve one more merge conflict
|
2011-12-09 09:41:39 -05:00 |
|
|
|
2b97a34844
|
Merge branch 'master' into openmp-master
Resolved Conflicts:
src/REPLICA/neb.cpp
src/REPLICA/prd.cpp
src/REPLICA/tad.cpp
src/REPLICA/temper.cpp
src/min.cpp
src/minimize.cpp
src/run.cpp
|
2011-12-09 09:40:19 -05:00 |
|
|
|
a978a15c64
|
fix link
|
2011-12-09 09:35:21 -05:00 |
|
|
|
cb224643d7
|
git-svn-id: svn://svn.icms.temple.edu/lammps-ro/trunk@7328 f3b2605a-c512-4ea7-a41b-209d697bcdaa
|
2011-12-09 00:52:48 +00:00 |
|
|
|
e354f74847
|
git-svn-id: svn://svn.icms.temple.edu/lammps-ro/trunk@7327 f3b2605a-c512-4ea7-a41b-209d697bcdaa
|
2011-12-09 00:45:07 +00:00 |
|
|
|
c92047aeb5
|
git-svn-id: svn://svn.icms.temple.edu/lammps-ro/trunk@7326 f3b2605a-c512-4ea7-a41b-209d697bcdaa
|
2011-12-09 00:44:47 +00:00 |
|
|
|
0c982d0f4a
|
Merge branch 'master' into openmp-master
|
2011-12-08 19:12:31 -05:00 |
|
|
|
5fa4f2eb26
|
git-svn-id: svn://svn.icms.temple.edu/lammps-ro/trunk@7325 f3b2605a-c512-4ea7-a41b-209d697bcdaa
|
2011-12-08 23:23:28 +00:00 |
|
|
|
62b27e5915
|
git-svn-id: svn://svn.icms.temple.edu/lammps-ro/trunk@7324 f3b2605a-c512-4ea7-a41b-209d697bcdaa
|
2011-12-08 23:20:32 +00:00 |
|
|
|
650607a38b
|
git-svn-id: svn://svn.icms.temple.edu/lammps-ro/trunk@7323 f3b2605a-c512-4ea7-a41b-209d697bcdaa
|
2011-12-08 23:18:19 +00:00 |
|
|
|
1f81fcf5e4
|
git-svn-id: svn://svn.icms.temple.edu/lammps-ro/trunk@7322 f3b2605a-c512-4ea7-a41b-209d697bcdaa
|
2011-12-08 23:17:38 +00:00 |
|
|
|
bca92d41bd
|
git-svn-id: svn://svn.icms.temple.edu/lammps-ro/trunk@7321 f3b2605a-c512-4ea7-a41b-209d697bcdaa
|
2011-12-08 23:17:25 +00:00 |
|
|
|
f56f6a1a9d
|
git-svn-id: svn://svn.icms.temple.edu/lammps-ro/trunk@7320 f3b2605a-c512-4ea7-a41b-209d697bcdaa
|
2011-12-08 23:16:23 +00:00 |
|
|
|
91388f635f
|
git-svn-id: svn://svn.icms.temple.edu/lammps-ro/trunk@7319 f3b2605a-c512-4ea7-a41b-209d697bcdaa
|
2011-12-08 23:13:51 +00:00 |
|
|
|
501eb48d5b
|
git-svn-id: svn://svn.icms.temple.edu/lammps-ro/trunk@7318 f3b2605a-c512-4ea7-a41b-209d697bcdaa
|
2011-12-08 23:13:23 +00:00 |
|
|
|
4a2feb25b2
|
git-svn-id: svn://svn.icms.temple.edu/lammps-ro/trunk@7317 f3b2605a-c512-4ea7-a41b-209d697bcdaa
|
2011-12-08 23:12:19 +00:00 |
|
|
|
96e9210c16
|
git-svn-id: svn://svn.icms.temple.edu/lammps-ro/trunk@7316 f3b2605a-c512-4ea7-a41b-209d697bcdaa
|
2011-12-08 22:58:18 +00:00 |
|
|
|
6b4fd6d47c
|
git-svn-id: svn://svn.icms.temple.edu/lammps-ro/trunk@7315 f3b2605a-c512-4ea7-a41b-209d697bcdaa
|
2011-12-08 22:50:07 +00:00 |
|
|
|
e1f70c3a98
|
git-svn-id: svn://svn.icms.temple.edu/lammps-ro/trunk@7314 f3b2605a-c512-4ea7-a41b-209d697bcdaa
|
2011-12-08 22:31:22 +00:00 |
|
|
|
e08627bdc8
|
git-svn-id: svn://svn.icms.temple.edu/lammps-ro/trunk@7312 f3b2605a-c512-4ea7-a41b-209d697bcdaa
|
2011-12-08 18:34:42 +00:00 |
|
|
|
b1334c1314
|
git-svn-id: svn://svn.icms.temple.edu/lammps-ro/trunk@7311 f3b2605a-c512-4ea7-a41b-209d697bcdaa
|
2011-12-08 18:32:19 +00:00 |
|
|
|
16a2afc642
|
git-svn-id: svn://svn.icms.temple.edu/lammps-ro/trunk@7310 f3b2605a-c512-4ea7-a41b-209d697bcdaa
|
2011-12-08 17:56:37 +00:00 |
|
|
|
9692aa6aaf
|
git-svn-id: svn://svn.icms.temple.edu/lammps-ro/trunk@7309 f3b2605a-c512-4ea7-a41b-209d697bcdaa
|
2011-12-08 01:13:00 +00:00 |
|
|
|
d17a9d5b0a
|
git-svn-id: svn://svn.icms.temple.edu/lammps-ro/trunk@7307 f3b2605a-c512-4ea7-a41b-209d697bcdaa
|
2011-12-08 01:04:43 +00:00 |
|
|
|
4639a1af57
|
git-svn-id: svn://svn.icms.temple.edu/lammps-ro/trunk@7305 f3b2605a-c512-4ea7-a41b-209d697bcdaa
|
2011-12-08 00:45:56 +00:00 |
|
|
|
9224da83ab
|
git-svn-id: svn://svn.icms.temple.edu/lammps-ro/trunk@7303 f3b2605a-c512-4ea7-a41b-209d697bcdaa
|
2011-12-08 00:32:34 +00:00 |
|
|
|
65c85ffb99
|
git-svn-id: svn://svn.icms.temple.edu/lammps-ro/trunk@7302 f3b2605a-c512-4ea7-a41b-209d697bcdaa
|
2011-12-08 00:30:31 +00:00 |
|
|
|
4f79dab7b3
|
git-svn-id: svn://svn.icms.temple.edu/lammps-ro/trunk@7301 f3b2605a-c512-4ea7-a41b-209d697bcdaa
|
2011-12-08 00:29:41 +00:00 |
|
