Commit Graph

439 Commits

Author SHA1 Message Date
1c337c837c permission cleanup 2013-06-28 13:15:10 +02:00
7b2f24f051 yet another path fix for x-compile. 2013-06-28 11:12:11 +02:00
e801cc0f39 one more time 2013-06-28 10:44:45 +02:00
2020a3abbb two more paths need to be corrected 2013-06-28 10:27:28 +02:00
016dac9c11 update gpu tool makefile for changed paths 2013-06-28 10:21:23 +02:00
6c4e44ad0d correct path to MPICH mpi library 2013-06-28 06:53:55 +02:00
8dc2a751a0 makefiles for building the GPU library 2013-06-28 02:31:13 +02:00
7e0fef793d updates for compiling LAMMPS on windows with OpenCL support 2013-06-28 01:50:42 +02:00
f5bec5011a port to current mingw package 2013-06-27 14:57:55 +02:00
eee639db2f start of setting up building the gpu library 2013-06-26 15:41:32 +02:00
50a03de73b remove outdated msm gpu library code 2013-06-26 11:40:00 +02:00
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
6b0299ef8b git-svn-id: svn://svn.icms.temple.edu/lammps-ro/trunk@9983 f3b2605a-c512-4ea7-a41b-209d697bcdaa 2013-05-30 21:04:06 +00:00
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
a4930c44c3 git-svn-id: svn://svn.icms.temple.edu/lammps-ro/trunk@9979 f3b2605a-c512-4ea7-a41b-209d697bcdaa 2013-05-30 20:10:14 +00:00
5c541cb43a git-svn-id: svn://svn.icms.temple.edu/lammps-ro/trunk@9978 f3b2605a-c512-4ea7-a41b-209d697bcdaa 2013-05-30 20:04:31 +00:00
48fbb5605f fix another merge bug 2013-01-16 07:49:36 -05:00
100cafe5ff correct error from broken merge 2013-01-16 07:47:56 -05:00
427161ef56 Merge branch 'master' into lammps-icms
Resolved Conflicts:
	src/MAKE/Makefile.openmpi
	src/min_linesearch.cpp
2013-01-09 07:09:35 -05:00
c8624bc7eb git-svn-id: svn://svn.icms.temple.edu/lammps-ro/trunk@9175 f3b2605a-c512-4ea7-a41b-209d697bcdaa 2013-01-02 16:27:31 +00:00
9a0e9670fb Merge branch 'master' into lammps-icms
Resolved Conflicts:
	doc/Eqs/pair_gauss.jpg
	lib/cuda/Makefile.common
	lib/cuda/Makefile.defaults
	lib/cuda/Makefile.lammps
	lib/cuda/cuda_wrapper_cu.h
	lib/cuda/pair_cg_cmm_coul_cut_cuda.cu
	lib/cuda/pair_cg_cmm_coul_cut_cuda_cu.h
	lib/cuda/pair_cg_cmm_coul_debye_cuda.cu
	lib/cuda/pair_cg_cmm_coul_debye_cuda_cu.h
	lib/cuda/pair_cg_cmm_coul_long_cuda.cu
	lib/cuda/pair_cg_cmm_coul_long_cuda_cu.h
	lib/cuda/pair_cg_cmm_cuda.cu
	lib/cuda/pair_cg_cmm_cuda_cu.h
	lib/cuda/pair_cg_cmm_cuda_kernel_nc.cu
2012-10-12 08:46:39 -04:00
209999068c git-svn-id: svn://svn.icms.temple.edu/lammps-ro/trunk@8810 f3b2605a-c512-4ea7-a41b-209d697bcdaa 2012-09-21 15:57:23 +00:00
c6552844ab Merge branch 'master' into lammps-icms 2012-08-25 16:21:28 -04:00
0d36adc00b Merge branch 'master' into lammps-icms
Resolved Conflicts:
	lib/gpu/Nvidia.makefile
	lib/gpu/Opencl.makefile
2012-08-23 11:58:10 -04:00
c81a8f1bc9 git-svn-id: svn://svn.icms.temple.edu/lammps-ro/trunk@8699 f3b2605a-c512-4ea7-a41b-209d697bcdaa 2012-08-23 13:03:38 +00:00
647ea4c29f git-svn-id: svn://svn.icms.temple.edu/lammps-ro/trunk@8694 f3b2605a-c512-4ea7-a41b-209d697bcdaa 2012-08-21 13:59:15 +00:00
31551d81fd git-svn-id: svn://svn.icms.temple.edu/lammps-ro/trunk@8693 f3b2605a-c512-4ea7-a41b-209d697bcdaa 2012-08-21 13:57:32 +00:00
ca9da5d35e Merge branch 'master' into lammps-icms 2012-04-20 13:50:51 -04:00
0a85b18a46 git-svn-id: svn://svn.icms.temple.edu/lammps-ro/trunk@8027 f3b2605a-c512-4ea7-a41b-209d697bcdaa 2012-04-19 19:30:59 +00:00
816e87c46f don't use cudpp and relocatable compilation. 2012-03-30 09:53:10 -04:00
99851266a8 Merge branch 'master' into lammps-icms 2012-03-29 10:47:07 -04:00
f3905bf229 git-svn-id: svn://svn.icms.temple.edu/lammps-ro/trunk@7989 f3b2605a-c512-4ea7-a41b-209d697bcdaa 2012-03-28 22:10:48 +00:00
a1f79c40fe git-svn-id: svn://svn.icms.temple.edu/lammps-ro/trunk@7922 f3b2605a-c512-4ea7-a41b-209d697bcdaa 2012-03-07 15:00:34 +00:00
10ac23c120 import OpenCL bugfix from mike brown. 2012-03-06 23:18:01 -05:00
47e2a3a5fc Merge branch 'master' into lammps-icms
Resolved Conflicts:
	doc/kspace_style.html
	src/USER-EWALDN/ewald_n.h
	src/USER-OMP/pppm_tip4p_omp.cpp
2012-03-03 13:25:31 -05:00
d30ba2d7eb git-svn-id: svn://svn.icms.temple.edu/lammps-ro/trunk@7885 f3b2605a-c512-4ea7-a41b-209d697bcdaa 2012-03-02 15:57:05 +00:00
6214cf2944 Merge branch 'master' into lammps-icms
Resolved Conflicts:
	src/USER-CUDA/fix_npt_cuda.cpp
	src/USER-CUDA/fix_nvt_cuda.cpp
	src/USER-OMP/fix_omp.cpp
	src/fix.h
	src/memory.cpp
	tools/restart2data.cpp
2012-02-02 09:13:06 -05:00
2c42373bc8 git-svn-id: svn://svn.icms.temple.edu/lammps-ro/trunk@7644 f3b2605a-c512-4ea7-a41b-209d697bcdaa 2012-02-01 16:07:44 +00:00
53449d4375 adjust makefile default settings 2012-01-30 21:07:15 -05:00
32dba78215 git-svn-id: svn://svn.icms.temple.edu/lammps-ro/trunk@7618 f3b2605a-c512-4ea7-a41b-209d697bcdaa 2012-01-31 00:55:55 +00:00
8149b41103 git-svn-id: svn://svn.icms.temple.edu/lammps-ro/trunk@7616 f3b2605a-c512-4ea7-a41b-209d697bcdaa 2012-01-31 00:40:01 +00:00
aa13dbbe66 Merge branch 'master' into lammps-icms 2012-01-27 10:19:15 -05:00
65ac3b2dec embed path to shared gpu library 2012-01-27 10:18:29 -05:00
00c4af42a4 Merge branch 'master' into lammps-icms
Resolved Conflicts:
	lib/gpu/Nvidia.makefile
	lib/gpu/Opencl.makefile
2012-01-26 14:57:15 -05:00
a91b67d815 git-svn-id: svn://svn.icms.temple.edu/lammps-ro/trunk@7586 f3b2605a-c512-4ea7-a41b-209d697bcdaa 2012-01-26 17:55:18 +00:00
2aaf4f6d7e git-svn-id: svn://svn.icms.temple.edu/lammps-ro/trunk@7581 f3b2605a-c512-4ea7-a41b-209d697bcdaa 2012-01-25 21:22:15 +00:00
6b1774dc20 git-svn-id: svn://svn.icms.temple.edu/lammps-ro/trunk@7575 f3b2605a-c512-4ea7-a41b-209d697bcdaa 2012-01-25 15:31:54 +00:00
483d9fc5b5 correct OpenCL makefile 2012-01-24 21:40:35 -05:00
86b6a00449 Merge branch 'lammps-lal' into lammps-icms-lal 2012-01-23 19:37:53 -05:00
a7e57915f7 Added a header needed to compile with Cray cce. 2012-01-23 17:49:55 -05:00