Merge branch 'openmp-step4' into openmp-master
df93442de56e
Actions

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

Description

Merge branch 'openmp-step4' into openmp-master

Committed

Axel Kohlmeyer <akohlmey@gmail.com>

Oct 4 2011, 18:16

Pushed

junge

Oct 6 2016, 16:49

Parents

Branches

Unknown

Tags

Unknown

Axel Kohlmeyer <akohlmey@gmail.com> committed rLAMMPSdf93442de56e: Merge branch 'openmp-step4' into openmp-master (authored by Axel Kohlmeyer <akohlmey@gmail.com>).Oct 4 2011, 18:16

Commit	Author	Details	Committed
608a145e4bb5	Axel Kohlmeyer	added /omp documentation for fix gravity	Oct 4 2011
5ed99b020343	Axel Kohlmeyer	add documentation about hybrid/omp styles	Oct 4 2011
c1a4462acb4e	Axel Kohlmeyer	prep work for future ev_tally changes.	Oct 4 2011
5012cb4662df	Axel Kohlmeyer	silence warnings about redefined macros	Oct 4 2011
6e5fd08ec5a0	Axel Kohlmeyer	fix bug that was interfering with suffix handling	Oct 4 2011
e23e68a509eb	Axel Kohlmeyer	expand suffix handling in input processing	Oct 4 2011
874b02ed8d5d	Axel Kohlmeyer	addi or improve suffix support to force styles	Oct 4 2011

				Path
	M			doc/Section_commands.txt
	M			doc/angle_hybrid.txt
	M			doc/bond_hybrid.txt
	M			doc/dihedral_hybrid.txt
	M			doc/fix_gravity.txt
	M			doc/improper_hybrid.txt
	M			src/MOLECULE/angle_hybrid.cpp
	M			src/MOLECULE/angle_hybrid.h
	M			src/MOLECULE/dihedral_hybrid.cpp
	M			src/MOLECULE/dihedral_hybrid.h
	M			src/MOLECULE/improper_hybrid.cpp
	M			src/MOLECULE/improper_hybrid.h
	P			src/USER-OMP/angle_hybrid_omp.cpp Copied from src/USER-OMP/pair_hybrid_omp.cpp
	P			src/USER-OMP/angle_hybrid_omp.h Copied from src/USER-OMP/pair_hybrid_omp.h
	P			src/USER-OMP/bond_hybrid_omp.cpp Copied from src/USER-OMP/pair_hybrid_omp.cpp
	P			src/USER-OMP/bond_hybrid_omp.h Copied from src/USER-OMP/pair_hybrid_omp.h
	P			src/USER-OMP/dihedral_hybrid_omp.cpp Copied from src/USER-OMP/pair_hybrid_omp.cpp
	P			src/USER-OMP/dihedral_hybrid_omp.h Copied from src/USER-OMP/pair_hybrid_omp.h
	P			src/USER-OMP/improper_hybrid_omp.cpp Copied from src/USER-OMP/pair_hybrid_omp.cpp
	P			src/USER-OMP/improper_hybrid_omp.h Copied from src/USER-OMP/pair_hybrid_omp.h
	P			src/USER-OMP/pair_hybrid_omp.cpp Copied to multiple locations: src/USER-OMP/angle_hybrid_omp.cpp src/USER-OMP/bond_hybrid_omp.cpp src/USER-OMP/dihedral_hybrid_omp.cpp src/USER-OMP/improper_hybrid_omp.cpp
	M			src/USER-OMP/pair_hybrid_overlay_omp.cpp
	M			src/USER-OMP/thr_omp.cpp
	M			src/USER-OMP/thr_omp.h
	M			src/bond_hybrid.cpp
	M			src/bond_hybrid.h
	M			src/force.cpp
	M			src/force.h
	M			src/input.cpp
	M			src/pair_hybrid.cpp
	M			src/pair_hybrid.h