Merge branch 'master' into load-balance
83bd0b9d59dd
Actions

Authored by Axel Kohlmeyer <akohlmey@gmail.com> on Oct 26 2011, 03:46.

Description

Merge branch 'master' into load-balance

Details

Committed

Axel Kohlmeyer <akohlmey@gmail.com>

Oct 26 2011, 03:46

Pushed

junge

Oct 6 2016, 16:49

Parents

rLAMMPS245d6ac30c61: support dimensions with just one processor remove useless arguments from class…
rLAMMPSc6bbdcfbf2af: git-svn-id: svn://svn.icms.temple.edu/lammps-ro/trunk@7184 f3b2605a-c512-4ea7…

Branches

Unknown

Tags

Unknown

Event Timeline

Axel Kohlmeyer <akohlmey@gmail.com> committed rLAMMPS83bd0b9d59dd: Merge branch 'master' into load-balance (authored by Axel Kohlmeyer <akohlmey@gmail.com>).Oct 26 2011, 03:46

Merged Changes

Commit	Author	Details	Committed
c6bbdcfbf2af	sjplimp	git-svn-id: svn://svn.icms.temple.edu/lammps-ro/trunk@7184 f3b2605a-c512-4ea7…	Oct 24 2011
11806a92a1df	sjplimp	git-svn-id: svn://svn.icms.temple.edu/lammps-ro/trunk@7182 f3b2605a-c512-4ea7…	Oct 24 2011
860bca7d5e5d	sjplimp	git-svn-id: svn://svn.icms.temple.edu/lammps-ro/trunk@7181 f3b2605a-c512-4ea7…	Oct 24 2011
f3018d53bb32	sjplimp	git-svn-id: svn://svn.icms.temple.edu/lammps-ro/trunk@7180 f3b2605a-c512-4ea7…	Oct 24 2011
5a03365db1f1	sjplimp	git-svn-id: svn://svn.icms.temple.edu/lammps-ro/trunk@7179 f3b2605a-c512-4ea7…	Oct 24 2011
326c40feaa41	sjplimp	git-svn-id: svn://svn.icms.temple.edu/lammps-ro/trunk@7178 f3b2605a-c512-4ea7…	Oct 24 2011
cb5b707c7408	sjplimp	git-svn-id: svn://svn.icms.temple.edu/lammps-ro/trunk@7177 f3b2605a-c512-4ea7…	Oct 24 2011

Changes (114)
Show All Changes

Very Large Commit

This commit is very large. Load each file individually.

				Path
	M			doc/Section_commands.html
	M			doc/Section_commands.txt
	M			doc/fix.html
	M			doc/fix.txt
	A			doc/fix_nve_asphere_noforce.html
	A			doc/fix_nve_asphere_noforce.txt
	M			doc/fix_wall.html
	M			doc/fix_wall.txt
	M			doc/fix_wall_reflect.txt
	M			doc/pair_coeff.html
	M			doc/pair_coeff.txt
	D			doc/pair_lubricate.html
	D			doc/pair_lubricate.txt
	M			doc/pair_style.html
	M			doc/pair_style.txt
	M			lib/cuda/atom_vec_cuda.cu
	M			lib/cuda/comm_cuda.cu
	M			lib/cuda/compute_temp_cuda.cu
	M			lib/cuda/compute_temp_cuda_kernel.cu
	M			lib/cuda/compute_temp_partial_cuda.cu
	M			lib/cuda/compute_temp_partial_cuda_kernel.cu
	M			lib/cuda/cuda_pair.cu
	M			lib/cuda/domain_kernel.cu
	M			lib/cuda/pair_eam_cuda.cu
	M			src/ASPHERE/Install.sh
	P			src/ASPHERE/fix_nve_asphere.cpp Copied to src/ASPHERE/fix_nve_asphere_noforce.cpp
	P			src/ASPHERE/fix_nve_asphere_noforce.cpp Copied from src/ASPHERE/fix_nve_asphere.cpp
	P			src/ASPHERE/fix_nve_asphere_noforce.h Copied from src/fix_nve_noforce.h
	M			src/ASPHERE/pair_line_lj.cpp
	M			src/ASPHERE/pair_line_lj.h
	M			src/ASPHERE/pair_resquared.cpp
	M			src/ASPHERE/pair_tri_lj.cpp
	M			src/ASPHERE/pair_tri_lj.h
	M			src/CLASS2/angle_class2.h
	M			src/CLASS2/bond_class2.h
	M			src/CLASS2/improper_class2.h
	M			src/COLLOID/Install.sh
	D			src/COLLOID/pair_lubricate.cpp
	D			src/COLLOID/pair_lubricate.h
	M			src/GPU/fix_gpu.cpp
	M			src/GRANULAR/fix_pour.cpp
	M			src/GRANULAR/fix_wall_gran.h
	M			src/KSPACE/ewald.cpp
	M			src/KSPACE/ewald.h
	M			src/KSPACE/pair_lj_cut_coul_long_tip4p.cpp
	M			src/KSPACE/pppm.cpp
	M			src/KSPACE/pppm_cg.cpp
	M			src/MANYBODY/pair_adp.cpp
	M			src/MOLECULE/angle_charmm.h
	M			src/MOLECULE/angle_cosine.h
	M			src/MOLECULE/angle_cosine_delta.h
	M			src/MOLECULE/angle_cosine_periodic.h
	M			src/MOLECULE/angle_harmonic.h
	M			src/MOLECULE/angle_table.h
	M			src/MOLECULE/bond_fene.h
	M			src/MOLECULE/bond_fene_expand.h
	M			src/MOLECULE/bond_harmonic.h
	M			src/MOLECULE/bond_morse.h
	M			src/MOLECULE/bond_nonlinear.h
	M			src/MOLECULE/bond_quartic.h
	M			src/MOLECULE/bond_table.h
	M			src/MOLECULE/improper_cvff.h
	M			src/MOLECULE/improper_harmonic.h
	M			src/MOLECULE/improper_umbrella.h
	M			src/OPT/pair_lj_cut_coul_long_tip4p_opt.cpp
	M			src/SHOCK/fix_wall_piston.cpp
	M			src/USER-CUDA/atom_vec_atomic_cuda.cpp
	M			src/USER-CUDA/cuda.cpp
	M			src/USER-CUDA/cuda_neigh_list.cpp
	M			src/USER-CUDA/neigh_full_cuda.cpp
	M			src/USER-CUDA/verlet_cuda.cpp
	M			src/USER-MISC/angle_cosine_shift.h
	M			src/USER-MISC/angle_cosine_shift_exp.cpp
	M			src/USER-MISC/angle_cosine_shift_exp.h
	M			src/USER-MISC/bond_harmonic_shift.h
	M			src/USER-MISC/bond_harmonic_shift_cut.h
	M			src/angle.cpp
	M			src/angle.h
	M			src/atom_vec_line.cpp
	M			src/atom_vec_tri.cpp
	M			src/bond.cpp
	M			src/bond.h
	M			src/dihedral.cpp
	M			src/domain.cpp
	M			src/domain.h
	P			src/fix_nve_noforce.h Copied to src/ASPHERE/fix_nve_asphere_noforce.h
	M			src/fix_nve_sphere.cpp
	M			src/fix_nve_sphere.h
	M			src/fix_wall.cpp
	M			src/fix_wall.h
	M			src/force.cpp
	M			src/force.h
	M			src/improper.cpp
	M			src/improper.h
	M			src/input.cpp
	M			src/integrate.cpp
	M			src/integrate.h
	M			src/kspace.h
	M			src/math_const.h
	M			src/min.cpp
	M			src/min.h
	M			src/neigh_full.cpp
	M			src/neigh_list.cpp
	M			src/neigh_request.cpp
	M			src/neigh_request.h
	M			src/neighbor.cpp
	M			src/neighbor.h
	M			src/pair.cpp
	M			src/pair.h
	M			src/respa.cpp
	M			src/thermo.h
	M			src/verlet.cpp
	M			src/version.h
	M			tools/restart2data.cpp