Commit Graph

29 Commits

Author SHA1 Message Date
e2b364192b update GPU related makefiles/settings for temple desktop 2014-10-13 19:58:26 -04:00
c3f3603eb6 small updates for GPU library makefiles 2014-09-26 15:33:17 -04:00
e88b2465e7 various little updates and local changes 2014-06-15 13:15:30 +02:00
e83e04c92d update for GeForce TITAN GPU and CUDA RPM. 2014-04-18 16:04:42 -04:00
b07a3929d3 select bitness for GPU library 2014-02-17 11:13:05 -05:00
38ac088929 update for new desktop installation 2014-01-16 21:08:20 -05:00
816e87c46f don't use cudpp and relocatable compilation. 2012-03-30 09:53:10 -04:00
53449d4375 adjust makefile default settings 2012-01-30 21:07:15 -05:00
86b6a00449 Merge branch 'lammps-lal' into lammps-icms-lal 2012-01-23 19:37:53 -05:00
909931539d support compiling the GPU library as shared lib. 2012-01-15 20:33:30 -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
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
778916f630 Making CUDPP optional for nvidia builds. 2011-11-24 13:26:17 -05: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
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
f0263bf14c pppm/gpu now using all gpu kernels. 2011-03-25 11:49:09 -04: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
fa493de199 Merge branch 'master' into lammps-icms
Conflicts resolved in following files.
	lib/gpu/cmm_cut_gpu.cpp
	lib/gpu/cmmc_long_gpu.cpp
	lib/gpu/gb_gpu.cpp
	lib/gpu/gb_gpu_memory.cpp
	lib/gpu/lj96_cut_gpu.cpp
	lib/gpu/lj_cut_gpu.cpp
	lib/gpu/ljc_cut_gpu.cpp
	lib/gpu/ljcl_cut_gpu.cpp
	lib/gpu/pair_gpu_balance.h
	lib/gpu/pair_gpu_device.cpp
	lib/gpu/pair_gpu_device.h
	src/GPU/fix_gpu.cpp
	tools/restart2data.cpp
2011-01-13 13:14:47 -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
2fe5e84d68 Updating object file location in lib/gpu makefiles 2010-12-14 12:16:29 -05:00
d4ada34579 Merge branch 'master' into lammps-icms
merge in gpu pair style update from master.
needed to resolve lots of whitespace conflicts.
2010-11-24 12:31:02 -05:00
5a82c99485 Changes from Mike Brown.
git-svn-id: svn://svn.icms.temple.edu/lammps-ro/trunk@5277 f3b2605a-c512-4ea7-a41b-209d697bcdaa
2010-11-23 00:40:35 +00:00
3246bc8c92 aggressive optimization for fermi machine. 2010-11-17 22:56:46 -05:00
2c7c8198fe compile mixed precision and sm_20 now. 2010-11-17 22:26:55 -05:00
db9844a8ff update makefile adjustments from upstream. 2010-11-11 17:57:21 -05:00
d27edaf367 enable gcc warnings 2010-11-11 12:28:57 -05:00
ba5fb80d1d merge of GPU library from gpulammps project.
this copies over all required files, but tried to
remove unneeded components.
2010-11-07 17:49:43 -05:00
fb7781fa11 adjust build system to local requirements.
ignore files that are copied over by the
install scripts and should not be tracked
by the source code management system.
2010-04-18 16:16:12 -04:00