Merge branch 'master' into lammps-icms
c6552844abcf
Actions

Authored by Axel Kohlmeyer <akohlmey@gmail.com> on Aug 25 2012, 22:21.

Description

Merge branch 'master' into lammps-icms

Committed

Axel Kohlmeyer <akohlmey@gmail.com>

Aug 25 2012, 22:21

Pushed

junge

Oct 6 2016, 16:49

Parents

Branches

Unknown

Tags

Unknown

Axel Kohlmeyer <akohlmey@gmail.com> committed rLAMMPSc6552844abcf: Merge branch 'master' into lammps-icms (authored by Axel Kohlmeyer <akohlmey@gmail.com>).Aug 25 2012, 22:21

Commit	Author	Details	Committed
feb096873e1e	pscrozi	Bug fix for nbuf_peratom.	Aug 24 2012
6fa2f9ed6ab6	sjplimp	git-svn-id: svn://svn.icms.temple.edu/lammps-ro/trunk@8712 f3b2605a-c512-4ea7…	Aug 24 2012
93e71a27d483	pscrozi	Splitting 1d and 3d FFT timings.	Aug 24 2012
f5ec88d740c9	pscrozi	Splitting 1d and 3d FFT timings.	Aug 24 2012
23692f067e37	pscrozi	Splitting 1d and 3d FFT timings.	Aug 24 2012
4ab573e40fe2	sjplimp	git-svn-id: svn://svn.icms.temple.edu/lammps-ro/trunk@8708 f3b2605a-c512-4ea7…	Aug 23 2012
e737cf3868b4	sjplimp	git-svn-id: svn://svn.icms.temple.edu/lammps-ro/trunk@8707 f3b2605a-c512-4ea7…	Aug 23 2012
25e966a8e487	sjplimp	git-svn-id: svn://svn.icms.temple.edu/lammps-ro/trunk@8706 f3b2605a-c512-4ea7…	Aug 23 2012
97a97ced95c8	sjplimp	git-svn-id: svn://svn.icms.temple.edu/lammps-ro/trunk@8705 f3b2605a-c512-4ea7…	Aug 23 2012
68af21a34a37	sjplimp	git-svn-id: svn://svn.icms.temple.edu/lammps-ro/trunk@8703 f3b2605a-c512-4ea7…	Aug 23 2012
690a72edc7a1	sjplimp	git-svn-id: svn://svn.icms.temple.edu/lammps-ro/trunk@8702 f3b2605a-c512-4ea7…	Aug 23 2012
81ec0e96e17c	sjplimp	git-svn-id: svn://svn.icms.temple.edu/lammps-ro/trunk@8701 f3b2605a-c512-4ea7…	Aug 23 2012
7ebff3faf6fd	sjplimp	git-svn-id: svn://svn.icms.temple.edu/lammps-ro/trunk@8700 f3b2605a-c512-4ea7…	Aug 23 2012
c81a8f1bc932	sjplimp	git-svn-id: svn://svn.icms.temple.edu/lammps-ro/trunk@8699 f3b2605a-c512-4ea7…	Aug 23 2012

		Path
M		doc/Section_packages.html
M		doc/Section_packages.txt
M		doc/fix_rigid.html
M		doc/fix_rigid.txt
D		lib/gpu/geryon/nvc_device.h
D		lib/gpu/geryon/nvc_macros.h
D		lib/gpu/geryon/nvc_texture.h
M		src/GRANULAR/pair_gran_hertz_history.cpp
M		src/GRANULAR/pair_gran_hooke.cpp
M		src/GRANULAR/pair_gran_hooke_history.cpp
M		src/GRANULAR/pair_gran_hooke_history.h
M		src/KSPACE/pppm.cpp
M		src/KSPACE/pppm.h
M		src/Makefile
A	(dir)	src/RIGID/
A		src/RIGID/Install.sh
V		src/{RIGID ← }/fix_rigid.cpp
V		src/{RIGID ← }/fix_rigid.h
V		src/{RIGID ← }/fix_rigid_nh.cpp
V		src/{RIGID ← }/fix_rigid_nh.h
V		src/{RIGID ← }/fix_rigid_nph.cpp
V		src/{RIGID ← }/fix_rigid_nph.h
V		src/{RIGID ← }/fix_rigid_npt.cpp
V		src/{RIGID ← }/fix_rigid_npt.h
V		src/{RIGID ← }/fix_rigid_nve.cpp
V		src/{RIGID ← }/fix_rigid_nve.h
V		src/{RIGID ← }/fix_rigid_nvt.cpp
V		src/{RIGID ← }/fix_rigid_nvt.h
M		src/USER-MISC/pair_edip.cpp
M		src/finish.cpp
M		src/fix_deform.cpp
M		src/fix_langevin.cpp
V		src/{ → RIGID}/fix_rigid.cpp
V		src/{ → RIGID}/fix_rigid.h
V		src/{ → RIGID}/fix_rigid_nh.cpp
V		src/{ → RIGID}/fix_rigid_nh.h
V		src/{ → RIGID}/fix_rigid_nph.cpp
V		src/{ → RIGID}/fix_rigid_nph.h
V		src/{ → RIGID}/fix_rigid_npt.cpp
V		src/{ → RIGID}/fix_rigid_npt.h
V		src/{ → RIGID}/fix_rigid_nve.cpp
V		src/{ → RIGID}/fix_rigid_nve.h
V		src/{ → RIGID}/fix_rigid_nvt.cpp
V		src/{ → RIGID}/fix_rigid_nvt.h
M		src/kspace.h
M		src/version.h