Diffusion lammps c622ccd69301

Merge branch 'master' into lammps-icms
c622ccd69301
Actions

Authored by Axel Kohlmeyer <akohlmey@gmail.com> on Aug 30 2012, 14:19.

Description

Merge branch 'master' into lammps-icms

Resolved Conflicts:
lib/cuda/Makefile.lammps

Details

Committed

Axel Kohlmeyer <akohlmey@gmail.com>

Aug 30 2012, 14:19

Pushed

junge

Oct 6 2016, 16:49

Parents

rLAMMPS3f3c69210f8d: git-svn-id: svn://svn.icms.temple.edu/lammps-ro/trunk@8733 f3b2605a-c512-4ea7…
rLAMMPSb3575fda8ce0: make granular OpenMP pair styles compatible with upstream

Branches

Unknown

Tags

Unknown

Event Timeline

Axel Kohlmeyer <akohlmey@gmail.com> committed rLAMMPSc622ccd69301: Merge branch 'master' into lammps-icms (authored by Axel Kohlmeyer <akohlmey@gmail.com>).Aug 30 2012, 14:19

Merged Changes

Commit	Author	Details	Committed
3f3c69210f8d	sjplimp	git-svn-id: svn://svn.icms.temple.edu/lammps-ro/trunk@8733 f3b2605a-c512-4ea7…	Aug 29 2012
249f5349f0ae	sjplimp	git-svn-id: svn://svn.icms.temple.edu/lammps-ro/trunk@8732 f3b2605a-c512-4ea7…	Aug 29 2012
ffcbbe98d460	sjplimp	git-svn-id: svn://svn.icms.temple.edu/lammps-ro/trunk@8731 f3b2605a-c512-4ea7…	Aug 29 2012
05830a7cf8cd	sjplimp	git-svn-id: svn://svn.icms.temple.edu/lammps-ro/trunk@8730 f3b2605a-c512-4ea7…	Aug 29 2012
1f8b89b0719c	sjplimp	git-svn-id: svn://svn.icms.temple.edu/lammps-ro/trunk@8729 f3b2605a-c512-4ea7…	Aug 29 2012
7c21f7a15879	sjplimp	git-svn-id: svn://svn.icms.temple.edu/lammps-ro/trunk@8728 f3b2605a-c512-4ea7…	Aug 28 2012
ce74a6e8a378	sjplimp	git-svn-id: svn://svn.icms.temple.edu/lammps-ro/trunk@8726 f3b2605a-c512-4ea7…	Aug 28 2012
8a97b39ea3ce	sjplimp	git-svn-id: svn://svn.icms.temple.edu/lammps-ro/trunk@8725 f3b2605a-c512-4ea7…	Aug 28 2012
664b3aff1d56	sjplimp	git-svn-id: svn://svn.icms.temple.edu/lammps-ro/trunk@8724 f3b2605a-c512-4ea7…	Aug 28 2012
dba019f3e4cd	sjplimp	git-svn-id: svn://svn.icms.temple.edu/lammps-ro/trunk@8723 f3b2605a-c512-4ea7…	Aug 28 2012
8972165b3adf	sjplimp	git-svn-id: svn://svn.icms.temple.edu/lammps-ro/trunk@8722 f3b2605a-c512-4ea7…	Aug 27 2012
a64ffc0be315	sjplimp	git-svn-id: svn://svn.icms.temple.edu/lammps-ro/trunk@8721 f3b2605a-c512-4ea7…	Aug 27 2012
d38ac55fb0f2	sjplimp	git-svn-id: svn://svn.icms.temple.edu/lammps-ro/trunk@8720 f3b2605a-c512-4ea7…	Aug 27 2012
2bd810fe8ff4	sjplimp	git-svn-id: svn://svn.icms.temple.edu/lammps-ro/trunk@8718 f3b2605a-c512-4ea7…	Aug 27 2012
22df32ca8e9b	sjplimp	git-svn-id: svn://svn.icms.temple.edu/lammps-ro/trunk@8717 f3b2605a-c512-4ea7…	Aug 27 2012
c3ddd1073e78	sjplimp	git-svn-id: svn://svn.icms.temple.edu/lammps-ro/trunk@8716 f3b2605a-c512-4ea7…	Aug 27 2012
2c5cb452e2d3	sjplimp	git-svn-id: svn://svn.icms.temple.edu/lammps-ro/trunk@8715 f3b2605a-c512-4ea7…	Aug 27 2012
d974674bc5f5	sjplimp	git-svn-id: svn://svn.icms.temple.edu/lammps-ro/trunk@8714 f3b2605a-c512-4ea7…	Aug 27 2012

Changes (45)

				Path
	M			bench/GPU/README
	M			bench/GPU/in.rhodo.cuda
	M			doc/fix_wall_gran.html
	M			doc/fix_wall_gran.txt
	M			doc/group.html
	M			doc/group.txt
	M			doc/variable.html
	M			doc/variable.txt
	M			src/MANYBODY/pair_lcbop.cpp
	M			src/RIGID/fix_rigid.cpp
	M			src/RIGID/fix_rigid.h
	M			src/USER-CUDA/cuda.cpp
	M			src/USER-CUDA/cuda.h
	M			src/USER-CUDA/domain_cuda.cpp
	M			src/USER-CUDA/fix_aveforce_cuda.cpp
	M			src/USER-CUDA/fix_aveforce_cuda.h
	M			src/USER-CUDA/fix_shake_cuda.cpp
	M			src/USER-CUDA/pair_eam_cuda.cpp
	M			src/USER-CUDA/pppm_cuda.cpp
	M			src/USER-CUDA/pppm_cuda.h
	M			src/USER-CUDA/verlet_cuda.cpp
	M			src/angle.cpp
	M			src/angle.h
	M			src/atom.cpp
	M			src/atom.h
	A			src/atom_masks.h
	M			src/bond.cpp
	M			src/bond.h
	M			src/compute.cpp
	M			src/compute.h
	M			src/dihedral.cpp
	M			src/dihedral.h
	M			src/domain.h
	M			src/fix.cpp
	M			src/fix.h
	M			src/group.cpp
	M			src/improper.cpp
	M			src/improper.h
	M			src/kspace.cpp
	M			src/kspace.h
	M			src/pair.cpp
	M			src/pair.h
	M			src/variable.cpp
	M			src/variable.h
	M			src/version.h