Merge branch 'merge-pull-98' into lammps-icms
81be4af2bb75
Actions

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

Description

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

This corrects the segfaults in the dpd-shardlow and dpdp-shardlow
examples in the examples/USER/dpd/ directory. We may revisit this in the
future to re-enable use of other atom styles in conjunction with
fix_shardlow and pair_dpd_fdt.

Details

Committed

Axel Kohlmeyer <akohlmey@gmail.com>

Jun 16 2016, 23:57

Pushed

junge

Oct 6 2016, 16:49

Parents

rLAMMPS6251e04d2ddf: Merge branch 'require_atom_style_dpd' of https://github.com/timattox/lammps…
rLAMMPS0299c00af2c8: correct syntax for zbl USER-OMP demo

Branches

Unknown

Tags

Unknown

Event Timeline

Axel Kohlmeyer <akohlmey@gmail.com> committed rLAMMPS81be4af2bb75: Merge branch 'merge-pull-98' into lammps-icms (authored by Axel Kohlmeyer <akohlmey@gmail.com>).Jun 16 2016, 23:57

Merged Changes

	Commit			Author	Details	Committed
	6251e04d2ddf			Axel Kohlmeyer	Merge branch 'require_atom_style_dpd' of https://github.com/timattox/lammps…	Jun 16 2016
	a23a2407a716			Tim Mattox	USER-DPD now requires atom_style dpd due to a recent change. Includes updates…	Jun 16 2016

Changes (10)

				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