Merge branch 'master' into lammps-icms
6bcf83444ede
Actions

Authored by Axel Kohlmeyer <akohlmey@gmail.com> on Dec 10 2012, 09:58.

Description

Merge branch 'master' into lammps-icms

Committed

Axel Kohlmeyer <akohlmey@gmail.com>

Dec 10 2012, 09:58

Pushed

junge

Oct 6 2016, 16:49

Parents

Branches

Unknown

Tags

Unknown

Axel Kohlmeyer <akohlmey@gmail.com> committed rLAMMPS6bcf83444ede: Merge branch 'master' into lammps-icms (authored by Axel Kohlmeyer <akohlmey@gmail.com>).Dec 10 2012, 09:58

Commit	Author	Details	Committed
755e63c0bd8e	athomps	Added alternate displace mods	Dec 7 2012
212d8954dd55	sjplimp	git-svn-id: svn://svn.icms.temple.edu/lammps-ro/trunk@9146 f3b2605a-c512-4ea7…	Dec 7 2012
d4066c83bfee	sjplimp	git-svn-id: svn://svn.icms.temple.edu/lammps-ro/trunk@9144 f3b2605a-c512-4ea7…	Dec 6 2012
190fc494b836	pscrozi	Updating MSM documentation.	Dec 5 2012
05db562cb202	pscrozi	Better MSM parallelization.	Dec 5 2012

				Path
	M			doc/kspace_modify.html
	M			doc/kspace_modify.txt
	M			doc/kspace_style.html
	M			doc/kspace_style.txt
	P			examples/ELASTIC/displace_restart.mod Copied from examples/ELASTIC/displace.mod
	P			examples/ELASTIC/displace_reverse.mod Copied from examples/ELASTIC/displace.mod
	M			examples/ELASTIC/in.elastic
	M			src/KSPACE/msm.cpp
	M			src/KSPACE/msm.h
	M			src/version.h
	M			tools/restart2data.cpp