Merge remote branch 'lammps-ro/master' into lammps-icms
1466a253d1d6
Actions

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

Description

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

Resolved Conflicts:
doc/Manual.txt
src/USER-OMP/pair_lj_cut_tip4p_long_omp.cpp
src/USER-OMP/pair_lj_cut_tip4p_long_omp.h
src/modify.cpp

Details

Committed

Axel Kohlmeyer <akohlmey@gmail.com>

Feb 15 2013, 13:43

Pushed

junge

Oct 6 2016, 16:49

Parents

rLAMMPS4a8e4d535248: git-svn-id: svn://svn.icms.temple.edu/lammps-ro/trunk@9508 f3b2605a-c512-4ea7…
rLAMMPSd08b26b38802: fix small bugs. fix rigid/small/omp now works for buckyballs

Branches

Unknown

Tags

Unknown

Event Timeline

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

Merged Changes

Commit	Author	Details	Committed
4a8e4d535248	sjplimp	git-svn-id: svn://svn.icms.temple.edu/lammps-ro/trunk@9508 f3b2605a-c512-4ea7…	Feb 15 2013
1c12b60762eb	sjplimp	git-svn-id: svn://svn.icms.temple.edu/lammps-ro/trunk@9507 f3b2605a-c512-4ea7…	Feb 15 2013
33e822068106	sjplimp	git-svn-id: svn://svn.icms.temple.edu/lammps-ro/trunk@9506 f3b2605a-c512-4ea7…	Feb 15 2013
f732004e85ea	sjplimp	git-svn-id: svn://svn.icms.temple.edu/lammps-ro/trunk@9505 f3b2605a-c512-4ea7…	Feb 15 2013
ac05339d9997	sjplimp	git-svn-id: svn://svn.icms.temple.edu/lammps-ro/trunk@9503 f3b2605a-c512-4ea7…	Feb 15 2013
ade09a65d49c	sjplimp	git-svn-id: svn://svn.icms.temple.edu/lammps-ro/trunk@9502 f3b2605a-c512-4ea7…	Feb 15 2013
f1e8df1041c0	sjplimp	git-svn-id: svn://svn.icms.temple.edu/lammps-ro/trunk@9501 f3b2605a-c512-4ea7…	Feb 15 2013
fa5eb19f26f9	sjplimp	git-svn-id: svn://svn.icms.temple.edu/lammps-ro/trunk@9500 f3b2605a-c512-4ea7…	Feb 15 2013
24bb33b94d4d	sjplimp	git-svn-id: svn://svn.icms.temple.edu/lammps-ro/trunk@9499 f3b2605a-c512-4ea7…	Feb 15 2013
614d5987b255	sjplimp	git-svn-id: svn://svn.icms.temple.edu/lammps-ro/trunk@9498 f3b2605a-c512-4ea7…	Feb 14 2013
ef1541ad5b50	sjplimp	git-svn-id: svn://svn.icms.temple.edu/lammps-ro/trunk@9497 f3b2605a-c512-4ea7…	Feb 14 2013
9c35414f9a3b	sjplimp	git-svn-id: svn://svn.icms.temple.edu/lammps-ro/trunk@9495 f3b2605a-c512-4ea7…	Feb 14 2013
ceaaa3b48ba3	sjplimp	git-svn-id: svn://svn.icms.temple.edu/lammps-ro/trunk@9494 f3b2605a-c512-4ea7…	Feb 14 2013
3029c68fb884	sjplimp	git-svn-id: svn://svn.icms.temple.edu/lammps-ro/trunk@9492 f3b2605a-c512-4ea7…	Feb 14 2013
18299e4654b5	sjplimp	git-svn-id: svn://svn.icms.temple.edu/lammps-ro/trunk@9491 f3b2605a-c512-4ea7…	Feb 14 2013
fe1a32fa1183	sjplimp	git-svn-id: svn://svn.icms.temple.edu/lammps-ro/trunk@9490 f3b2605a-c512-4ea7…	Feb 14 2013
812118deff28	sjplimp	git-svn-id: svn://svn.icms.temple.edu/lammps-ro/trunk@9489 f3b2605a-c512-4ea7…	Feb 14 2013
90934f2b3932	sjplimp	git-svn-id: svn://svn.icms.temple.edu/lammps-ro/trunk@9484 f3b2605a-c512-4ea7…	Feb 14 2013
d0cfa228b081	sjplimp	git-svn-id: svn://svn.icms.temple.edu/lammps-ro/trunk@9482 f3b2605a-c512-4ea7…	Feb 14 2013
3d4a33e7fe80	sjplimp	git-svn-id: svn://svn.icms.temple.edu/lammps-ro/trunk@9481 f3b2605a-c512-4ea7…	Feb 14 2013
180c73261985	sjplimp	git-svn-id: svn://svn.icms.temple.edu/lammps-ro/trunk@9480 f3b2605a-c512-4ea7…	Feb 14 2013
8f94aa801084	sjplimp	git-svn-id: svn://svn.icms.temple.edu/lammps-ro/trunk@9479 f3b2605a-c512-4ea7…	Feb 14 2013
41801fa762fa	sjplimp	git-svn-id: svn://svn.icms.temple.edu/lammps-ro/trunk@9478 f3b2605a-c512-4ea7…	Feb 14 2013

Changes (26)

				Path
	M			doc/Manual.html
	M			doc/Manual.txt
	M			doc/compute_stress_atom.html
	M			doc/compute_stress_atom.txt
	M			doc/compute_voronoi_atom.html
	M			doc/compute_voronoi_atom.txt
	M			src/KSPACE/pppm_disp.cpp
	M			src/KSPACE/pppm_disp_tip4p.cpp
	M			src/RIGID/fix_rigid_small.cpp
	M			src/RIGID/fix_rigid_small.h
	M			src/USER-CUDA/atom_vec_angle_cuda.cpp
	M			src/USER-CUDA/atom_vec_atomic_cuda.cpp
	M			src/USER-CUDA/atom_vec_charge_cuda.cpp
	M			src/USER-CUDA/atom_vec_full_cuda.cpp
	M			src/USER-CUDA/atom_vec_full_cuda.h
	M			src/USER-OMP/pair_lj_cut_tip4p_long_omp.cpp
	M			src/USER-OMP/thr_data.cpp
	M			src/USER-OMP/thr_data.h
	M			src/VORONOI/compute_voronoi_atom.cpp
	M			src/fix_ave_histo.cpp
	M			src/modify.cpp
	M			src/neighbor.cpp
	M			src/variable.cpp
	M			src/variable.h
	M			src/version.h
	M			tools/restart2data.cpp