Diffusion lammps 81a2ac57dc41

Merge remote branch 'lammps-ro/master' into lammps-icms
81a2ac57dc41
Actions

Authored by Axel Kohlmeyer <akohlmey@gmail.com> on Apr 4 2013, 17:20.

Description

Merge remote branch 'lammps-ro/master' into lammps-icms

Resolved Conflicts:
doc/Manual.txt

Details

Committed

Axel Kohlmeyer <akohlmey@gmail.com>

Apr 4 2013, 17:20

Pushed

junge

Oct 6 2016, 16:49

Parents

rLAMMPS8ddd160c3c33: git-svn-id: svn://svn.icms.temple.edu/lammps-ro/trunk@9748 f3b2605a-c512-4ea7…
rLAMMPSa15670bebd41: part 1 of the big makefile cleanup

Branches

Unknown

Tags

Unknown

Event Timeline

Axel Kohlmeyer <akohlmey@gmail.com> committed rLAMMPS81a2ac57dc41: Merge remote branch 'lammps-ro/master' into lammps-icms (authored by Axel Kohlmeyer <akohlmey@gmail.com>).Apr 4 2013, 17:20

Merged Changes

Commit	Author	Details	Committed
8ddd160c3c33	sjplimp	git-svn-id: svn://svn.icms.temple.edu/lammps-ro/trunk@9748 f3b2605a-c512-4ea7…	Apr 3 2013
17acdd4096a8	sjplimp	git-svn-id: svn://svn.icms.temple.edu/lammps-ro/trunk@9746 f3b2605a-c512-4ea7…	Apr 3 2013
557f65ecc57b	sjplimp	git-svn-id: svn://svn.icms.temple.edu/lammps-ro/trunk@9745 f3b2605a-c512-4ea7…	Apr 3 2013
609226f8d0ea	sjplimp	git-svn-id: svn://svn.icms.temple.edu/lammps-ro/trunk@9743 f3b2605a-c512-4ea7…	Apr 3 2013
80507c361235	sjplimp	git-svn-id: svn://svn.icms.temple.edu/lammps-ro/trunk@9742 f3b2605a-c512-4ea7…	Apr 3 2013
984b4c962b28	sjplimp	git-svn-id: svn://svn.icms.temple.edu/lammps-ro/trunk@9741 f3b2605a-c512-4ea7…	Apr 3 2013
cbc01e5758b6	sjplimp	git-svn-id: svn://svn.icms.temple.edu/lammps-ro/trunk@9740 f3b2605a-c512-4ea7…	Apr 3 2013
59c7061e1ced	sjplimp	git-svn-id: svn://svn.icms.temple.edu/lammps-ro/trunk@9739 f3b2605a-c512-4ea7…	Apr 3 2013
2206f011e938	sjplimp	git-svn-id: svn://svn.icms.temple.edu/lammps-ro/trunk@9738 f3b2605a-c512-4ea7…	Apr 3 2013
da77d5e62a9d	sjplimp	git-svn-id: svn://svn.icms.temple.edu/lammps-ro/trunk@9737 f3b2605a-c512-4ea7…	Apr 3 2013

Changes (72)

				Path
	M			doc/Manual.html
	M			doc/Manual.txt
	M			doc/Section_commands.html
	M			doc/Section_commands.txt
	M			doc/Section_tools.html
	M			doc/Section_tools.txt
	M			doc/read_data.html
	M			doc/read_data.txt
	A			doc/write_data.html
	A			doc/write_data.txt
	M			doc/write_restart.html
	M			doc/write_restart.txt
	M			src/DIPOLE/atom_vec_dipole.cpp
	M			src/DIPOLE/atom_vec_dipole.h
	M			src/MOLECULE/angle_harmonic.cpp
	M			src/MOLECULE/angle_harmonic.h
	M			src/MOLECULE/atom_vec_angle.cpp
	M			src/MOLECULE/atom_vec_angle.h
	M			src/MOLECULE/atom_vec_bond.cpp
	M			src/MOLECULE/atom_vec_bond.h
	M			src/MOLECULE/atom_vec_full.cpp
	M			src/MOLECULE/atom_vec_full.h
	M			src/MOLECULE/atom_vec_molecular.cpp
	M			src/MOLECULE/atom_vec_molecular.h
	M			src/MOLECULE/bond_fene.cpp
	M			src/MOLECULE/bond_fene.h
	M			src/MOLECULE/dihedral_harmonic.cpp
	M			src/MOLECULE/dihedral_harmonic.h
	M			src/MOLECULE/improper_harmonic.cpp
	M			src/MOLECULE/improper_harmonic.h
	M			src/PERI/atom_vec_peri.cpp
	M			src/PERI/atom_vec_peri.h
	M			src/USER-AWPMD/atom_vec_wavepacket.cpp
	M			src/USER-AWPMD/atom_vec_wavepacket.h
	M			src/USER-EFF/atom_vec_electron.cpp
	M			src/USER-EFF/atom_vec_electron.h
	M			src/USER-SPH/atom_vec_meso.cpp
	M			src/USER-SPH/atom_vec_meso.h
	M			src/angle.cpp
	M			src/angle.h
	M			src/atom_vec.cpp
	M			src/atom_vec.h
	M			src/atom_vec_atomic.cpp
	M			src/atom_vec_atomic.h
	M			src/atom_vec_body.cpp
	M			src/atom_vec_body.h
	M			src/atom_vec_charge.cpp
	M			src/atom_vec_charge.h
	M			src/atom_vec_ellipsoid.cpp
	M			src/atom_vec_ellipsoid.h
	M			src/atom_vec_hybrid.cpp
	M			src/atom_vec_hybrid.h
	M			src/atom_vec_line.cpp
	M			src/atom_vec_line.h
	M			src/atom_vec_sphere.cpp
	M			src/atom_vec_sphere.h
	M			src/atom_vec_tri.cpp
	M			src/atom_vec_tri.h
	M			src/bond.cpp
	M			src/bond.h
	M			src/dihedral.cpp
	M			src/dihedral.h
	M			src/improper.cpp
	M			src/improper.h
	M			src/pair.cpp
	M			src/pair.h
	M			src/pair_lj_cut.cpp
	M			src/pair_lj_cut.h
	M			src/thermo.h
	M			src/version.h
	A			src/write_data.cpp
	P			src/write_data.h Copied from src/USER-MISC/improper_ring.h