Merge branch 'merge-pull-105' into lammps-icms
8a8758f32161
Actions

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

Description

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

This lifts the restriction to require atom style dpd for use with USER-DPD

Committed

Axel Kohlmeyer <akohlmey@gmail.com>

Jun 23 2016, 18:07

Pushed

junge

Oct 6 2016, 16:49

Parents

Branches

Unknown

Tags

Unknown

Axel Kohlmeyer <akohlmey@gmail.com> committed rLAMMPS8a8758f32161: Merge branch 'merge-pull-105' into lammps-icms (authored by Axel Kohlmeyer <akohlmey@gmail.com>).Jun 23 2016, 18:07

Commit	Author	Details	Committed
84b7bce41cf6	Axel Kohlmeyer	Merge branch 'USER-DPD_restore_atom_style_support' of https://github.	Jun 23 2016
1647a54020fb	Tim Mattox	Fix missing newlines in a few USER-DPD example input files.	Jun 23 2016
84d79d769f16	Tim Mattox	Update the documentation for atom_style restrictions for USER-DPD.	Jun 23 2016
297f31387fcf	Tim Mattox	Restore use of "atom_style atomic" in two of the USER-DPD examples.	Jun 23 2016
0ccd6c6ed96d	Tim Mattox	Move ssaAIR calculation code from atom_vec_dpd into fix_shardlow. Re-enables…	Jun 23 2016

				Path
	M			doc/src/fix_shardlow.txt
	M			doc/src/pair_dpd_fdt.txt
	M			examples/USER/dpd/dpd-shardlow/data.dpd
	M			examples/USER/dpd/dpd-shardlow/in.dpd-shardlow
	M			examples/USER/dpd/dpd-shardlow/log.reference
	M			examples/USER/dpd/dpdh-shardlow/in.dpdh-shardlow
	M			examples/USER/dpd/dpdp-shardlow/data.dpd
	M			examples/USER/dpd/dpdp-shardlow/in.dpdp-shardlow
	M			examples/USER/dpd/dpdp-shardlow/log.reference
	M			src/USER-DPD/atom_vec_dpd.cpp
	M			src/USER-DPD/atom_vec_dpd.h
	M			src/USER-DPD/fix_shardlow.cpp
	M			src/USER-DPD/fix_shardlow.h
	M			src/USER-DPD/pair_dpd_fdt.cpp