Diffusion lammps a3603ca40fca

Merge remote-tracking branch 'lammps-ro/master' into lammps-icms
a3603ca40fca
Actions

Authored by Axel Kohlmeyer <akohlmey@gmail.com> on Mar 16 2013, 10:18.

Description

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

Resolved Conflicts:
doc/Manual.txt
src/USER-OMP/msm_omp.h

Details

Committed

Axel Kohlmeyer <akohlmey@gmail.com>

Mar 16 2013, 10:18

Pushed

junge

Oct 6 2016, 16:49

Parents

rLAMMPS0a97cb8e9a6a: git-svn-id: svn://svn.icms.temple.edu/lammps-ro/trunk@9694 f3b2605a-c512-4ea7…
rLAMMPS1bf81d24a45a: Merge remote-tracking branch 'lammps-ro/master' into lammps-icms

Branches

Unknown

Tags

Unknown

Event Timeline

Axel Kohlmeyer <akohlmey@gmail.com> committed rLAMMPSa3603ca40fca: Merge remote-tracking branch 'lammps-ro/master' into lammps-icms (authored by Axel Kohlmeyer <akohlmey@gmail.com>).Mar 16 2013, 10:18

Merged Changes

Commit	Author	Details	Committed
0a97cb8e9a6a	pscrozi	git-svn-id: svn://svn.icms.temple.edu/lammps-ro/trunk@9694 f3b2605a-c512-4ea7…	Mar 15 2013
505a0dd4f479	sjplimp	git-svn-id: svn://svn.icms.temple.edu/lammps-ro/trunk@9691 f3b2605a-c512-4ea7…	Mar 14 2013
32f9bf830620	sjplimp	git-svn-id: svn://svn.icms.temple.edu/lammps-ro/trunk@9690 f3b2605a-c512-4ea7…	Mar 14 2013
6b884058df86	sjplimp	git-svn-id: svn://svn.icms.temple.edu/lammps-ro/trunk@9689 f3b2605a-c512-4ea7…	Mar 14 2013
28480c5221d5	sjplimp	git-svn-id: svn://svn.icms.temple.edu/lammps-ro/trunk@9688 f3b2605a-c512-4ea7…	Mar 14 2013
040cedbe5aa1	sjplimp	git-svn-id: svn://svn.icms.temple.edu/lammps-ro/trunk@9687 f3b2605a-c512-4ea7…	Mar 14 2013
eeecd6980262	sjplimp	git-svn-id: svn://svn.icms.temple.edu/lammps-ro/trunk@9680 f3b2605a-c512-4ea7…	Mar 14 2013
788b657922e1	sjplimp	git-svn-id: svn://svn.icms.temple.edu/lammps-ro/trunk@9663 f3b2605a-c512-4ea7…	Mar 13 2013
ba0c0a959c8e	sjplimp	git-svn-id: svn://svn.icms.temple.edu/lammps-ro/trunk@9662 f3b2605a-c512-4ea7…	Mar 13 2013
a200f0ae3814	sjplimp	git-svn-id: svn://svn.icms.temple.edu/lammps-ro/trunk@9661 f3b2605a-c512-4ea7…	Mar 13 2013
b78c4aa84167	sjplimp	git-svn-id: svn://svn.icms.temple.edu/lammps-ro/trunk@9660 f3b2605a-c512-4ea7…	Mar 13 2013
a58779babf62	sjplimp	git-svn-id: svn://svn.icms.temple.edu/lammps-ro/trunk@9659 f3b2605a-c512-4ea7…	Mar 13 2013
0cd14bfb847a	sjplimp	git-svn-id: svn://svn.icms.temple.edu/lammps-ro/trunk@9658 f3b2605a-c512-4ea7…	Mar 13 2013
9897d3854216	sjplimp	git-svn-id: svn://svn.icms.temple.edu/lammps-ro/trunk@9657 f3b2605a-c512-4ea7…	Mar 13 2013
7fbf90ea90b9	sjplimp	git-svn-id: svn://svn.icms.temple.edu/lammps-ro/trunk@9656 f3b2605a-c512-4ea7…	Mar 13 2013

Changes (23)

				Path
	M			doc/Manual.html
	M			doc/Manual.txt
	M			doc/Section_howto.html
	M			doc/Section_howto.txt
	M			doc/compute_temp_asphere.html
	M			doc/compute_temp_asphere.txt
	M			doc/pair_buck_long.html
	M			doc/pair_buck_long.txt
	M			doc/pair_lj.html
	M			doc/pair_lj.txt
	M			src/KSPACE/pair_buck_long_coul_long.cpp
	P			src/KSPACE/pair_buck_long_coul_long.h Copied to src/USER-OMP/pair_buck_long_coul_long_omp.h
	M			src/KSPACE/pppm_disp.cpp
	M			src/MC/fix_gcmc.cpp
	M			src/MOLECULE/pair_lj_cut_tip4p_cut.cpp
	M			src/USER-OMP/msm_omp.h
	P			src/USER-OMP/pair_buck_long_coul_long_omp.cpp Copied from src/USER-OMP/pair_lj_long_coul_long_omp.cpp
	P			src/USER-OMP/pair_buck_long_coul_long_omp.h Copied from src/KSPACE/pair_buck_long_coul_long.h
	M			src/USER-OMP/pppm_disp_omp.cpp
	M			src/pair_dpd_tstat.cpp
	M			src/pair_lj_cut_coul_cut.cpp
	M			src/version.h
	M			tools/restart2data.cpp