lammps…
6251e04d2ddf
Actions

Authored by Axel Kohlmeyer <akohlmey@gmail.com> on Jun 16 2016, 23:57.

Description

Merge branch 'require_atom_style_dpd' of https://github.com/timattox/lammps into merge-pull-98

Committed

Axel Kohlmeyer <akohlmey@gmail.com>

Jun 16 2016, 23:57

Pushed

junge

Oct 6 2016, 16:49

Parents

Branches

Unknown

Tags

Unknown

	Commit			Author	Details	Committed
	a23a2407a716			Tim Mattox	USER-DPD now requires atom_style dpd due to a recent change. Includes updates…	Jun 16 2016

				Path
	M			doc/src/fix_shardlow.txt
	M			doc/src/pair_dpd_fdt.txt
	P			examples/USER/dpd/dpd-shardlow/data.dpd Copied from examples/USER/dpd/dpde-shardlow/data.dpde
	M			examples/USER/dpd/dpd-shardlow/in.dpd-shardlow
	M			examples/USER/dpd/dpd-shardlow/log.reference
	P			examples/USER/dpd/dpdp-shardlow/data.dpd Copied from examples/USER/dpd/dpde-shardlow/data.dpde
	M			examples/USER/dpd/dpdp-shardlow/in.dpdp-shardlow
	M			examples/USER/dpd/dpdp-shardlow/log.reference
	M			src/USER-DPD/fix_shardlow.cpp
	M			src/USER-DPD/pair_dpd_fdt.cpp