Merge branch 'master' into lammps-icms
5a75a6c82772
Actions

Authored by Axel Kohlmeyer <akohlmey@gmail.com> on Oct 26 2012, 15:50.

Description

Merge branch 'master' into lammps-icms

Resolved Conflicts:
src/REPLICA/verlet_split.cpp
src/USER-OMP/fix_omp.cpp

Committed

Axel Kohlmeyer <akohlmey@gmail.com>

Oct 26 2012, 15:50

Pushed

junge

Oct 6 2016, 16:49

Parents

Branches

Unknown

Tags

Unknown

Axel Kohlmeyer <akohlmey@gmail.com> committed rLAMMPS5a75a6c82772: Merge branch 'master' into lammps-icms (authored by Axel Kohlmeyer <akohlmey@gmail.com>).Oct 26 2012, 15:50

Commit	Author	Details	Committed
8663c9229319	sjplimp	git-svn-id: svn://svn.icms.temple.edu/lammps-ro/trunk@9012 f3b2605a-c512-4ea7…	Oct 25 2012
7d1c3ed324c0	sjplimp	git-svn-id: svn://svn.icms.temple.edu/lammps-ro/trunk@9010 f3b2605a-c512-4ea7…	Oct 25 2012
dba890a5afae	sjplimp	git-svn-id: svn://svn.icms.temple.edu/lammps-ro/trunk@9009 f3b2605a-c512-4ea7…	Oct 25 2012
e9fa893b1c97	sjplimp	git-svn-id: svn://svn.icms.temple.edu/lammps-ro/trunk@9008 f3b2605a-c512-4ea7…	Oct 25 2012
43b161eb3398	sjplimp	git-svn-id: svn://svn.icms.temple.edu/lammps-ro/trunk@9007 f3b2605a-c512-4ea7…	Oct 25 2012
6f4bba7edf24	sjplimp	git-svn-id: svn://svn.icms.temple.edu/lammps-ro/trunk@9006 f3b2605a-c512-4ea7…	Oct 25 2012
cb9d45386c19	sjplimp	git-svn-id: svn://svn.icms.temple.edu/lammps-ro/trunk@9004 f3b2605a-c512-4ea7…	Oct 25 2012
ccbe10ff39d6	sjplimp	git-svn-id: svn://svn.icms.temple.edu/lammps-ro/trunk@9003 f3b2605a-c512-4ea7…	Oct 25 2012
6dcb5fb23d35	sjplimp	git-svn-id: svn://svn.icms.temple.edu/lammps-ro/trunk@9002 f3b2605a-c512-4ea7…	Oct 25 2012
13dd457ae76f	sjplimp	git-svn-id: svn://svn.icms.temple.edu/lammps-ro/trunk@9001 f3b2605a-c512-4ea7…	Oct 25 2012
e2283d16092b	sjplimp	git-svn-id: svn://svn.icms.temple.edu/lammps-ro/trunk@9000 f3b2605a-c512-4ea7…	Oct 25 2012
f865058700c8	sjplimp	git-svn-id: svn://svn.icms.temple.edu/lammps-ro/trunk@8999 f3b2605a-c512-4ea7…	Oct 25 2012

				Path
	M			examples/COUPLE/README
	M			examples/COUPLE/fortran2/LAMMPS.F90
	M			examples/COUPLE/fortran2/README
	M			examples/COUPLE/fortran2/in.simple
	M			examples/COUPLE/fortran2/simple.f90
	M			python/README
	M			python/examples/demo.py
	M			python/lammps.py
	M			src/Makefile.shlib
	M			src/REPLICA/verlet_split.cpp
	M			src/RIGID/fix_rigid.cpp
	M			src/USER-MISC/compute_temp_rotate.cpp
	M			src/USER-MISC/fix_addtorque.cpp
	M			src/compute_com_molecule.cpp
	M			src/compute_gyration.cpp
	M			src/compute_gyration_molecule.cpp
	M			src/compute_msd_molecule.cpp
	M			src/fix_addforce.cpp
	M			src/fix_momentum.cpp
	M			src/fix_spring_rg.cpp
	M			src/fix_spring_self.cpp
	M			src/fix_tmd.cpp
	M			src/group.cpp
	M			src/velocity.cpp
	M			src/version.h