|
|
5affb6c013
|
Merge branch 'master' into lammps-icms
# Resolved Conflicts:
# doc/Manual.html
# doc/Manual.txt
# doc/pair_hybrid.txt
# doc/pair_reax.html
# doc/pair_reax.txt
# doc/pair_reax_c.txt
# src/MANYBODY/pair_polymorphic.cpp
|
2015-12-11 07:33:14 -05:00 |
|
|
|
3b6a3f4e55
|
git-svn-id: svn://svn.icms.temple.edu/lammps-ro/trunk@14357 f3b2605a-c512-4ea7-a41b-209d697bcdaa
|
2015-12-10 22:38:44 +00:00 |
|
|
|
4c1ad17581
|
git-svn-id: svn://svn.icms.temple.edu/lammps-ro/trunk@14354 f3b2605a-c512-4ea7-a41b-209d697bcdaa
|
2015-12-10 17:44:45 +00:00 |
|
|
|
d94f71a6a8
|
git-svn-id: svn://svn.icms.temple.edu/lammps-ro/trunk@14352 f3b2605a-c512-4ea7-a41b-209d697bcdaa
|
2015-12-10 17:42:14 +00:00 |
|
|
|
2cf6305dc1
|
git-svn-id: svn://svn.icms.temple.edu/lammps-ro/trunk@14351 f3b2605a-c512-4ea7-a41b-209d697bcdaa
|
2015-12-10 17:40:52 +00:00 |
|
|
|
03a9006979
|
git-svn-id: svn://svn.icms.temple.edu/lammps-ro/trunk@14350 f3b2605a-c512-4ea7-a41b-209d697bcdaa
|
2015-12-10 17:38:13 +00:00 |
|
|
|
28bf73fbf7
|
git-svn-id: svn://svn.icms.temple.edu/lammps-ro/trunk@14349 f3b2605a-c512-4ea7-a41b-209d697bcdaa
|
2015-12-10 17:23:56 +00:00 |
|
|
|
8550cacf18
|
git-svn-id: svn://svn.icms.temple.edu/lammps-ro/trunk@14348 f3b2605a-c512-4ea7-a41b-209d697bcdaa
|
2015-12-10 17:07:56 +00:00 |
|
|
|
86a4507b00
|
git-svn-id: svn://svn.icms.temple.edu/lammps-ro/trunk@14347 f3b2605a-c512-4ea7-a41b-209d697bcdaa
|
2015-12-10 16:55:37 +00:00 |
|
|
|
807e00de93
|
git-svn-id: svn://svn.icms.temple.edu/lammps-ro/trunk@14346 f3b2605a-c512-4ea7-a41b-209d697bcdaa
|
2015-12-10 16:54:13 +00:00 |
|
|
|
59e5d36671
|
Fixing region issue
git-svn-id: svn://svn.icms.temple.edu/lammps-ro/trunk@14343 f3b2605a-c512-4ea7-a41b-209d697bcdaa
|
2015-12-10 16:04:31 +00:00 |
|
|
|
b2a75f111c
|
transfer updates from angle style dipole to dipole/omp
|
2015-12-10 07:23:19 -05:00 |
|
|
|
e7d896a459
|
Merge remote-tracking branch 'lammps-ro/master' into lammps-icms
# Resolved Conflicts:
# doc/Manual.txt
# doc/improper_distance.txt
# doc/pair_mdf.txt
# python/lammps.py
# src/MANYBODY/pair_polymorphic.cpp
# src/MANYBODY/pair_polymorphic.h
|
2015-12-10 06:29:32 -05:00 |
|
|
|
760071bb4c
|
git-svn-id: svn://svn.icms.temple.edu/lammps-ro/trunk@14342 f3b2605a-c512-4ea7-a41b-209d697bcdaa
|
2015-12-09 23:57:59 +00:00 |
|
|
|
0dcabb7080
|
git-svn-id: svn://svn.icms.temple.edu/lammps-ro/trunk@14340 f3b2605a-c512-4ea7-a41b-209d697bcdaa
|
2015-12-09 23:29:22 +00:00 |
|
|
|
fc1a176d04
|
git-svn-id: svn://svn.icms.temple.edu/lammps-ro/trunk@14339 f3b2605a-c512-4ea7-a41b-209d697bcdaa
|
2015-12-09 22:46:13 +00:00 |
|
|
|
93919c35bf
|
git-svn-id: svn://svn.icms.temple.edu/lammps-ro/trunk@14338 f3b2605a-c512-4ea7-a41b-209d697bcdaa
|
2015-12-09 22:38:18 +00:00 |
|
|
|
676cdda5aa
|
git-svn-id: svn://svn.icms.temple.edu/lammps-ro/trunk@14337 f3b2605a-c512-4ea7-a41b-209d697bcdaa
|
2015-12-09 22:32:13 +00:00 |
|
|
|
ab01075956
|
git-svn-id: svn://svn.icms.temple.edu/lammps-ro/trunk@14336 f3b2605a-c512-4ea7-a41b-209d697bcdaa
|
2015-12-09 22:31:43 +00:00 |
|
|
|
704f170053
|
git-svn-id: svn://svn.icms.temple.edu/lammps-ro/trunk@14335 f3b2605a-c512-4ea7-a41b-209d697bcdaa
|
2015-12-09 22:31:34 +00:00 |
|
|
|
82d5d73bba
|
git-svn-id: svn://svn.icms.temple.edu/lammps-ro/trunk@14334 f3b2605a-c512-4ea7-a41b-209d697bcdaa
|
2015-12-09 22:31:24 +00:00 |
|
|
|
8349024265
|
git-svn-id: svn://svn.icms.temple.edu/lammps-ro/trunk@14333 f3b2605a-c512-4ea7-a41b-209d697bcdaa
|
2015-12-09 21:48:11 +00:00 |
|
|
|
b1dc501880
|
git-svn-id: svn://svn.icms.temple.edu/lammps-ro/trunk@14332 f3b2605a-c512-4ea7-a41b-209d697bcdaa
|
2015-12-09 21:47:11 +00:00 |
|
|
|
493f9c469b
|
git-svn-id: svn://svn.icms.temple.edu/lammps-ro/trunk@14331 f3b2605a-c512-4ea7-a41b-209d697bcdaa
|
2015-12-09 21:44:39 +00:00 |
|
|
|
87a47d8b99
|
git-svn-id: svn://svn.icms.temple.edu/lammps-ro/trunk@14330 f3b2605a-c512-4ea7-a41b-209d697bcdaa
|
2015-12-09 21:33:03 +00:00 |
|
|
|
c00aabe736
|
git-svn-id: svn://svn.icms.temple.edu/lammps-ro/trunk@14329 f3b2605a-c512-4ea7-a41b-209d697bcdaa
|
2015-12-09 21:24:31 +00:00 |
|
|
|
900a3aaf9d
|
git-svn-id: svn://svn.icms.temple.edu/lammps-ro/trunk@14328 f3b2605a-c512-4ea7-a41b-209d697bcdaa
|
2015-12-09 21:10:06 +00:00 |
|
|
|
6eed163c7b
|
git-svn-id: svn://svn.icms.temple.edu/lammps-ro/trunk@14327 f3b2605a-c512-4ea7-a41b-209d697bcdaa
|
2015-12-09 21:09:58 +00:00 |
|
|
|
e000e4a04f
|
git-svn-id: svn://svn.icms.temple.edu/lammps-ro/trunk@14326 f3b2605a-c512-4ea7-a41b-209d697bcdaa
|
2015-12-09 21:09:50 +00:00 |
|
|
|
582ba55e4a
|
git-svn-id: svn://svn.icms.temple.edu/lammps-ro/trunk@14325 f3b2605a-c512-4ea7-a41b-209d697bcdaa
|
2015-12-09 20:28:38 +00:00 |
|
|
|
7920c13b04
|
git-svn-id: svn://svn.icms.temple.edu/lammps-ro/trunk@14323 f3b2605a-c512-4ea7-a41b-209d697bcdaa
|
2015-12-09 18:17:05 +00:00 |
|
|
|
11fe1e862d
|
git-svn-id: svn://svn.icms.temple.edu/lammps-ro/trunk@14322 f3b2605a-c512-4ea7-a41b-209d697bcdaa
|
2015-12-09 18:17:02 +00:00 |
|
|
|
549ea8787b
|
git-svn-id: svn://svn.icms.temple.edu/lammps-ro/trunk@14320 f3b2605a-c512-4ea7-a41b-209d697bcdaa
|
2015-12-09 17:45:54 +00:00 |
|
|
|
90100b4eb0
|
git-svn-id: svn://svn.icms.temple.edu/lammps-ro/trunk@14319 f3b2605a-c512-4ea7-a41b-209d697bcdaa
|
2015-12-09 17:45:52 +00:00 |
|
|
|
c2db79391f
|
git-svn-id: svn://svn.icms.temple.edu/lammps-ro/trunk@14318 f3b2605a-c512-4ea7-a41b-209d697bcdaa
|
2015-12-09 17:45:02 +00:00 |
|
|
|
21260340e4
|
git-svn-id: svn://svn.icms.temple.edu/lammps-ro/trunk@14317 f3b2605a-c512-4ea7-a41b-209d697bcdaa
|
2015-12-09 17:30:15 +00:00 |
|
|
|
fe6f196439
|
git-svn-id: svn://svn.icms.temple.edu/lammps-ro/trunk@14316 f3b2605a-c512-4ea7-a41b-209d697bcdaa
|
2015-12-09 17:29:59 +00:00 |
|
|
|
d43c4a1bf5
|
git-svn-id: svn://svn.icms.temple.edu/lammps-ro/trunk@14315 f3b2605a-c512-4ea7-a41b-209d697bcdaa
|
2015-12-09 17:22:00 +00:00 |
|
|
|
6f443bf17f
|
git-svn-id: svn://svn.icms.temple.edu/lammps-ro/trunk@14314 f3b2605a-c512-4ea7-a41b-209d697bcdaa
|
2015-12-09 17:18:22 +00:00 |
|
|
|
3d659aba57
|
git-svn-id: svn://svn.icms.temple.edu/lammps-ro/trunk@14313 f3b2605a-c512-4ea7-a41b-209d697bcdaa
|
2015-12-09 17:16:42 +00:00 |
|
|
|
bac5a15bfc
|
git-svn-id: svn://svn.icms.temple.edu/lammps-ro/trunk@14312 f3b2605a-c512-4ea7-a41b-209d697bcdaa
|
2015-12-09 17:16:11 +00:00 |
|
|
|
f7355d5761
|
git-svn-id: svn://svn.icms.temple.edu/lammps-ro/trunk@14311 f3b2605a-c512-4ea7-a41b-209d697bcdaa
|
2015-12-09 17:11:45 +00:00 |
|
|
|
15c3a77823
|
git-svn-id: svn://svn.icms.temple.edu/lammps-ro/trunk@14310 f3b2605a-c512-4ea7-a41b-209d697bcdaa
|
2015-12-09 17:09:56 +00:00 |
|
|
|
c78f2449b2
|
git-svn-id: svn://svn.icms.temple.edu/lammps-ro/trunk@14309 f3b2605a-c512-4ea7-a41b-209d697bcdaa
|
2015-12-09 17:05:37 +00:00 |
|
|
|
a473a42a9c
|
git-svn-id: svn://svn.icms.temple.edu/lammps-ro/trunk@14308 f3b2605a-c512-4ea7-a41b-209d697bcdaa
|
2015-12-09 16:59:47 +00:00 |
|
|
|
1860c2d764
|
git-svn-id: svn://svn.icms.temple.edu/lammps-ro/trunk@14307 f3b2605a-c512-4ea7-a41b-209d697bcdaa
|
2015-12-09 15:41:43 +00:00 |
|
|
|
0010e7c7b6
|
Merge remote-tracking branch 'lammps-ro/master' into lammps-icms
# Resolved Conflicts:
# doc/Manual.html
# doc/Manual.txt
# src/STUBS/Makefile
|
2015-12-09 08:55:51 -05:00 |
|
|
|
b29b93b75f
|
Merge branch 'lammps-icms' of bitbucket.org:akohlmey/lammps-icms into lammps-icms
|
2015-12-08 20:23:37 -05:00 |
|
|
|
d24d85da64
|
git-svn-id: svn://svn.icms.temple.edu/lammps-ro/trunk@14305 f3b2605a-c512-4ea7-a41b-209d697bcdaa
|
2015-12-09 00:27:17 +00:00 |
|
|
|
f3dabd0dce
|
git-svn-id: svn://svn.icms.temple.edu/lammps-ro/trunk@14304 f3b2605a-c512-4ea7-a41b-209d697bcdaa
r14304
|
2015-12-08 23:56:27 +00:00 |
|
