Merge branch 'lammps-icms' of bitbucket.org:akohlmey/lammps-icms into lammps…
fd58fbac8b16
Actions

Authored by Axel Kohlmeyer <akohlmey@gmail.com> on Nov 7 2013, 22:00.

Description

Merge branch 'lammps-icms' of bitbucket.org:akohlmey/lammps-icms into lammps-icms

Committed

Axel Kohlmeyer <akohlmey@gmail.com>

Nov 7 2013, 22:00

Pushed

junge

Oct 6 2016, 16:49

Parents

Branches

Unknown

Tags

Unknown

Commit	Author	Details	Committed
968038bd4d37	Axel Kohlmeyer	Merge remote branch 'lammps-ro/master' into lammps-icms	Nov 7 2013
5104ac433297	Axel Kohlmeyer	add "part" thermo keyword code suggested by oleg sergeev	Nov 7 2013
faff0eb70bc8	sjplimp	git-svn-id: svn://svn.icms.temple.edu/lammps-ro/trunk@10985 f3b2605a-c512-4ea7…	Nov 6 2013
aa9502ec5af1	sjplimp	git-svn-id: svn://svn.icms.temple.edu/lammps-ro/trunk@10984 f3b2605a-c512-4ea7…	Nov 6 2013

				Path
	M			doc/thermo_style.txt
	M			src/USER-MISC/fix_ti_rs.cpp
	M			src/USER-MISC/fix_ti_rs.h
	M			src/USER-MISC/fix_ti_spring.cpp
	M			src/USER-MISC/fix_ti_spring.h
	M			src/angle.cpp
	M			src/bond.cpp
	M			src/dihedral.cpp
	M			src/improper.cpp
	M			src/thermo.cpp
	M			src/thermo.h