Diffusion lammps 4b6667811efe

Merge branch 'master' into lammps-icms
4b6667811efe
Actions

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

Description

Merge branch 'master' into lammps-icms

Details

Committed

Axel Kohlmeyer <akohlmey@gmail.com>

Aug 7 2012, 22:31

Pushed

junge

Oct 6 2016, 16:49

Parents

rLAMMPS435a693fd8f3: With the creation of pppm/old, we no longer need PPPM::diffpr and we can change…
rLAMMPSba5280233111: Merge branch 'master' into lammps-icms

Branches

Unknown

Tags

Unknown

Event Timeline

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

Merged Changes

Commit	Author	Details	Committed
435a693fd8f3	pscrozi	With the creation of pppm/old, we no longer need PPPM::diffpr and we can change…	Aug 7 2012
fe659573e9fb	sjplimp	git-svn-id: svn://svn.icms.temple.edu/lammps-ro/trunk@8547 f3b2605a-c512-4ea7…	Aug 7 2012
ec122cad25d2	sjplimp	git-svn-id: svn://svn.icms.temple.edu/lammps-ro/trunk@8546 f3b2605a-c512-4ea7…	Aug 7 2012
a134b94633d1	sjplimp	git-svn-id: svn://svn.icms.temple.edu/lammps-ro/trunk@8545 f3b2605a-c512-4ea7…	Aug 7 2012
671c90bcca89	sjplimp	git-svn-id: svn://svn.icms.temple.edu/lammps-ro/trunk@8544 f3b2605a-c512-4ea7…	Aug 7 2012
df7994356a35	sjplimp	git-svn-id: svn://svn.icms.temple.edu/lammps-ro/trunk@8543 f3b2605a-c512-4ea7…	Aug 7 2012
76721f910196	sjplimp	git-svn-id: svn://svn.icms.temple.edu/lammps-ro/trunk@8542 f3b2605a-c512-4ea7…	Aug 7 2012
363124091497	sjplimp	git-svn-id: svn://svn.icms.temple.edu/lammps-ro/trunk@8539 f3b2605a-c512-4ea7…	Aug 7 2012
48b22abf0bef	sjplimp	git-svn-id: svn://svn.icms.temple.edu/lammps-ro/trunk@8538 f3b2605a-c512-4ea7…	Aug 7 2012
a4b5cb4dc923	sjplimp	git-svn-id: svn://svn.icms.temple.edu/lammps-ro/trunk@8537 f3b2605a-c512-4ea7…	Aug 7 2012
b3612647153c	sjplimp	git-svn-id: svn://svn.icms.temple.edu/lammps-ro/trunk@8536 f3b2605a-c512-4ea7…	Aug 7 2012
ac3572a0c901	sjplimp	git-svn-id: svn://svn.icms.temple.edu/lammps-ro/trunk@8534 f3b2605a-c512-4ea7…	Aug 6 2012
d6a122034164	sjplimp	git-svn-id: svn://svn.icms.temple.edu/lammps-ro/trunk@8533 f3b2605a-c512-4ea7…	Aug 6 2012
e4d3494ab2b1	sjplimp	git-svn-id: svn://svn.icms.temple.edu/lammps-ro/trunk@8532 f3b2605a-c512-4ea7…	Aug 6 2012
93181e05b01d	sjplimp	git-svn-id: svn://svn.icms.temple.edu/lammps-ro/trunk@8531 f3b2605a-c512-4ea7…	Aug 6 2012
9631345b05b0	sjplimp	git-svn-id: svn://svn.icms.temple.edu/lammps-ro/trunk@8530 f3b2605a-c512-4ea7…	Aug 6 2012
3f5513cc1ea5	sjplimp	git-svn-id: svn://svn.icms.temple.edu/lammps-ro/trunk@8529 f3b2605a-c512-4ea7…	Aug 6 2012

Changes (43)

				Path
	M			doc/Manual.html
	M			doc/Manual.txt
	M			doc/Section_accelerate.html
	M			doc/Section_accelerate.txt
	M			doc/Section_commands.html
	M			doc/Section_commands.txt
	M			doc/Section_packages.html
	M			doc/Section_packages.txt
	M			doc/compute.html
	M			doc/compute.txt
	P			doc/compute_erotate_sphere_atom.html Copied from doc/compute_ke_atom.html
	A			doc/compute_erotate_sphere_atom.txt
	M			doc/kspace_modify.html
	M			doc/kspace_modify.txt
	M			doc/kspace_style.html
	M			doc/kspace_style.txt
	M			src/ASPHERE/pair_gayberne.cpp
	M			src/ASPHERE/pair_resquared.cpp
	M			src/COLLOID/pair_colloid.cpp
	M			src/GPU/pppm_gpu.cpp
	M			src/GPU/pppm_gpu.h
	M			src/KSPACE/Install.sh
	P			src/KSPACE/pppm.cpp Copied to src/KSPACE/pppm_old.cpp
	P			src/KSPACE/pppm.h Copied to src/KSPACE/pppm_old.h
	M			src/KSPACE/pppm_cg.cpp
	M			src/KSPACE/pppm_cg.h
	P			src/KSPACE/pppm_old.cpp Copied from src/KSPACE/pppm.cpp
	P			src/KSPACE/pppm_old.h Copied from src/KSPACE/pppm.h
	M			src/KSPACE/pppm_tip4p.cpp
	M			src/KSPACE/pppm_tip4p.h
	M			src/PERI/pair_peri_pmb.cpp
	M			src/USER-CUDA/pppm_cuda.cpp
	M			src/USER-CUDA/pppm_cuda.h
	M			src/compute_erotate_sphere.cpp
	P			src/compute_erotate_sphere_atom.cpp Copied from src/compute_ke_atom.cpp
	P			src/compute_erotate_sphere_atom.h Copied from src/compute_ke_atom.h
	M			src/finish.cpp
	M			src/fix_nh.cpp
	M			src/kspace.h
	M			src/pair_beck.cpp
	M			src/pair_lj_smooth_linear.cpp
	M			src/pair_soft.cpp
	M			src/version.h