Merge branch 'openmp-master' of github.com:akohlmey/lammps-omp into openmp…
0723de1e2f42
Actions

Authored by Axel Kohlmeyer <akohlmey@gmail.com> on Nov 10 2011, 19:53.

Description

Merge branch 'openmp-master' of github.com:akohlmey/lammps-omp into openmp-master

Committed

Axel Kohlmeyer <akohlmey@gmail.com>

Nov 10 2011, 19:53

Pushed

junge

Oct 6 2016, 16:49

Parents

Branches

Unknown

Tags

Unknown

Commit	Author	Details	Committed
756940313d81	Axel Kohlmeyer	Merge branch 'master' into openmp-master	Nov 10 2011
682d51a6d9e5	Axel Kohlmeyer	remove traces of GPU+thread support from GPU package	Nov 10 2011
189e650c6702	sjplimp	git-svn-id: svn://svn.icms.temple.edu/lammps-ro/trunk@7226 f3b2605a-c512-4ea7…	Nov 9 2011
0be567a00a70	sjplimp	git-svn-id: svn://svn.icms.temple.edu/lammps-ro/trunk@7225 f3b2605a-c512-4ea7…	Nov 9 2011
45040c4fdd0a	Axel Kohlmeyer	add threaded versions of coul/diel and gauss/cut	Nov 9 2011
fa66e183e360	Axel Kohlmeyer	bugfixes	Nov 9 2011
feca20292aee	Axel Kohlmeyer	make the processor grid info less confusing	Nov 9 2011

				Path
	M			src/GPU/Install.sh
	M			src/USER-MISC/pair_coul_diel.cpp
	M			src/USER-MISC/pair_gauss_cut.cpp
	M			src/USER-MISC/pair_gauss_cut.h
	P			src/USER-OMP/pair_coul_diel_omp.cpp Copied from src/USER-OMP/pair_coul_debye_omp.cpp
	P			src/USER-OMP/pair_coul_diel_omp.h Copied from src/USER-OMP/pair_buck_coul_omp.h
	P			src/USER-OMP/pair_gauss_cut_omp.cpp Copied from src/USER-OMP/pair_morse_omp.cpp
	P			src/USER-OMP/pair_gauss_cut_omp.h Copied from src/USER-OMP/pair_buck_coul_omp.h
	M			src/comm.cpp
	M			src/fix_ave_histo.cpp
	M			src/fix_ave_time.cpp
	M			src/version.h