ICODE-ADC/lammps
4
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity
17,515 Commits 12 Branches 209 Tags
71ef6fb4d95aba5963d31bbec4b3ded1ee00a6f0
Commit Graph

5 Commits

Author SHA1 Message Date
Axel Kohlmeyer
fdd0c314aa make default linux makefiles adapt to cuda dir more automatically. 2016-06-08 13:40:29 -04:00
Axel Kohlmeyer
bc44b94c72 Merge branch 'master' of https://github.com/jefflarkin/lammps into merge-pull-82 2016-06-08 12:35:08 -04:00
Jeff Larkin
d7cef6c97a Fixed deprecated CUDA Driver feature. 
- Thread-exclusive mode was deprecated in 7.5, this change changed nvd_device.h
to use process-exclusive mode instead.
- Additionally, changed lib/gpu/Makefile.lammps.standard to not use a direct
path, but rather use the commonly-used CUDA_HOME variable, which should work
better on machines where environment modules are used.
 2016-06-08 12:15:50 -04:00
Axel Kohlmeyer
ce2b853e4a Merge remote branch 'lammps-ro/master' into lammps-icms 
Resolved Conflicts:
	doc/Eqs/pair_gauss.jpg
	doc/Manual.txt
	doc/pair_list.html
	doc/pair_list.txt
	lib/atc/Makefile.lammps.linalg
	lib/awpmd/Makefile.lammps.linalg
	lib/gpu/Makefile.lincoln
	lib/linalg/Makefile.gfortran
	lib/linalg/Makefile.mingw_cross
	lib/linalg/README
	lib/reax/Makefile.lammps
	src/USER-CG-CMM/Install.sh
	src/USER-COLVARS/Install.sh
	src/USER-CUDA/Install.sh
	src/USER-MISC/Install.sh
	src/USER-MISC/pair_list.cpp
	src/USER-OMP/Install.sh
	src/USER-PHONON/Install.sh
 2013-06-01 13:53:34 +02:00
sjplimp
7644b9955f git-svn-id: svn://svn.icms.temple.edu/lammps-ro/trunk@9980 f3b2605a-c512-4ea7-a41b-209d697bcdaa 2013-05-30 20:10:54 +00:00