Diffusion lammps 693edb607637

Merge branch 'openmp-step5' into openmp-master
693edb607637
Actions

Authored by Axel Kohlmeyer <akohlmey@gmail.com> on Oct 18 2011, 22:07.

Description

Merge branch 'openmp-step5' into openmp-master

Details

Committed

Axel Kohlmeyer <akohlmey@gmail.com>

Oct 18 2011, 22:07

Pushed

junge

Oct 6 2016, 16:49

Parents

rLAMMPS868d5898a839: avoid segfault by setting _rho1d to NULL when not used.
rLAMMPS4c872b77b111: Merge branch 'openmp-step5' into openmp-master

Branches

Unknown

Tags

Unknown

Event Timeline

Axel Kohlmeyer <akohlmey@gmail.com> committed rLAMMPS693edb607637: Merge branch 'openmp-step5' into openmp-master (authored by Axel Kohlmeyer <akohlmey@gmail.com>).Oct 18 2011, 22:07

Merged Changes

Commit	Author	Details	Committed
868d5898a839	Axel Kohlmeyer	avoid segfault by setting _rho1d to NULL when not used.	Oct 18 2011
6befcc93cf42	Axel Kohlmeyer	add documentation for /omp bond styles	Oct 18 2011
3e5ca79a9581	Axel Kohlmeyer	fix the PI issue in pppm/gpu (i hope finally)	Oct 18 2011
e9d0321cf61f	Axel Kohlmeyer	add remaining multi-threaded bond potential	Oct 18 2011
6e241b8b44be	Axel Kohlmeyer	fix PI bug reported by christian trott	Oct 18 2011
ee03726687d8	Axel Kohlmeyer	correct script for handling make package-update	Oct 18 2011
9d05ccab17e7	Axel Kohlmeyer	remove unused variables	Oct 18 2011

Changes (45)

				Path
	M			doc/Section_commands.txt
	M			doc/bond_class2.txt
	M			doc/bond_fene.txt
	M			doc/bond_fene_expand.txt
	M			doc/bond_harmonic.txt
	M			doc/bond_harmonic_shift.txt
	M			doc/bond_harmonic_shift_cut.txt
	M			doc/bond_morse.txt
	M			doc/bond_nonlinear.txt
	M			doc/bond_quartic.txt
	M			doc/bond_table.txt
	M			src/CLASS2/bond_class2.h
	M			src/GPU/pppm_gpu.cpp
	M			src/MOLECULE/bond_fene.h
	M			src/MOLECULE/bond_fene_expand.h
	M			src/MOLECULE/bond_morse.h
	M			src/MOLECULE/bond_nonlinear.h
	M			src/MOLECULE/bond_quartic.h
	M			src/MOLECULE/bond_table.h
	M			src/OPT/pair_lj_cut_coul_long_tip4p_opt.cpp
	M			src/USER-MISC/bond_harmonic_shift.cpp
	M			src/USER-MISC/bond_harmonic_shift.h
	M			src/USER-MISC/bond_harmonic_shift_cut.h
	M			src/USER-OMP/Package.sh
	P			src/USER-OMP/bond_class2_omp.cpp Copied from src/USER-OMP/bond_harmonic_omp.cpp
	P			src/USER-OMP/bond_class2_omp.h Copied from src/USER-OMP/bond_harmonic_omp.h
	P			src/USER-OMP/bond_fene_expand_omp.cpp Copied from src/USER-OMP/bond_harmonic_omp.cpp
	P			src/USER-OMP/bond_fene_expand_omp.h Copied from src/USER-OMP/bond_harmonic_omp.h
	P			src/USER-OMP/bond_fene_omp.cpp Copied from src/USER-OMP/bond_harmonic_omp.cpp
	P			src/USER-OMP/bond_fene_omp.h Copied from src/USER-OMP/bond_harmonic_omp.h
	P			src/USER-OMP/bond_harmonic_shift_cut_omp.cpp Copied from src/USER-OMP/bond_harmonic_omp.cpp
	P			src/USER-OMP/bond_harmonic_shift_cut_omp.h Copied from src/USER-OMP/bond_harmonic_omp.h
	P			src/USER-OMP/bond_harmonic_shift_omp.cpp Copied from src/USER-OMP/bond_harmonic_omp.cpp
	P			src/USER-OMP/bond_harmonic_shift_omp.h Copied from src/USER-OMP/bond_harmonic_omp.h
	P			src/USER-OMP/bond_morse_omp.cpp Copied from src/USER-OMP/bond_harmonic_omp.cpp
	P			src/USER-OMP/bond_morse_omp.h Copied from src/USER-OMP/bond_harmonic_omp.h
	P			src/USER-OMP/bond_nonlinear_omp.cpp Copied from src/USER-OMP/bond_harmonic_omp.cpp
	P			src/USER-OMP/bond_nonlinear_omp.h Copied from src/USER-OMP/bond_harmonic_omp.h
	P			src/USER-OMP/bond_quartic_omp.cpp Copied from src/USER-OMP/bond_harmonic_omp.cpp
	P			src/USER-OMP/bond_quartic_omp.h Copied from src/USER-OMP/bond_harmonic_omp.h
	P			src/USER-OMP/bond_table_omp.cpp Copied from src/USER-OMP/bond_harmonic_omp.cpp
	P			src/USER-OMP/bond_table_omp.h Copied from src/USER-OMP/bond_harmonic_omp.h
	M			src/USER-OMP/pppm_omp.cpp
	M			src/USER-OMP/thr_data.cpp
	M			src/pair.h