Diffusion lammps e4ab4f222b05

Merge branch 'openmp-step5' into openmp-master
e4ab4f222b05
Actions

Authored by Axel Kohlmeyer <akohlmey@gmail.com> on Oct 19 2011, 02:01.

Description

Merge branch 'openmp-step5' into openmp-master

Details

Committed

Axel Kohlmeyer <akohlmey@gmail.com>

Oct 19 2011, 02:01

Pushed

junge

Oct 6 2016, 16:49

Parents

rLAMMPS506f2f16550a: add documentation for /omp improper styles
rLAMMPS693edb607637: Merge branch 'openmp-step5' into openmp-master

Branches

Unknown

Tags

Unknown

Event Timeline

Axel Kohlmeyer <akohlmey@gmail.com> committed rLAMMPSe4ab4f222b05: Merge branch 'openmp-step5' into openmp-master (authored by Axel Kohlmeyer <akohlmey@gmail.com>).Oct 19 2011, 02:01

Merged Changes

Commit	Author	Details	Committed
506f2f16550a	Axel Kohlmeyer	add documentation for /omp improper styles	Oct 19 2011
6498113f8861	Axel Kohlmeyer	final multi-threaded improper implementations	Oct 19 2011
2da0d83cfef9	Axel Kohlmeyer	prepare for adding the rest of the multi-threaded improper styles	Oct 19 2011
8a5ba2e5ffb8	Axel Kohlmeyer	document all /omp angle styles.	Oct 18 2011
55cdcc55ec7f	Axel Kohlmeyer	convert more angle styles to multi-threading	Oct 18 2011
31868e7aea01	Axel Kohlmeyer	encode location of cuda library into binary	Oct 18 2011
ad48b9635ea3	Axel Kohlmeyer	first batch of mass ported angle potentials	Oct 18 2011

Changes (59)

				Path
	M			doc/Section_commands.txt
	M			doc/angle_charmm.txt
	M			doc/angle_class2.txt
	P			doc/angle_cosine.txt Copied from doc/dihedral_harmonic.txt
	M			doc/angle_cosine_delta.txt
	M			doc/angle_cosine_periodic.txt
	M			doc/angle_cosine_shift.txt
	M			doc/angle_cosine_shift_exp.txt
	M			doc/angle_cosine_squared.txt
	M			doc/angle_harmonic.txt
	M			doc/angle_table.txt
	M			doc/improper_class2.txt
	M			doc/improper_cvff.txt
	M			doc/improper_harmonic.txt
	M			doc/improper_umbrella.txt
	M			lib/gpu/Makefile.lammps
	M			src/CLASS2/angle_class2.cpp
	M			src/CLASS2/angle_class2.h
	M			src/CLASS2/improper_class2.h
	M			src/MOLECULE/angle_cosine.cpp
	M			src/MOLECULE/angle_cosine.h
	M			src/MOLECULE/angle_cosine_delta.h
	M			src/MOLECULE/angle_cosine_periodic.h
	M			src/MOLECULE/angle_harmonic.h
	M			src/MOLECULE/angle_table.h
	M			src/MOLECULE/improper_cvff.h
	M			src/MOLECULE/improper_harmonic.h
	M			src/MOLECULE/improper_umbrella.h
	M			src/USER-MISC/angle_cosine_shift.h
	M			src/USER-MISC/angle_cosine_shift_exp.cpp
	M			src/USER-MISC/angle_cosine_shift_exp.h
	P			src/USER-OMP/angle_class2_omp.cpp Copied from src/USER-OMP/angle_charmm_omp.cpp
	P			src/USER-OMP/angle_class2_omp.h Copied from src/USER-OMP/angle_charmm_omp.h
	P			src/USER-OMP/angle_cosine_delta_omp.cpp Copied from src/USER-OMP/angle_charmm_omp.cpp
	P			src/USER-OMP/angle_cosine_delta_omp.h Copied from src/USER-OMP/angle_charmm_omp.h
	P			src/USER-OMP/angle_cosine_omp.cpp Copied from src/USER-OMP/angle_charmm_omp.cpp
	P			src/USER-OMP/angle_cosine_omp.h Copied from src/USER-OMP/angle_charmm_omp.h
	P			src/USER-OMP/angle_cosine_periodic_omp.cpp Copied from src/USER-OMP/angle_charmm_omp.cpp
	P			src/USER-OMP/angle_cosine_periodic_omp.h Copied from src/USER-OMP/angle_charmm_omp.h
	P			src/USER-OMP/angle_cosine_shift_exp_omp.cpp Copied from src/USER-OMP/angle_charmm_omp.cpp
	P			src/USER-OMP/angle_cosine_shift_exp_omp.h Copied from src/USER-OMP/angle_charmm_omp.h
	P			src/USER-OMP/angle_cosine_shift_omp.cpp Copied from src/USER-OMP/angle_charmm_omp.cpp
	P			src/USER-OMP/angle_cosine_shift_omp.h Copied from src/USER-OMP/angle_charmm_omp.h
	P			src/USER-OMP/angle_cosine_squared_omp.cpp Copied from src/USER-OMP/angle_charmm_omp.cpp
	P			src/USER-OMP/angle_cosine_squared_omp.h Copied from src/USER-OMP/angle_charmm_omp.h
	P			src/USER-OMP/angle_harmonic_omp.cpp Copied from src/USER-OMP/angle_charmm_omp.cpp
	P			src/USER-OMP/angle_harmonic_omp.h Copied from src/USER-OMP/angle_charmm_omp.h
	P			src/USER-OMP/angle_table_omp.cpp Copied from src/USER-OMP/angle_charmm_omp.cpp
	P			src/USER-OMP/angle_table_omp.h Copied from src/USER-OMP/angle_charmm_omp.h
	P			src/USER-OMP/improper_class2_omp.cpp Copied from src/CLASS2/improper_class2.cpp
	P			src/USER-OMP/improper_class2_omp.h Copied from src/USER-OMP/bond_fene_expand_omp.h
	P			src/USER-OMP/improper_cvff_omp.cpp Copied from src/USER-OMP/dihedral_multi_harmonic_omp.cpp
	P			src/USER-OMP/improper_cvff_omp.h Copied from src/USER-OMP/bond_fene_omp.h
	P			src/USER-OMP/improper_harmonic_omp.cpp Copied from src/MOLECULE/improper_harmonic.cpp
	P			src/USER-OMP/improper_harmonic_omp.h Copied from src/USER-OMP/dihedral_harmonic_omp.h
	P			src/USER-OMP/improper_umbrella_omp.cpp Copied from src/MOLECULE/improper_umbrella.cpp
	P			src/USER-OMP/improper_umbrella_omp.h Copied from src/USER-OMP/dihedral_harmonic_omp.h
	M			src/USER-OMP/thr_omp.cpp
	M			src/USER-OMP/thr_omp.h