Merge branch 'openmp-next-merge' into openmp-master
3295bdbec039
Actions

Authored by Axel Kohlmeyer <akohlmey@gmail.com> on Oct 25 2011, 14:40.

Description

Merge branch 'openmp-next-merge' into openmp-master

Resolved Conflicts:
doc/fix_wall_reflect.txt
src/GPU/fix_gpu.cpp
src/USER-CUDA/verlet_cuda.cpp
src/min.cpp
src/neigh_full.cpp
src/neigh_request.cpp
src/respa.cpp

Details

Committed

Axel Kohlmeyer <akohlmey@gmail.com>

Oct 25 2011, 14:40

Pushed

junge

Oct 6 2016, 16:49

Parents

rLAMMPS9c5ad7cf3355: Merge branch 'master' into openmp-next-merge
rLAMMPSd3727b581bfb: remove unused variable

Branches

Unknown

Tags

Unknown

Event Timeline

Axel Kohlmeyer <akohlmey@gmail.com> committed rLAMMPS3295bdbec039: Merge branch 'openmp-next-merge' into openmp-master (authored by Axel Kohlmeyer <akohlmey@gmail.com>).Oct 25 2011, 14:40

Merged Changes

Commit	Author	Details	Committed
9c5ad7cf3355	Axel Kohlmeyer	Merge branch 'master' into openmp-next-merge	Oct 25 2011
c6bbdcfbf2af	sjplimp	git-svn-id: svn://svn.icms.temple.edu/lammps-ro/trunk@7184 f3b2605a-c512-4ea7…	Oct 24 2011
11806a92a1df	sjplimp	git-svn-id: svn://svn.icms.temple.edu/lammps-ro/trunk@7182 f3b2605a-c512-4ea7…	Oct 24 2011
860bca7d5e5d	sjplimp	git-svn-id: svn://svn.icms.temple.edu/lammps-ro/trunk@7181 f3b2605a-c512-4ea7…	Oct 24 2011
f3018d53bb32	sjplimp	git-svn-id: svn://svn.icms.temple.edu/lammps-ro/trunk@7180 f3b2605a-c512-4ea7…	Oct 24 2011
5a03365db1f1	sjplimp	git-svn-id: svn://svn.icms.temple.edu/lammps-ro/trunk@7179 f3b2605a-c512-4ea7…	Oct 24 2011
326c40feaa41	sjplimp	git-svn-id: svn://svn.icms.temple.edu/lammps-ro/trunk@7178 f3b2605a-c512-4ea7…	Oct 24 2011
cb5b707c7408	sjplimp	git-svn-id: svn://svn.icms.temple.edu/lammps-ro/trunk@7177 f3b2605a-c512-4ea7…	Oct 24 2011
aa5daaff3501	Axel Kohlmeyer	single out assorted bugfixes and changes that should be sent to steve before…	Oct 22 2011

Changes (52)

				Path
	M			doc/Section_commands.html
	M			doc/Section_commands.txt
	M			doc/fix.html
	M			doc/fix.txt
	P			doc/fix_nve_asphere_noforce.html Copied from doc/fix_nve_asphere.html
	P			doc/fix_nve_asphere_noforce.txt Copied from doc/fix_nve_asphere.txt
	M			doc/fix_wall.html
	M			doc/fix_wall.txt
	M			doc/fix_wall_reflect.txt
	M			doc/pair_coeff.html
	M			doc/pair_coeff.txt
	D			doc/pair_lubricate.html
	D			doc/pair_lubricate.txt
	M			doc/pair_style.html
	M			doc/pair_style.txt
	M			lib/cuda/atom_vec_cuda.cu
	M			lib/cuda/comm_cuda.cu
	M			lib/cuda/compute_temp_cuda.cu
	M			lib/cuda/compute_temp_cuda_kernel.cu
	M			lib/cuda/compute_temp_partial_cuda.cu
	M			lib/cuda/compute_temp_partial_cuda_kernel.cu
	M			lib/cuda/cuda_pair.cu
	M			lib/cuda/domain_kernel.cu
	M			lib/cuda/pair_eam_cuda.cu
	M			src/ASPHERE/Install.sh
	P			src/ASPHERE/fix_nve_asphere.cpp Copied to src/ASPHERE/fix_nve_asphere_noforce.cpp
	P			src/ASPHERE/fix_nve_asphere_noforce.cpp Copied from src/ASPHERE/fix_nve_asphere.cpp
	P			src/ASPHERE/fix_nve_asphere_noforce.h Copied from src/ASPHERE/fix_nve_asphere.h
	M			src/COLLOID/Install.sh
	D			src/COLLOID/pair_lubricate.cpp
	D			src/COLLOID/pair_lubricate.h
	M			src/GPU/fix_gpu.cpp
	M			src/USER-CUDA/atom_vec_atomic_cuda.cpp
	M			src/USER-CUDA/cuda.cpp
	M			src/USER-CUDA/cuda_neigh_list.cpp
	M			src/USER-CUDA/neigh_full_cuda.cpp
	M			src/USER-CUDA/verlet_cuda.cpp
	M			src/fix_nve_noforce.h
	M			src/fix_nve_sphere.cpp
	M			src/fix_nve_sphere.h
	M			src/fix_wall.cpp
	M			src/fix_wall.h
	M			src/input.cpp
	M			src/math_const.h
	M			src/min.cpp
	M			src/neigh_full.cpp
	M			src/neigh_list.cpp
	M			src/neigh_request.cpp
	M			src/respa.cpp
	M			src/verlet.cpp
	M			src/version.h
	M			tools/restart2data.cpp