Diffusion lammps 0688046e698a

Merge branch 'lammps-icms' into cle-orig
0688046e698a
Actions

Authored by Axel Kohlmeyer <akohlmey@gmail.com> on Jun 30 2014, 20:56.

Description

Merge branch 'lammps-icms' into cle-orig

Details

Committed

Axel Kohlmeyer <akohlmey@gmail.com>

Jun 30 2014, 20:56

Pushed

junge

Oct 6 2016, 16:49

Parents

rLAMMPS90e28bec4310: import 2d bugfix from daniel
rLAMMPS86d4432ff882: import colored langevin thermostat package from michele ceriotti

Branches

Unknown

Tags

Unknown

Event Timeline

Axel Kohlmeyer <akohlmey@gmail.com> committed rLAMMPS0688046e698a: Merge branch 'lammps-icms' into cle-orig (authored by Axel Kohlmeyer <akohlmey@gmail.com>).Jun 30 2014, 20:56

Merged Changes

Commit	Author	Details	Committed
90e28bec4310	Axel Kohlmeyer	import 2d bugfix from daniel	Jun 25 2014
7ad7147e83ba	Axel Kohlmeyer	mention lack of KOKKOS support	Jun 25 2014
71ed5e51d2f1	Axel Kohlmeyer	disable KOKKOS from pre-compiled packages.	Jun 25 2014
709410d625ba	Axel Kohlmeyer	import the host code for trung's GPU code update	Jun 24 2014
e0d8c669c4bf	Axel Kohlmeyer	adjust code for different neighbor list handling to support intel ocl	Jun 24 2014
4d4647f48711	Axel Kohlmeyer	import library part of trung's update to the GPU package with reinit support	Jun 24 2014

Changes (57)

				Path
	M			lib/gpu/Nvidia.makefile
	M			lib/gpu/Opencl.makefile
	M			lib/gpu/lal_born.cpp
	M			lib/gpu/lal_born.h
	M			lib/gpu/lal_born_ext.cpp
	M			lib/gpu/lal_buck.cpp
	M			lib/gpu/lal_buck.h
	M			lib/gpu/lal_buck_ext.cpp
	P			lib/gpu/lal_coul.cpp Copied from lib/gpu/lal_lj_coul.cpp
	P			lib/gpu/lal_coul.cu Copied from lib/gpu/lal_lj96.cu
	P			lib/gpu/lal_coul.h Copied from lib/gpu/lal_cg_cmm.h
	P			lib/gpu/lal_coul_debye.cpp Copied from lib/gpu/lal_lj_coul_debye.cpp
	P			lib/gpu/lal_coul_debye.cu Copied from lib/gpu/lal_coul_dsf.cu
	P			lib/gpu/lal_coul_debye.h Copied from lib/gpu/lal_lj_coul_debye.h
	A			lib/gpu/lal_coul_debye_ext.cpp
	A			lib/gpu/lal_coul_ext.cpp
	M			lib/gpu/lal_coul_long.cpp
	M			lib/gpu/lal_coul_long.cu
	M			lib/gpu/lal_coul_long.h
	M			lib/gpu/lal_coul_long_ext.cpp
	M			lib/gpu/lal_gauss.cpp
	M			lib/gpu/lal_gauss.h
	M			lib/gpu/lal_gauss_ext.cpp
	M			lib/gpu/lal_lj.cpp
	M			lib/gpu/lal_lj.h
	M			lib/gpu/lal_lj_expand.cpp
	M			lib/gpu/lal_lj_expand.h
	M			lib/gpu/lal_lj_expand_ext.cpp
	M			lib/gpu/lal_lj_ext.cpp
	M			lib/gpu/lal_soft.cpp
	M			lib/gpu/lal_soft.h
	M			lib/gpu/lal_soft_ext.cpp
	M			src/GPU/Install.sh
	M			src/GPU/pair_born_gpu.cpp
	M			src/GPU/pair_born_gpu.h
	M			src/GPU/pair_buck_gpu.cpp
	M			src/GPU/pair_buck_gpu.h
	P			src/GPU/pair_coul_cut_gpu.cpp Copied from src/GPU/pair_lj_cut_coul_cut_gpu.cpp
	P			src/GPU/pair_coul_cut_gpu.h Copied from src/GPU/pair_lj_cut_coul_cut_gpu.h
	P			src/GPU/pair_coul_debye_gpu.cpp Copied from src/GPU/pair_lj_cut_coul_debye_gpu.cpp
	P			src/GPU/pair_coul_debye_gpu.h Copied from src/GPU/pair_lj_cut_coul_debye_gpu.h
	M			src/GPU/pair_coul_long_gpu.cpp
	M			src/GPU/pair_coul_long_gpu.h
	M			src/GPU/pair_gauss_gpu.cpp
	M			src/GPU/pair_gauss_gpu.h
	M			src/GPU/pair_lj_cut_gpu.cpp
	M			src/GPU/pair_lj_cut_gpu.h
	M			src/GPU/pair_lj_expand_gpu.cpp
	M			src/GPU/pair_lj_expand_gpu.h
	M			src/GPU/pair_soft_gpu.cpp
	M			src/GPU/pair_soft_gpu.h
	M			src/VORONOI/compute_voronoi_atom.cpp
	M			tools/mingw-cross/build-mingw-cross.sh
	M			tools/mingw-cross/windows.html
	M			tools/rpm/build-rpm-from-git.sh
	M			tools/rpm/index.html
	M			tools/rpm/lammps.spec