Diffusion lammps 6bd45c6681ea

Merge remote-tracking branch 'lammps-ro/master' into lammps-icms
6bd45c6681ea
Actions

Authored by Axel Kohlmeyer <akohlmey@gmail.com> on Jul 17 2015, 12:56.

Description

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

Conflicts:
doc/Manual.html
doc/Manual.txt
doc/info.txt
src/atom.cpp
src/info.cpp

Details

Committed

Axel Kohlmeyer <akohlmey@gmail.com>

Jul 17 2015, 12:56

Pushed

junge

Oct 6 2016, 16:49

Parents

rLAMMPS21727b3892b4: git-svn-id: svn://svn.icms.temple.edu/lammps-ro/trunk@13629 f3b2605a-c512-4ea7…
rLAMMPS622497a3e955: windows has one hell of a crazy API.

Branches

Unknown

Tags

Unknown

Event Timeline

Axel Kohlmeyer <akohlmey@gmail.com> committed rLAMMPS6bd45c6681ea: Merge remote-tracking branch 'lammps-ro/master' into lammps-icms (authored by Axel Kohlmeyer <akohlmey@gmail.com>).Jul 17 2015, 12:56

Merged Changes

Commit	Author	Details	Committed
21727b3892b4	sjplimp	git-svn-id: svn://svn.icms.temple.edu/lammps-ro/trunk@13629 f3b2605a-c512-4ea7…	Jul 17 2015
936e136b9db8	sjplimp	git-svn-id: svn://svn.icms.temple.edu/lammps-ro/trunk@13628 f3b2605a-c512-4ea7…	Jul 17 2015
3341c4de6bbd	sjplimp	git-svn-id: svn://svn.icms.temple.edu/lammps-ro/trunk@13627 f3b2605a-c512-4ea7…	Jul 17 2015
f39666ef0bcc	sjplimp	git-svn-id: svn://svn.icms.temple.edu/lammps-ro/trunk@13625 f3b2605a-c512-4ea7…	Jul 17 2015
9d8b08fc09f6	sjplimp	git-svn-id: svn://svn.icms.temple.edu/lammps-ro/trunk@13624 f3b2605a-c512-4ea7…	Jul 17 2015
528840660078	sjplimp	git-svn-id: svn://svn.icms.temple.edu/lammps-ro/trunk@13623 f3b2605a-c512-4ea7…	Jul 17 2015
a7d83dae9d26	sjplimp	git-svn-id: svn://svn.icms.temple.edu/lammps-ro/trunk@13622 f3b2605a-c512-4ea7…	Jul 17 2015
8e3c4f7e330a	sjplimp	git-svn-id: svn://svn.icms.temple.edu/lammps-ro/trunk@13621 f3b2605a-c512-4ea7…	Jul 17 2015
63d154aa03cd	sjplimp	git-svn-id: svn://svn.icms.temple.edu/lammps-ro/trunk@13620 f3b2605a-c512-4ea7…	Jul 17 2015
2e4b4ba78629	sjplimp	git-svn-id: svn://svn.icms.temple.edu/lammps-ro/trunk@13619 f3b2605a-c512-4ea7…	Jul 17 2015
a2c475b1a2fe	sjplimp	git-svn-id: svn://svn.icms.temple.edu/lammps-ro/trunk@13618 f3b2605a-c512-4ea7…	Jul 17 2015
6a79311dfcf8	sjplimp	git-svn-id: svn://svn.icms.temple.edu/lammps-ro/trunk@13617 f3b2605a-c512-4ea7…	Jul 17 2015
6295fc690850	sjplimp	git-svn-id: svn://svn.icms.temple.edu/lammps-ro/trunk@13616 f3b2605a-c512-4ea7…	Jul 17 2015
e4e7165fd22f	sjplimp	git-svn-id: svn://svn.icms.temple.edu/lammps-ro/trunk@13615 f3b2605a-c512-4ea7…	Jul 16 2015
b96e60f56708	sjplimp	git-svn-id: svn://svn.icms.temple.edu/lammps-ro/trunk@13614 f3b2605a-c512-4ea7…	Jul 16 2015
33106143bd13	sjplimp	git-svn-id: svn://svn.icms.temple.edu/lammps-ro/trunk@13613 f3b2605a-c512-4ea7…	Jul 16 2015
8667fbeaf2d4	sjplimp	git-svn-id: svn://svn.icms.temple.edu/lammps-ro/trunk@13612 f3b2605a-c512-4ea7…	Jul 16 2015
97b3d8d11322	sjplimp	git-svn-id: svn://svn.icms.temple.edu/lammps-ro/trunk@13611 f3b2605a-c512-4ea7…	Jul 16 2015
58091a4d9877	sjplimp	git-svn-id: svn://svn.icms.temple.edu/lammps-ro/trunk@13610 f3b2605a-c512-4ea7…	Jul 16 2015
5a21de608ebc	sjplimp	git-svn-id: svn://svn.icms.temple.edu/lammps-ro/trunk@13609 f3b2605a-c512-4ea7…	Jul 16 2015
79a36049b774	sjplimp	git-svn-id: svn://svn.icms.temple.edu/lammps-ro/trunk@13607 f3b2605a-c512-4ea7…	Jul 16 2015
4c5985d7e824	sjplimp	git-svn-id: svn://svn.icms.temple.edu/lammps-ro/trunk@13606 f3b2605a-c512-4ea7…	Jul 16 2015

Changes (37)

				Path
	M			doc/Manual.html
	M			doc/Manual.txt
	M			doc/Section_commands.html
	M			doc/Section_commands.txt
	M			doc/Section_intro.html
	M			doc/Section_intro.txt
	M			doc/accelerate_kokkos.html
	M			doc/accelerate_kokkos.txt
	M			doc/balance.html
	M			doc/balance.txt
	A			doc/compute_saed.html
	A			doc/compute_saed.txt
	A			doc/compute_xrd.html
	A			doc/compute_xrd.txt
	M			doc/create_box.html
	M			doc/create_box.txt
	M			doc/fix_ave_histo.html
	M			doc/fix_ave_histo.txt
	M			doc/fix_balance.html
	M			doc/fix_balance.txt
	M			doc/fix_momentum.html
	A			doc/fix_saed_vtk.html
	A			doc/fix_saed_vtk.txt
	A			doc/info.html
	M			doc/info.txt
	M			doc/molecule.html
	M			doc/molecule.txt
	M			doc/pair_srp.html
	M			doc/special_bonds.html
	M			doc/variable.html
	M			doc/write_data.html
	M			src/RIGID/fix_rigid_small.cpp
	M			src/atom.cpp
	M			src/info.cpp
	M			src/molecule.cpp
	M			src/molecule.h
	M			src/version.h