Merge branch 'airebo-fixup' into openmp-step7
56c38528ed63
Actions

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

Description

Merge branch 'airebo-fixup' into openmp-step7

Resolved Conflicts:
src/MANYBODY/pair_airebo.h

Committed

Axel Kohlmeyer <akohlmey@gmail.com>

Oct 24 2011, 22:19

Pushed

junge

Oct 6 2016, 16:49

Parents

Branches

Unknown

Tags

Unknown

Axel Kohlmeyer <akohlmey@gmail.com> committed rLAMMPS56c38528ed63: Merge branch 'airebo-fixup' into openmp-step7 (authored by Axel Kohlmeyer <akohlmey@gmail.com>).Oct 24 2011, 22:19

	Commit			Author	Details	Committed
	99f3957cf202			Axel Kohlmeyer	updated and optimized version of airebo potentials	Oct 24 2011

				Path
	M			potentials/CH.airebo
	M			src/MANYBODY/pair_airebo.cpp
	M			src/MANYBODY/pair_airebo.h
	M			src/USER-OMP/pair_airebo_omp.cpp