Diffusion lammps ac12efb94a97

Merge branch 'lammps-icms' into imd-reorder
ac12efb94a97
Actions

Authored by Axel Kohlmeyer <akohlmey@gmail.com> on Aug 4 2010, 12:45.

Description

Merge branch 'lammps-icms' into imd-reorder

Details

Committed

Axel Kohlmeyer <akohlmey@gmail.com>

Aug 4 2010, 12:45

Pushed

junge

Oct 6 2016, 16:49

Parents

rLAMMPS569dabdbf642: Merge branch 'master' into lammps-icms
rLAMMPS3a7aa1b172c1: update comments on future code.

Branches

Unknown

Tags

Unknown

Event Timeline

Axel Kohlmeyer <akohlmey@gmail.com> committed rLAMMPSac12efb94a97: Merge branch 'lammps-icms' into imd-reorder (authored by Axel Kohlmeyer <akohlmey@gmail.com>).Aug 4 2010, 12:45

Merged Changes

Commit	Author	Details	Committed
569dabdbf642	Axel Kohlmeyer	Merge branch 'master' into lammps-icms	Aug 4 2010
826caf694bad	sjplimp	git-svn-id: svn://svn.icms.temple.edu/lammps-ro/trunk@4431 f3b2605a-c512-4ea7…	Aug 4 2010
124653f92970	sjplimp	git-svn-id: svn://svn.icms.temple.edu/lammps-ro/trunk@4430 f3b2605a-c512-4ea7…	Aug 4 2010
e2179be38dc3	sjplimp	git-svn-id: svn://svn.icms.temple.edu/lammps-ro/trunk@4429 f3b2605a-c512-4ea7…	Aug 4 2010
2ef708d91e84	sjplimp	git-svn-id: svn://svn.icms.temple.edu/lammps-ro/trunk@4428 f3b2605a-c512-4ea7…	Aug 4 2010
02a6d3b155ee	sjplimp	git-svn-id: svn://svn.icms.temple.edu/lammps-ro/trunk@4426 f3b2605a-c512-4ea7…	Aug 3 2010
8dbbd76a565a	sjplimp	git-svn-id: svn://svn.icms.temple.edu/lammps-ro/trunk@4425 f3b2605a-c512-4ea7…	Aug 3 2010
6194e8cb1e09	sjplimp	git-svn-id: svn://svn.icms.temple.edu/lammps-ro/trunk@4424 f3b2605a-c512-4ea7…	Aug 3 2010
64cb990e79ff	Axel Kohlmeyer	OpenMP bugfix from Sam Bateman for granular media.	Aug 3 2010
6e84566b3be7	Axel Kohlmeyer	Merge branch 'master' into lammps-icms	Aug 3 2010
709c6418d7a8	Axel Kohlmeyer	mirror bug fix from upstream.	Aug 3 2010
6a3678c30fbd	sjplimp	git-svn-id: svn://svn.icms.temple.edu/lammps-ro/trunk@4422 f3b2605a-c512-4ea7…	Aug 3 2010
39a549128cc7	sjplimp	git-svn-id: svn://svn.icms.temple.edu/lammps-ro/trunk@4421 f3b2605a-c512-4ea7…	Aug 3 2010
582bc3e396e0	sjplimp	git-svn-id: svn://svn.icms.temple.edu/lammps-ro/trunk@4419 f3b2605a-c512-4ea7…	Aug 3 2010
f1166c6276c0	sjplimp	git-svn-id: svn://svn.icms.temple.edu/lammps-ro/trunk@4418 f3b2605a-c512-4ea7…	Aug 3 2010

Changes (15)

				Path
	M			doc/delete_atoms.html
	M			doc/delete_atoms.txt
	M			doc/fix_viscous.html
	M			doc/fix_viscous.txt
	M			src/GRANULAR/atom_vec_granular.cpp
	M			src/USER-OPENMP/pair_dpd_tstat_omp.cpp
	M			src/delete_atoms.cpp
	M			src/delete_atoms.h
	M			src/delete_bonds.cpp
	M			src/fix_ave_histo.cpp
	M			src/integrate.cpp
	M			src/min.cpp
	M			src/min.h
	M			src/pair_dpd_tstat.cpp
	M			src/version.h