Commit Graph

51 Commits

Author SHA1 Message Date
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
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
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
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
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
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
274c3d38c4 - Updated geryon lib for Apple OpenCL
- Fixed typos in Nvidia.makefile and Opencl.makefile
- Updated eam.cu to work with OpenCL
- table still not working with OpenCL
2012-01-20 22:20:19 -05:00
9259ae8699 Merge branch 'master' into lammps-icms
Resolved Conflicts:
	doc/Eqs/pair_coul_diel.jpg
	doc/Section_commands.html
	doc/Section_commands.txt
	doc/pair_coul_diel.html
	doc/pair_coul_diel.txt
	doc/processors.html
	doc/processors.txt
	examples/USER/imd/bucky_cnt_imd.vmd
	examples/USER/imd/in.bucky-plus-cnt
	examples/USER/imd/in.deca-ala-solv_imd
	examples/USER/imd/in.deca-ala_imd
	lib/gpu/Makefile.fermi
	lib/gpu/Makefile.lincoln
	lib/gpu/Makefile.longhorn
	lib/gpu/Makefile.serial
	lib/gpu/geryon/VERSION.txt
	lib/gpu/pair_gpu_device.cpp
	src/ASPHERE/atom_vec_ellipsoid.cpp
	src/CLASS2/Install.sh
	src/COLLOID/atom_vec_colloid.cpp
	src/DIPOLE/atom_vec_dipole.cpp
	src/GPU/fix_gpu.cpp
	src/GRANULAR/atom_vec_granular.cpp
	src/GRANULAR/fix_pour.h
	src/KSPACE/Install.sh
	src/KSPACE/fft3d.cpp
	src/KSPACE/fft3d.h
	src/KSPACE/kissfft.h
	src/KSPACE/pppm.cpp
	src/KSPACE/pppm.h
	src/KSPACE/pppm_tip4p.cpp
	src/MAKE/Makefile.openmpi
	src/MAKE/Makefile.serial
	src/MANYBODY/pair_airebo.cpp
	src/MANYBODY/pair_comb.cpp
	src/MANYBODY/pair_eam.cpp
	src/MANYBODY/pair_eim.cpp
	src/MANYBODY/pair_sw.cpp
	src/MANYBODY/pair_tersoff.cpp
	src/MANYBODY/pair_tersoff_zbl.cpp
	src/MOLECULE/atom_vec_angle.cpp
	src/MOLECULE/atom_vec_bond.cpp
	src/MOLECULE/atom_vec_full.cpp
	src/MOLECULE/atom_vec_molecular.cpp
	src/Makefile
	src/Makefile.lib
	src/PERI/atom_vec_peri.cpp
	src/USER-CG-CMM/Install.sh
	src/USER-IMD/README
	src/USER-IMD/fix_imd.cpp
	src/USER-IMD/fix_imd.h
	src/USER-SMD/Install.sh
	src/atom_vec_atomic.cpp
	src/atom_vec_charge.cpp
	src/comm.cpp
	src/finish.cpp
	src/fix_box_relax.cpp
	src/fix_deposit.cpp
	src/fix_spring_self.cpp
	src/fix_store_state.cpp
	src/fix_wall.cpp
	src/fix_wall_reflect.cpp
	src/input.cpp
	src/input.h
	src/memory.cpp
	src/memory.h
	src/pair_lj_cut.cpp
	tools/restart2data.cpp
2011-12-31 19:07:46 -05:00
21778b8531 Merge branch 'master' of https://bitbucket.org/wb8/lal 2011-12-14 17:41:03 -05:00
40cadfabf5 Merge branch 'master' of ssh://yona.ccs.ornl.gov/~/git/lammps 2011-12-14 15:58:35 -05:00
4a2feb25b2 git-svn-id: svn://svn.icms.temple.edu/lammps-ro/trunk@7317 f3b2605a-c512-4ea7-a41b-209d697bcdaa 2011-12-08 23:12:19 +00:00
b2bc6488fc Fixed typos in Opencl.makefile to make opencl build works 2011-12-05 14:21:12 -05:00
37f098062b git-svn-id: svn://svn.icms.temple.edu/lammps-ro/trunk@7275 f3b2605a-c512-4ea7-a41b-209d697bcdaa 2011-12-02 15:51:43 +00:00
5744340b70 Added buck/gpu, buck/coul/gpu and buck/coul/long/gpu 2011-11-29 16:07:18 -05:00
ad68b61b46 Renaming files to have lal prefix. 2011-10-26 21:34:02 -04:00
db8cc02e18 Adding a capability for neighbor builds to openCL builds. 2011-10-26 17:42:21 -04:00
b0ee11cadd Updating neighbor list storage to be coalesced for multiple threads per atom. 2011-10-23 17:52:02 -04:00
bf6d34160e Adding preprocessor to OpenCL strings and as a dependency for both. 2011-07-27 16:58:50 -04:00
7b3188fec8 Fixing OpenCL to compile with new geryon converter. 2011-07-27 16:50:35 -04:00
8540f8500a Changed geryon file to string behaviour and updated only nvidia files. 2011-07-27 16:31:01 -04:00
c0872e0d7c Adding coul/long. 2011-07-26 16:45:43 -04:00
121346946c Finished renaming, adding namespace. 2011-07-26 14:20:18 -04:00
e7ce7a5a93 Getting rid of _ext from kernel names. 2011-06-13 17:09:23 -04:00
9ee36a3c22 More renaming... 2011-06-10 17:31:48 -04:00
7e0f127008 Renaming more files. 2011-06-10 15:34:49 -04:00
31a477c9a2 Renamed a bunch of files. 2011-06-10 11:53:46 -04:00
98ccbe3e69 git-svn-id: svn://svn.icms.temple.edu/lammps-ro/trunk@6340 f3b2605a-c512-4ea7-a41b-209d697bcdaa 2011-06-08 20:24:29 +00:00
31c5264ed7 Adding lj/class2 and lj/class2/coul/long. 2011-05-27 13:19:34 -04:00
0ecefcd1ba Working re_squared. 2011-05-10 16:38:17 -04:00
a5e8df1356 Adding LAMMPS_AL namespace to gb. Adding re_squared as a copy of
gayberne.
2011-05-06 12:11:51 -04:00
c28b28b8c8 Renaming gay-berne files. 2011-05-05 21:51:36 -04:00
3bcf5ad6c9 Added a base class for ellipsoidal particles. 2011-05-05 21:21:19 -04:00
5f799182b3 git-svn-id: svn://svn.icms.temple.edu/lammps-ro/trunk@6053 f3b2605a-c512-4ea7-a41b-209d697bcdaa 2011-05-02 15:02:52 +00:00
2759b11312 Adding fixes for OpenCL support and correct constant casting to pppm
kernels.
2011-04-04 14:27:33 -04:00
ab2a2934a9 Finishing up asynchronous PPPM. 2011-03-29 22:09:28 -04:00
a3eca0b125 Adding stuff to support async charge spread for PPPM. 2011-03-29 13:23:12 -04:00
092ee2eea8 Temporary commit for testing on yona. 2011-03-27 12:31:18 -04:00
13d47d2874 Adding Morse potential (untested) 2011-03-07 13:42:31 -05:00
73a8f5842d Adding lj/expand/gpu. 2011-02-25 15:48:53 -05:00
343485d592 Adding pppm stuff and incorporating data transfer. 2011-01-31 15:06:22 -05:00
c1c9fd47de Hybrid working, but not fully tested. 2011-01-27 17:52:08 -05:00
b9c7e2bb96 Trying to get hybrid gpu styles to work... 2011-01-25 17:46:00 -05:00
6018dd02b1 Untested changes to support hybrid styles. 2011-01-24 15:58:04 -05:00
c00c133529 recover option to write object files to ./obj
add rule to makefiles to create the directory
if it is not already present (e.g. after a
direct checkout).
2011-01-13 14:28:42 -05:00
8f2257ecbf git-svn-id: svn://svn.icms.temple.edu/lammps-ro/trunk@5537 f3b2605a-c512-4ea7-a41b-209d697bcdaa 2011-01-12 15:24:04 +00:00
6f4d1de96c Initial commit of charmm/long/gpu style w/out testing. 2010-12-29 15:18:53 -05:00