Diffusion lammps a350abf66686

Merge branch 'lammps-icms' of bitbucket.org:akohlmey/lammps-icms into lammps…
a350abf66686
Actions

Authored by Axel Kohlmeyer <akohlmey@gmail.com> on Apr 12 2014, 18:40.

Description

Merge branch 'lammps-icms' of bitbucket.org:akohlmey/lammps-icms into lammps-icms

Resolved Conflicts:
doc/fix_bond_create.txt

Details

Committed

Axel Kohlmeyer <akohlmey@gmail.com>

Apr 12 2014, 18:40

Pushed

junge

Oct 6 2016, 16:49

Parents

rLAMMPSc70a00290fb6: Merge branch 'lammps-icms' of bitbucket.org:akohlmey/lammps-icms into lammps…
rLAMMPS9711a9e7ab84: correct documentation to be consistent with read_data

Branches

Unknown

Tags

Unknown

Event Timeline

Axel Kohlmeyer <akohlmey@gmail.com> committed rLAMMPSa350abf66686: Merge branch 'lammps-icms' of bitbucket.org:akohlmey/lammps-icms into lammps… (authored by Axel Kohlmeyer <akohlmey@gmail.com>).Apr 12 2014, 18:40

Merged Changes

Commit	Author	Details	Committed
c70a00290fb6	Axel Kohlmeyer	Merge branch 'lammps-icms' of bitbucket.org:akohlmey/lammps-icms into lammps…	Apr 12 2014
323e3075c413	Axel Kohlmeyer	remove even more unused variables and have consistent initialization	Apr 12 2014
62d18ba4c0b5	Axel Kohlmeyer	remove even more unused variables and have consistent initialization	Apr 12 2014
c6992e85030a	Axel Kohlmeyer	Merge remote branch 'lammps-ro/master' into lammps-icms	Apr 12 2014
5a26ea8238c2	sjplimp	git-svn-id: svn://svn.icms.temple.edu/lammps-ro/trunk@11784 f3b2605a-c512-4ea7…	Apr 12 2014
608c01bb8de1	sjplimp	git-svn-id: svn://svn.icms.temple.edu/lammps-ro/trunk@11783 f3b2605a-c512-4ea7…	Apr 12 2014
a939f8aab733	sjplimp	git-svn-id: svn://svn.icms.temple.edu/lammps-ro/trunk@11782 f3b2605a-c512-4ea7…	Apr 12 2014
631aa15a321b	sjplimp	git-svn-id: svn://svn.icms.temple.edu/lammps-ro/trunk@11781 f3b2605a-c512-4ea7…	Apr 12 2014
8871abb708f5	sjplimp	git-svn-id: svn://svn.icms.temple.edu/lammps-ro/trunk@11780 f3b2605a-c512-4ea7…	Apr 11 2014
d4518d2fd149	sjplimp	git-svn-id: svn://svn.icms.temple.edu/lammps-ro/trunk@11779 f3b2605a-c512-4ea7…	Apr 11 2014
09168613150e	sjplimp	git-svn-id: svn://svn.icms.temple.edu/lammps-ro/trunk@11777 f3b2605a-c512-4ea7…	Apr 11 2014
d45cca6714a1	sjplimp	git-svn-id: svn://svn.icms.temple.edu/lammps-ro/trunk@11776 f3b2605a-c512-4ea7…	Apr 11 2014
1b6af8196fc1	sjplimp	git-svn-id: svn://svn.icms.temple.edu/lammps-ro/trunk@11775 f3b2605a-c512-4ea7…	Apr 11 2014
9065c2c61291	sjplimp	git-svn-id: svn://svn.icms.temple.edu/lammps-ro/trunk@11774 f3b2605a-c512-4ea7…	Apr 11 2014
58336dca9a27	sjplimp	git-svn-id: svn://svn.icms.temple.edu/lammps-ro/trunk@11773 f3b2605a-c512-4ea7…	Apr 11 2014

Changes (47)

				Path
	M			doc/Manual.html
	M			doc/Manual.txt
	M			doc/fix_bond_break.html
	M			doc/fix_bond_break.txt
	M			doc/fix_bond_create.html
	M			doc/fix_bond_create.txt
	M			doc/thermo_style.html
	M			doc/thermo_style.txt
	M			src/ASPHERE/fix_nve_line.cpp
	M			src/ASPHERE/fix_nve_tri.cpp
	M			src/BODY/body_nparticle.cpp
	M			src/BODY/compute_body_local.cpp
	M			src/KSPACE/ewald_disp.cpp
	M			src/MC/fix_bond_break.cpp
	M			src/MC/fix_bond_break.h
	M			src/MC/fix_gcmc.cpp
	M			src/MISC/fix_gld.cpp
	M			src/MOLECULE/angle_table.cpp
	M			src/MOLECULE/bond_fene.cpp
	M			src/MOLECULE/bond_fene_expand.cpp
	M			src/MOLECULE/bond_quartic.cpp
	M			src/MPIIO/dump_atom_mpiio.cpp
	M			src/MPIIO/dump_custom_mpiio.cpp
	M			src/MPIIO/dump_xyz_mpiio.cpp
	M			src/USER-CG-CMM/angle_sdk.cpp
	M			src/USER-LB/fix_lb_fluid.cpp
	M			src/USER-LB/fix_lb_pc.cpp
	M			src/USER-LB/fix_lb_rigid_pc_sphere.cpp
	M			src/USER-MISC/angle_quartic.cpp
	M			src/USER-MISC/dihedral_cosine_shift_exp.cpp
	M			src/USER-MISC/dihedral_fourier.cpp
	M			src/USER-MISC/dihedral_table.cpp
	M			src/USER-OMP/dihedral_fourier_omp.cpp
	M			src/USER-OMP/dihedral_table_omp.cpp
	M			src/USER-OMP/pair_gayberne_omp.cpp
	M			src/USER-OMP/pair_nb3b_harmonic_omp.cpp
	M			src/VORONOI/compute_voronoi_atom.cpp
	M			src/balance.cpp
	M			src/comm.cpp
	M			src/comm.h
	M			src/fix_property_atom.cpp
	M			src/force.cpp
	M			src/force.h
	M			src/neighbor.cpp
	M			src/thermo.cpp
	M			src/thermo.h
	M			src/version.h