Merge branch 'merge-pull-28' into lammps-icms
6521601d70e2
Actions

Authored by Axel Kohlmeyer <akohlmey@gmail.com> on Feb 23 2016, 14:43.

Description

Merge branch 'merge-pull-28' into lammps-icms

Committed

Axel Kohlmeyer <akohlmey@gmail.com>

Feb 23 2016, 14:43

Pushed

junge

Oct 6 2016, 16:49

Parents

Branches

Unknown

Tags

Unknown

Axel Kohlmeyer <akohlmey@gmail.com> committed rLAMMPS6521601d70e2: Merge branch 'merge-pull-28' into lammps-icms (authored by Axel Kohlmeyer <akohlmey@gmail.com>).Feb 23 2016, 14:43

	Commit			Author	Details	Committed
	fd9b346d2482			Ryan S. Elliott	Update fix_adapt.cpp (and doc) to work with scalars	Feb 22 2016
	ab005ce59929			Ryan S. Elliott	Updates to pair_kim to support hybrid and fix_adapt	Feb 22 2016

				Path
	M			doc/fix_adapt.txt
	A			examples/kim/log.kim.lj.22Feb16.ubuntu.1
	A			examples/kim/log.kim.lj.22Feb16.ubuntu.4
	D			examples/kim/log.kim.lj.28Jun15.ubuntu.1
	D			examples/kim/log.kim.lj.28Jun15.ubuntu.4
	A			examples/kim/log.kim.lj.lmp.22Feb16.ubuntu.1
	A			examples/kim/log.kim.lj.lmp.22Feb16.ubuntu.4
	D			examples/kim/log.kim.lj.lmp.28Jun15.ubuntu.1
	D			examples/kim/log.kim.lj.lmp.28Jun15.ubuntu.4
	M			lib/kim/Makefile.lammps
	M			lib/kim/pair-kim.release.info
	M			src/KIM/pair_kim.cpp
	M			src/KIM/pair_kim.h
	M			src/KIM/pair_kim_version.h
	M			src/fix_adapt.cpp