Merge branch 'master' into lammps-icms
a47e493dfdb2
Actions

Authored by Axel Kohlmeyer <akohlmey@gmail.com> on Jan 10 2011, 16:06.

Description

Merge branch 'master' into lammps-icms

Conflicts resolved in:
doc/Section_commands.html
src/USER-IMD/fix_imd.cpp
src/finish.cpp

Committed

Axel Kohlmeyer <akohlmey@gmail.com>

Jan 10 2011, 16:06

Pushed

junge

Oct 6 2016, 16:49

Parents

Branches

Unknown

Tags

Unknown

Axel Kohlmeyer <akohlmey@gmail.com> committed rLAMMPSa47e493dfdb2: Merge branch 'master' into lammps-icms (authored by Axel Kohlmeyer <akohlmey@gmail.com>).Jan 10 2011, 16:06

Commit	Author	Details	Committed
dff863f9d370	athomps	Changed to MPI_LONG_LONG	Jan 8 2011
0bc9255821a9	sjplimp	git-svn-id: svn://svn.icms.temple.edu/lammps-ro/trunk@5511 f3b2605a-c512-4ea7…	Jan 7 2011
9c2137ef5157	sjplimp	git-svn-id: svn://svn.icms.temple.edu/lammps-ro/trunk@5510 f3b2605a-c512-4ea7…	Jan 7 2011
d30e0f0e5f39	sjplimp	git-svn-id: svn://svn.icms.temple.edu/lammps-ro/trunk@5508 f3b2605a-c512-4ea7…	Jan 7 2011
f63c616ed121	sjplimp	git-svn-id: svn://svn.icms.temple.edu/lammps-ro/trunk@5507 f3b2605a-c512-4ea7…	Jan 7 2011
86ed0949f73a	sjplimp	git-svn-id: svn://svn.icms.temple.edu/lammps-ro/trunk@5506 f3b2605a-c512-4ea7…	Jan 7 2011
66f56f982c06	sjplimp	git-svn-id: svn://svn.icms.temple.edu/lammps-ro/trunk@5505 f3b2605a-c512-4ea7…	Jan 7 2011
140cdf94854f	sjplimp	git-svn-id: svn://svn.icms.temple.edu/lammps-ro/trunk@5504 f3b2605a-c512-4ea7…	Jan 7 2011
beabb5e05ab1	sjplimp	git-svn-id: svn://svn.icms.temple.edu/lammps-ro/trunk@5503 f3b2605a-c512-4ea7…	Jan 7 2011
15c856bcaa10	sjplimp	git-svn-id: svn://svn.icms.temple.edu/lammps-ro/trunk@5502 f3b2605a-c512-4ea7…	Jan 7 2011

				Path
	M			doc/Section_commands.html
	M			doc/Section_howto.html
	M			doc/Section_intro.html
	M			doc/Section_start.html
	M			doc/Section_start.txt
	M			src/ASPHERE/atom_vec_ellipsoid.cpp
	M			src/COLLOID/atom_vec_colloid.cpp
	M			src/DIPOLE/atom_vec_dipole.cpp
	M			src/GRANULAR/atom_vec_granular.cpp
	M			src/GRANULAR/fix_pour.cpp
	M			src/MOLECULE/atom_vec_angle.cpp
	M			src/MOLECULE/atom_vec_bond.cpp
	M			src/MOLECULE/atom_vec_full.cpp
	M			src/MOLECULE/atom_vec_molecular.cpp
	M			src/PERI/atom_vec_peri.cpp
	M			src/PERI/fix_peri_neigh.cpp
	M			src/REAX/pair_reax.cpp
	M			src/REPLICA/prd.cpp
	M			src/REPLICA/tad.cpp
	M			src/SRD/fix_srd.cpp
	M			src/STUBS/mpi.c
	M			src/STUBS/mpi.h
	M			src/USER-EFF/Install.sh
	M			src/USER-EFF/atom_vec_electron.cpp
	M			src/USER-IMD/fix_imd.cpp
	M			src/XTC/dump_xtc.cpp
	M			src/XTC/dump_xtc.h
	M			src/atom_vec_atomic.cpp
	M			src/atom_vec_charge.cpp
	M			src/atom_vec_hybrid.cpp
	M			src/create_atoms.cpp
	M			src/delete_atoms.cpp
	M			src/delete_bonds.cpp
	M			src/displace_atoms.cpp
	M			src/displace_box.cpp
	M			src/dump.cpp
	M			src/dump.h
	M			src/dump_atom.cpp
	M			src/dump_atom.h
	M			src/dump_cfg.cpp
	M			src/dump_cfg.h
	M			src/dump_custom.cpp
	M			src/dump_custom.h
	M			src/dump_dcd.cpp
	M			src/dump_dcd.h
	M			src/dump_local.cpp
	M			src/dump_local.h
	M			src/dump_xyz.cpp
	M			src/dump_xyz.h
	M			src/finish.cpp
	M			src/fix_deposit.cpp
	M			src/fix_orient_fcc.cpp
	M			src/lammps.cpp
	M			src/lmptype.h
	M			src/read_data.cpp
	M			src/read_restart.cpp
	M			src/replicate.cpp
	M			src/thermo.cpp
	M			src/thermo.h
	M			src/version.h
	M			src/write_restart.cpp
	M			tools/binary2txt.cpp
	M			tools/restart2data.cpp