Commit Graph

16215 Commits

Author SHA1 Message Date
32123d875f forgot file with dependencies 2016-03-11 07:18:33 -05:00
e14762f7a1 provide explicit dependencies in lib/meam for parallel make 2016-03-11 07:10:21 -05:00
89811fe1e0 parallel make tries to run tests in paralle, too. not good. 2016-03-11 07:06:12 -05:00
b0ffa46a3b adapt personal makefiles to the new location of fastdep 2016-03-11 06:48:01 -05:00
bce9b641f4 remove duplicate copy of fastdep tool. 2016-03-11 06:45:45 -05:00
1cf0e40793 Merge remote-tracking branch 'lammps-ro/master' into lammps-icms
#Resolved Conflicts:
#	doc/Manual.txt
#	src/MAKE/MACHINES/Makefile.mingw32-cross
#	src/MAKE/MACHINES/Makefile.mingw32-cross-mpi
#	src/MAKE/MACHINES/Makefile.mingw64-cross
#	src/MAKE/MACHINES/Makefile.mingw64-cross-mpi
#	src/MAKE/MINE/Makefile.g++
#	src/MAKE/Makefile.mpi
#	src/MAKE/Makefile.serial
#	src/Make.py
#	src/Makefile
2016-03-11 06:45:09 -05:00
93af809806 reduce 4 MPI tasks to 2 to for docker based TravisCI. try to use parallel make. 2016-03-10 23:45:28 -05:00
575daec08f try to disable MPI processor affinity in order to speed up running on oversubscribed virtual machines 2016-03-10 23:12:35 -05:00
e45ca540e0 try different strategy to avoid unexpected deadlocks with MPI+OpenMP when oversubscribing build nodes. 2016-03-10 22:47:18 -05:00
dd738827fa fix parallel deadlock bug in dvd and xtc dumps with > 2^31 timesteps reported by chris macdermaid. 2016-03-10 22:43:34 -05:00
a946de0b03 git-svn-id: svn://svn.icms.temple.edu/lammps-ro/trunk@14738 f3b2605a-c512-4ea7-a41b-209d697bcdaa 2016-03-10 16:57:36 +00:00
7c9022e3d5 git-svn-id: svn://svn.icms.temple.edu/lammps-ro/trunk@14737 f3b2605a-c512-4ea7-a41b-209d697bcdaa 2016-03-10 16:56:40 +00:00
f5ceb5b292 git-svn-id: svn://svn.icms.temple.edu/lammps-ro/trunk@14736 f3b2605a-c512-4ea7-a41b-209d697bcdaa 2016-03-10 16:34:30 +00:00
109b9bab28 git-svn-id: svn://svn.icms.temple.edu/lammps-ro/trunk@14735 f3b2605a-c512-4ea7-a41b-209d697bcdaa 2016-03-10 16:31:34 +00:00
f620bcc4f9 git-svn-id: svn://svn.icms.temple.edu/lammps-ro/trunk@14734 f3b2605a-c512-4ea7-a41b-209d697bcdaa 2016-03-10 16:30:39 +00:00
c954b454ba disable another test that fails with 4xMPI+1xOpenMP 2016-03-10 11:24:51 -05:00
047c55383a git-svn-id: svn://svn.icms.temple.edu/lammps-ro/trunk@14732 f3b2605a-c512-4ea7-a41b-209d697bcdaa 2016-03-10 16:13:43 +00:00
b3890e80cb git-svn-id: svn://svn.icms.temple.edu/lammps-ro/trunk@14731 f3b2605a-c512-4ea7-a41b-209d697bcdaa 2016-03-10 16:10:53 +00:00
8412d4a96c git-svn-id: svn://svn.icms.temple.edu/lammps-ro/trunk@14730 f3b2605a-c512-4ea7-a41b-209d697bcdaa 2016-03-10 16:09:52 +00:00
52f20bbbd5 git-svn-id: svn://svn.icms.temple.edu/lammps-ro/trunk@14729 f3b2605a-c512-4ea7-a41b-209d697bcdaa 2016-03-10 16:09:11 +00:00
247bf33d63 git-svn-id: svn://svn.icms.temple.edu/lammps-ro/trunk@14728 f3b2605a-c512-4ea7-a41b-209d697bcdaa 2016-03-10 16:04:18 +00:00
859f0698ea Merge branch 'merge-pull-36' into lammps-icms 2016-03-10 10:32:48 -05:00
faa4aff1ed Merge branch 'travis' of https://github.com/junghans/lammps into merge-pull-36 2016-03-10 10:32:26 -05:00
874bd68cd1 disable test to avoid errors in TravisCI with docker based testing 2016-03-10 10:30:30 -05:00
b92e2cc677 Merge branch 'lammps-icms' of bitbucket.org:akohlmey/lammps-icms into lammps-icms 2016-03-10 08:44:56 -05:00
d6c4031902 update global git ignore patterns 2016-03-10 08:33:14 -05:00
169a02118d simplify .gitignore for packages with suffixes. 2016-03-10 08:28:38 -05:00
692636957c .travis.yml: move to container-based intrastructure 2016-03-09 14:04:06 -07:00
24723b2e1c cleaner form of handling nlocal=0 when checking for NaN coordinates 2016-03-09 11:32:51 -05:00
fc2b793f13 Merge remote-tracking branch 'lammps-ro/master' into lammps-icms 2016-03-09 06:16:17 -05:00
33d4321c46 update to colvars library as of 2016-03-08 2016-03-09 06:08:11 -05:00
128f28b2cc add support for CUDA_DIR 2016-03-08 21:42:12 -05:00
791f18b03d Corrected error in Liouville factorization
git-svn-id: svn://svn.icms.temple.edu/lammps-ro/trunk@14727 f3b2605a-c512-4ea7-a41b-209d697bcdaa
2016-03-08 19:56:06 +00:00
c2f76aa16a small update to USER-MANIFOLD documentation 2016-03-08 14:23:38 -05:00
978d5786ce Merge branch 'merge-pull-35' into lammps-icms 2016-03-08 10:53:13 -05:00
2762a07efd Merge remote-tracking branch 'lammps-ro/master' into lammps-icms
#Resolved Conflicts:
#	src/Makefile
2016-03-08 07:41:05 -05:00
ec96d05bc1 remove bogus include and fix path separator bug 2016-03-08 07:34:12 -05:00
c0289662f5 adapt fastdep compatible makefiles to new version 2016-03-08 07:33:38 -05:00
f5d7fdd19a rewrite fastdep in C, some optimizations added and windows compatibility(?) 2016-03-08 07:18:57 -05:00
ee1805538c git-svn-id: svn://svn.icms.temple.edu/lammps-ro/trunk@14726 f3b2605a-c512-4ea7-a41b-209d697bcdaa 2016-03-07 17:34:03 +00:00
f4ac444db2 git-svn-id: svn://svn.icms.temple.edu/lammps-ro/trunk@14725 f3b2605a-c512-4ea7-a41b-209d697bcdaa 2016-03-07 17:30:46 +00:00
0e5c36676f git-svn-id: svn://svn.icms.temple.edu/lammps-ro/trunk@14724 f3b2605a-c512-4ea7-a41b-209d697bcdaa 2016-03-07 17:29:34 +00:00
98633cfa6a one more makefile to be converted to fastdep for use with rpm builds 2016-03-06 11:44:09 -05:00
8b57a67a35 convert more makefiles to using fastdep. some cleanups. 2016-03-06 11:28:15 -05:00
a3989db1f4 enable using fastdep 2016-03-06 11:05:25 -05:00
116403443a remove customization no longer needed when using fastdep 2016-03-06 11:05:15 -05:00
749ac0560f use the new fastdep tool for dependencies 2016-03-06 10:55:17 -05:00
581aec69a7 Merge branch 'lammps-icms' into merge-pull-35 2016-03-05 15:40:10 -05:00
631c124828 make logic of code more obvious 2016-03-05 07:29:36 -05:00
518e082bfd Merge remote-tracking branch 'lammps-ro/master' into lammps-icms 2016-03-05 07:06:05 -05:00