Commit Graph

15934 Commits

Author SHA1 Message Date
c81b3b2c1f update LAMMPS version automatically from source code 2016-02-11 13:58:58 +01:00
aa90ff982f Merge remote branch 'lammps-ro/master' into lammps-icms 2016-02-11 13:23:03 +01:00
7183e000e7 load lammps shared object for directory in LD_LIBRARY_PATH, if not found in same directory than lammps.py 2016-02-11 13:22:46 +01:00
f5c2e4c895 change python module installer to try installing into user-site dir if global fails. 2016-02-11 12:06:03 +01:00
e2117af23f Fixing Kokkos bug
git-svn-id: svn://svn.icms.temple.edu/lammps-ro/trunk@14585 f3b2605a-c512-4ea7-a41b-209d697bcdaa
2016-02-10 23:34:03 +00:00
b6be86264f Fixing Kokkos bug
git-svn-id: svn://svn.icms.temple.edu/lammps-ro/trunk@14584 f3b2605a-c512-4ea7-a41b-209d697bcdaa
2016-02-10 22:50:51 +00:00
ea12e28c6d git-svn-id: svn://svn.icms.temple.edu/lammps-ro/trunk@14583 f3b2605a-c512-4ea7-a41b-209d697bcdaa 2016-02-10 15:02:22 +00:00
53019d7e99 Merge branch 'lammps-icms' of bitbucket.org:akohlmey/lammps-icms into lammps-icms 2016-02-09 13:57:49 +01:00
6ed1f1df2f Merge remote branch 'lammps-ro/master' into lammps-icms
Conflicts:
	src/REAX/pair_reax.h
2016-02-09 13:56:32 +01:00
9e20448834 git-svn-id: svn://svn.icms.temple.edu/lammps-ro/trunk@14582 f3b2605a-c512-4ea7-a41b-209d697bcdaa 2016-02-08 16:18:20 +00:00
5a53d7be51 fix typo in excluding user-vtk 2016-02-06 09:36:26 -05:00
5fa36ebf00 integrate USER-VTK into make process 2016-02-06 09:24:18 -05:00
fb6fbe8c83 exclude user-vtk from package builds 2016-02-06 09:23:41 -05:00
51c768af7f remove unused variables 2016-02-06 15:03:18 +01:00
534f72de2c Merge remote branch 'lammps-ro/master' into lammps-icms 2016-02-06 14:23:11 +01:00
da41fcb74b Fixing Kokkos bugs
git-svn-id: svn://svn.icms.temple.edu/lammps-ro/trunk@14580 f3b2605a-c512-4ea7-a41b-209d697bcdaa
2016-02-05 17:40:10 +00:00
384aef4381 Fixing Kokkos bugs
git-svn-id: svn://svn.icms.temple.edu/lammps-ro/trunk@14579 f3b2605a-c512-4ea7-a41b-209d697bcdaa
2016-02-05 17:28:51 +00:00
22568e3194 Merge remote branch 'lammps-ro/master' into lammps-icms 2016-02-05 13:55:06 +01:00
753429e654 git-svn-id: svn://svn.icms.temple.edu/lammps-ro/trunk@14555 f3b2605a-c512-4ea7-a41b-209d697bcdaa 2016-02-04 21:09:19 +00:00
02408d39bf git-svn-id: svn://svn.icms.temple.edu/lammps-ro/trunk@14554 f3b2605a-c512-4ea7-a41b-209d697bcdaa 2016-02-04 21:09:03 +00:00
b2d417f5d7 git-svn-id: svn://svn.icms.temple.edu/lammps-ro/trunk@14552 f3b2605a-c512-4ea7-a41b-209d697bcdaa 2016-02-04 20:39:00 +00:00
6b593f0c91 git-svn-id: svn://svn.icms.temple.edu/lammps-ro/trunk@14550 f3b2605a-c512-4ea7-a41b-209d697bcdaa 2016-02-04 17:17:35 +00:00
15822b0927 Merge remote branch 'lammps-ro/master' into lammps-icms
Resolved Conflicts:
	doc/Manual.html
	doc/Manual.txt
2016-02-04 14:11:07 +01:00
ddb83e1b72 git-svn-id: svn://svn.icms.temple.edu/lammps-ro/trunk@14548 f3b2605a-c512-4ea7-a41b-209d697bcdaa 2016-02-03 21:58:23 +00:00
21ee4aa974 git-svn-id: svn://svn.icms.temple.edu/lammps-ro/trunk@14547 f3b2605a-c512-4ea7-a41b-209d697bcdaa 2016-02-03 21:57:30 +00:00
c1aebdd391 git-svn-id: svn://svn.icms.temple.edu/lammps-ro/trunk@14544 f3b2605a-c512-4ea7-a41b-209d697bcdaa 2016-02-03 21:39:32 +00:00
b25125e529 git-svn-id: svn://svn.icms.temple.edu/lammps-ro/trunk@14543 f3b2605a-c512-4ea7-a41b-209d697bcdaa 2016-02-03 21:37:16 +00:00
de6ff01ba7 git-svn-id: svn://svn.icms.temple.edu/lammps-ro/trunk@14542 f3b2605a-c512-4ea7-a41b-209d697bcdaa 2016-02-03 21:33:41 +00:00
94da81bae4 git-svn-id: svn://svn.icms.temple.edu/lammps-ro/trunk@14541 f3b2605a-c512-4ea7-a41b-209d697bcdaa 2016-02-03 21:27:32 +00:00
bb11aa3147 git-svn-id: svn://svn.icms.temple.edu/lammps-ro/trunk@14540 f3b2605a-c512-4ea7-a41b-209d697bcdaa 2016-02-03 21:27:19 +00:00
22961a9267 git-svn-id: svn://svn.icms.temple.edu/lammps-ro/trunk@14539 f3b2605a-c512-4ea7-a41b-209d697bcdaa 2016-02-03 21:23:06 +00:00
0963784ff1 git-svn-id: svn://svn.icms.temple.edu/lammps-ro/trunk@14538 f3b2605a-c512-4ea7-a41b-209d697bcdaa 2016-02-03 21:22:35 +00:00
0662467254 git-svn-id: svn://svn.icms.temple.edu/lammps-ro/trunk@14537 f3b2605a-c512-4ea7-a41b-209d697bcdaa 2016-02-03 21:20:11 +00:00
1a82fbf0ac git-svn-id: svn://svn.icms.temple.edu/lammps-ro/trunk@14536 f3b2605a-c512-4ea7-a41b-209d697bcdaa 2016-02-03 21:19:53 +00:00
216f83d10d git-svn-id: svn://svn.icms.temple.edu/lammps-ro/trunk@14535 f3b2605a-c512-4ea7-a41b-209d697bcdaa 2016-02-03 21:18:58 +00:00
8e9f616a2e git-svn-id: svn://svn.icms.temple.edu/lammps-ro/trunk@14534 f3b2605a-c512-4ea7-a41b-209d697bcdaa 2016-02-03 20:55:24 +00:00
3e9a18b5bb git-svn-id: svn://svn.icms.temple.edu/lammps-ro/trunk@14533 f3b2605a-c512-4ea7-a41b-209d697bcdaa 2016-02-03 20:53:35 +00:00
4b4cde9eab Merge branch 'merge-pull-25' into lammps-icms 2016-02-03 05:56:37 -05:00
9cf43f2a0b git-svn-id: svn://svn.icms.temple.edu/lammps-ro/trunk@14532 f3b2605a-c512-4ea7-a41b-209d697bcdaa 2016-02-02 16:05:07 +00:00
0766f95adc git-svn-id: svn://svn.icms.temple.edu/lammps-ro/trunk@14531 f3b2605a-c512-4ea7-a41b-209d697bcdaa 2016-02-02 16:01:46 +00:00
2da2a3b03a git-svn-id: svn://svn.icms.temple.edu/lammps-ro/trunk@14530 f3b2605a-c512-4ea7-a41b-209d697bcdaa 2016-02-02 16:00:13 +00:00
3f859c20f8 Add missing initializers in constructor 2016-02-01 23:43:55 +01:00
0ddc57d841 Merge branch 'merge-pull-24' into lammps-icms 2016-01-31 08:17:01 -05:00
70599efcf3 Merge branch 'user-vtk' of git://github.com/rbberger/lammps into merge-pull-24 2016-01-31 08:16:32 -05:00
27f0e050a8 Remove lines from USER-VTK README 2016-01-30 23:13:45 +01:00
062b18022c Added Makefile.lammps examples in lib/vtk for CentOS 2016-01-30 22:56:23 +01:00
d4efa2d1c7 Added README to lib/vtk and examples for Makefile.lammps 2016-01-30 22:12:22 +01:00
939889fd26 activate settings for newer VTK release 2016-01-30 13:51:20 -05:00
23a4078194 update settings for CentOS 6.x with EPEL 2016-01-30 19:45:18 +01:00
37500f9189 Merge branch 'user-vtk' of git://github.com/rbberger/lammps into merge-pull-23 2016-01-30 18:38:37 +01:00