Diffusion lammps 96666c671269

Merge branch 'master' into lammps-icms
96666c671269
Actions

Authored by Axel Kohlmeyer <akohlmey@gmail.com> on May 18 2012, 16:10.

Description

Merge branch 'master' into lammps-icms

Resolved Conflicts:
src/change_box.cpp
src/pair_hybrid.cpp
src/read_data.cpp
tools/restart2data.cpp

Details

Committed

Axel Kohlmeyer <akohlmey@gmail.com>

May 18 2012, 16:10

Pushed

junge

Oct 6 2016, 16:49

Parents

rLAMMPS173c6e393da9: git-svn-id: svn://svn.icms.temple.edu/lammps-ro/trunk@8087 f3b2605a-c512-4ea7…
rLAMMPS645dab9540cf: move block to work around parser weakness

Branches

Unknown

Tags

Unknown

Event Timeline

Axel Kohlmeyer <akohlmey@gmail.com> committed rLAMMPS96666c671269: Merge branch 'master' into lammps-icms (authored by Axel Kohlmeyer <akohlmey@gmail.com>).May 18 2012, 16:10

Merged Changes

Commit	Author	Details	Committed
173c6e393da9	sjplimp	git-svn-id: svn://svn.icms.temple.edu/lammps-ro/trunk@8087 f3b2605a-c512-4ea7…	May 18 2012
f3ec23a22020	sjplimp	git-svn-id: svn://svn.icms.temple.edu/lammps-ro/trunk@8085 f3b2605a-c512-4ea7…	May 18 2012
a930905787b5	sjplimp	git-svn-id: svn://svn.icms.temple.edu/lammps-ro/trunk@8084 f3b2605a-c512-4ea7…	May 18 2012
2e1873a20b30	sjplimp	git-svn-id: svn://svn.icms.temple.edu/lammps-ro/trunk@8082 f3b2605a-c512-4ea7…	May 18 2012
522998cf90c9	sjplimp	git-svn-id: svn://svn.icms.temple.edu/lammps-ro/trunk@8081 f3b2605a-c512-4ea7…	May 18 2012
828dfd909d40	sjplimp	git-svn-id: svn://svn.icms.temple.edu/lammps-ro/trunk@8080 f3b2605a-c512-4ea7…	May 18 2012
393889548ebe	sjplimp	git-svn-id: svn://svn.icms.temple.edu/lammps-ro/trunk@8079 f3b2605a-c512-4ea7…	May 18 2012
ccf0f9a1ac1d	sjplimp	git-svn-id: svn://svn.icms.temple.edu/lammps-ro/trunk@8078 f3b2605a-c512-4ea7…	May 17 2012
2e841e344169	sjplimp	git-svn-id: svn://svn.icms.temple.edu/lammps-ro/trunk@8076 f3b2605a-c512-4ea7…	May 17 2012
a729b8d46f20	sjplimp	git-svn-id: svn://svn.icms.temple.edu/lammps-ro/trunk@8075 f3b2605a-c512-4ea7…	May 17 2012
967a143e7e0b	sjplimp	git-svn-id: svn://svn.icms.temple.edu/lammps-ro/trunk@8074 f3b2605a-c512-4ea7…	May 17 2012
3244bcbb9897	sjplimp	git-svn-id: svn://svn.icms.temple.edu/lammps-ro/trunk@8073 f3b2605a-c512-4ea7…	May 17 2012
bc4ad298fc24	sjplimp	git-svn-id: svn://svn.icms.temple.edu/lammps-ro/trunk@8072 f3b2605a-c512-4ea7…	May 17 2012
69452129e431	sjplimp	git-svn-id: svn://svn.icms.temple.edu/lammps-ro/trunk@8071 f3b2605a-c512-4ea7…	May 17 2012
56933a0bd14a	sjplimp	git-svn-id: svn://svn.icms.temple.edu/lammps-ro/trunk@8070 f3b2605a-c512-4ea7…	May 17 2012
0f3c9e1e3d2b	sjplimp	git-svn-id: svn://svn.icms.temple.edu/lammps-ro/trunk@8069 f3b2605a-c512-4ea7…	May 17 2012
84a7941c3eee	sjplimp	git-svn-id: svn://svn.icms.temple.edu/lammps-ro/trunk@8068 f3b2605a-c512-4ea7…	May 17 2012
09740d261b12	sjplimp	git-svn-id: svn://svn.icms.temple.edu/lammps-ro/trunk@8067 f3b2605a-c512-4ea7…	May 17 2012
8fb0508d38ca	sjplimp	git-svn-id: svn://svn.icms.temple.edu/lammps-ro/trunk@8066 f3b2605a-c512-4ea7…	May 17 2012
aca77bd76f47	sjplimp	git-svn-id: svn://svn.icms.temple.edu/lammps-ro/trunk@8065 f3b2605a-c512-4ea7…	May 17 2012

Changes (28)

				Path
	M			doc/compute_atom_molecule.html
	M			doc/compute_reduce.html
	M			doc/compute_slice.html
	M			doc/fix_ave_spatial.html
	M			doc/fix_nh.html
	M			doc/fix_nh.txt
	M			doc/fix_qeq_comb.html
	M			doc/fix_recenter.html
	M			doc/fix_recenter.txt
	M			doc/pair_coul.html
	M			doc/variable.html
	M			doc/variable.txt
	M			src/REPLICA/neb.cpp
	M			src/STUBS/mpi.c
	M			src/STUBS/mpi.h
	M			src/atom.cpp
	M			src/change_box.cpp
	M			src/compute_temp_sphere.cpp
	M			src/fix_nh.cpp
	M			src/fix_nh.h
	M			src/output.cpp
	M			src/pair.cpp
	M			src/pair_hybrid.cpp
	M			src/pair_hybrid.h
	M			src/read_data.cpp
	M			src/variable.cpp
	M			src/version.h
	M			tools/restart2data.cpp