Merge remote branch 'lammps-ro/master' into lammps-icms
3cd3e2febd37
Actions

Authored by Axel Kohlmeyer <akohlmey@gmail.com> on Feb 13 2013, 13:56.

Description

Merge remote branch 'lammps-ro/master' into lammps-icms

Resolved Conflicts:
doc/Manual.txt
src/USER-OMP/pppm_cg_omp.cpp
src/USER-OMP/pppm_cg_omp.h
src/USER-OMP/pppm_omp.cpp
src/USER-OMP/pppm_omp.h
src/USER-OMP/pppm_tip4p_omp.cpp
src/kspace.h

Details

Committed

Axel Kohlmeyer <akohlmey@gmail.com>

Feb 13 2013, 13:56

Pushed

junge

Oct 6 2016, 16:49

Parents

rLAMMPS55cb9649a386: git-svn-id: svn://svn.icms.temple.edu/lammps-ro/trunk@9471 f3b2605a-c512-4ea7…
rLAMMPS321483a15abd: small optimization

Branches

Unknown

Tags

Unknown

Event Timeline

Axel Kohlmeyer <akohlmey@gmail.com> committed rLAMMPS3cd3e2febd37: Merge remote branch 'lammps-ro/master' into lammps-icms (authored by Axel Kohlmeyer <akohlmey@gmail.com>).Feb 13 2013, 13:56

Merged Changes

Commit	Author	Details	Committed
55cb9649a386	sjplimp	git-svn-id: svn://svn.icms.temple.edu/lammps-ro/trunk@9471 f3b2605a-c512-4ea7…	Feb 13 2013
6d707ca5ebdb	sjplimp	git-svn-id: svn://svn.icms.temple.edu/lammps-ro/trunk@9470 f3b2605a-c512-4ea7…	Feb 13 2013
529a4896106d	sjplimp	git-svn-id: svn://svn.icms.temple.edu/lammps-ro/trunk@9466 f3b2605a-c512-4ea7…	Feb 13 2013
b040b785e2d2	sjplimp	git-svn-id: svn://svn.icms.temple.edu/lammps-ro/trunk@9465 f3b2605a-c512-4ea7…	Feb 13 2013
52b9d7d9b5de	sjplimp	git-svn-id: svn://svn.icms.temple.edu/lammps-ro/trunk@9464 f3b2605a-c512-4ea7…	Feb 13 2013
e8e811435230	sjplimp	git-svn-id: svn://svn.icms.temple.edu/lammps-ro/trunk@9463 f3b2605a-c512-4ea7…	Feb 13 2013
4d6b9be28c00	sjplimp	git-svn-id: svn://svn.icms.temple.edu/lammps-ro/trunk@9462 f3b2605a-c512-4ea7…	Feb 13 2013
687db51a45b7	sjplimp	git-svn-id: svn://svn.icms.temple.edu/lammps-ro/trunk@9461 f3b2605a-c512-4ea7…	Feb 13 2013
13a59d2573f5	sjplimp	git-svn-id: svn://svn.icms.temple.edu/lammps-ro/trunk@9460 f3b2605a-c512-4ea7…	Feb 13 2013
c521201ea53d	sjplimp	git-svn-id: svn://svn.icms.temple.edu/lammps-ro/trunk@9459 f3b2605a-c512-4ea7…	Feb 13 2013
bcab6e829a67	sjplimp	git-svn-id: svn://svn.icms.temple.edu/lammps-ro/trunk@9458 f3b2605a-c512-4ea7…	Feb 13 2013
97a23ad84932	sjplimp	git-svn-id: svn://svn.icms.temple.edu/lammps-ro/trunk@9457 f3b2605a-c512-4ea7…	Feb 13 2013
9670e3d6eb7e	sjplimp	git-svn-id: svn://svn.icms.temple.edu/lammps-ro/trunk@9456 f3b2605a-c512-4ea7…	Feb 13 2013
5c635d47eb14	sjplimp	git-svn-id: svn://svn.icms.temple.edu/lammps-ro/trunk@9455 f3b2605a-c512-4ea7…	Feb 13 2013
ab6e341dd938	pscrozi	git-svn-id: svn://svn.icms.temple.edu/lammps-ro/trunk@9454 f3b2605a-c512-4ea7…	Feb 12 2013
817ed05528ed	pscrozi	git-svn-id: svn://svn.icms.temple.edu/lammps-ro/trunk@9453 f3b2605a-c512-4ea7…	Feb 12 2013
9028c18d9740	sjplimp	git-svn-id: svn://svn.icms.temple.edu/lammps-ro/trunk@9451 f3b2605a-c512-4ea7…	Feb 12 2013
0f5e42518fd4	sjplimp	git-svn-id: svn://svn.icms.temple.edu/lammps-ro/trunk@9450 f3b2605a-c512-4ea7…	Feb 12 2013
aae97983b888	sjplimp	git-svn-id: svn://svn.icms.temple.edu/lammps-ro/trunk@9449 f3b2605a-c512-4ea7…	Feb 12 2013
0fa04785e3ed	sjplimp	git-svn-id: svn://svn.icms.temple.edu/lammps-ro/trunk@9448 f3b2605a-c512-4ea7…	Feb 12 2013

Changes (46)

				Path
	M			doc/Manual.html
	M			doc/Manual.txt
	M			doc/Section_commands.html
	M			doc/Section_commands.txt
	M			doc/fix_rigid.html
	M			doc/fix_rigid.txt
	M			doc/kspace_modify.html
	M			doc/kspace_modify.txt
	M			src/ASPHERE/compute_temp_asphere.cpp
	M			src/ASPHERE/compute_temp_asphere.h
	M			src/RIGID/Install.sh
	M			src/RIGID/fix_rigid.cpp
	A			src/RIGID/fix_rigid_small.cpp
	P			src/RIGID/fix_rigid_small.h Copied from src/RIGID/fix_rigid.h
	M			src/USER-CUDA/compute_temp_cuda.cpp
	M			src/USER-CUDA/compute_temp_cuda.h
	M			src/USER-CUDA/compute_temp_partial_cuda.cpp
	M			src/USER-CUDA/compute_temp_partial_cuda.h
	M			src/USER-EFF/compute_temp_eff.cpp
	M			src/USER-EFF/compute_temp_eff.h
	M			src/USER-EFF/compute_temp_region_eff.cpp
	M			src/USER-EFF/compute_temp_region_eff.h
	M			src/USER-MISC/compute_temp_rotate.cpp
	M			src/USER-MISC/compute_temp_rotate.h
	M			src/compute.h
	M			src/compute_temp.cpp
	M			src/compute_temp.h
	M			src/compute_temp_com.cpp
	M			src/compute_temp_com.h
	M			src/compute_temp_deform.cpp
	M			src/compute_temp_deform.h
	M			src/compute_temp_partial.cpp
	M			src/compute_temp_partial.h
	M			src/compute_temp_profile.cpp
	M			src/compute_temp_profile.h
	M			src/compute_temp_ramp.cpp
	M			src/compute_temp_ramp.h
	M			src/compute_temp_region.cpp
	M			src/compute_temp_region.h
	M			src/compute_temp_sphere.cpp
	M			src/compute_temp_sphere.h
	M			src/fix_respa.h
	M			src/kspace.h
	M			src/modify.cpp
	M			src/velocity.cpp
	M			src/version.h