Merge branch 'master' into openmp-master
ff6a98efa053
Actions

Authored by Axel Kohlmeyer <akohlmey@gmail.com> on Aug 25 2011, 15:51.

Description

Merge branch 'master' into openmp-master

Committed

Axel Kohlmeyer <akohlmey@gmail.com>

Aug 25 2011, 15:51

Pushed

junge

Oct 6 2016, 16:49

Parents

Branches

Unknown

Tags

Unknown

Axel Kohlmeyer <akohlmey@gmail.com> committed rLAMMPSff6a98efa053: Merge branch 'master' into openmp-master (authored by Axel Kohlmeyer <akohlmey@gmail.com>).Aug 25 2011, 15:51

	Commit			Author	Details	Committed
	0cb40558c5fd			athomps	Added Matt's piston and append code	Aug 24 2011
	029a4d2df257			sjplimp	git-svn-id: svn://svn.icms.temple.edu/lammps-ro/trunk@6780 f3b2605a-c512-4ea7…	Aug 24 2011

				Path
	M			src/KSPACE/pair_coul_long.h
	M			src/MOLECULE/atom_vec_angle.cpp
	M			src/SHOCK/Install.sh
	A			src/SHOCK/fix_append_atoms.cpp
	P			src/SHOCK/fix_append_atoms.h Copied from src/USER-MISC/fix_addtorque.h
	A			src/SHOCK/fix_wall_piston.cpp
	P			src/SHOCK/fix_wall_piston.h Copied from src/fix_nve_limit.h
	M			src/USER-AWPMD/atom_vec_wavepacket.cpp
	M			src/USER-EFF/atom_vec_electron.cpp