Diffusion lammps 7f258bf917b0

Merge remote branch 'lammps-ro/master' into lammps-icms
7f258bf917b0
Actions

Authored by Axel Kohlmeyer <akohlmey@gmail.com> on Mar 7 2013, 13:30.

Description

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

Resolved Conflicts:
src/KSPACE/pair_lj_long_coul_long.cpp
src/USER-OMP/respa_omp.cpp

Details

Committed

Axel Kohlmeyer <akohlmey@gmail.com>

Mar 7 2013, 13:30

Pushed

junge

Oct 6 2016, 16:49

Parents

rLAMMPSd296cb9eb106: git-svn-id: svn://svn.icms.temple.edu/lammps-ro/trunk@9598 f3b2605a-c512-4ea7…
rLAMMPS6a7392d497f1: Merge remote branch 'lammps-ro/master' into lammps-icms

Branches

Unknown

Tags

Unknown

Event Timeline

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

Merged Changes

Commit	Author	Details	Committed
d296cb9eb106	pscrozi	git-svn-id: svn://svn.icms.temple.edu/lammps-ro/trunk@9598 f3b2605a-c512-4ea7…	Mar 6 2013
ed72c6c5ae87	pscrozi	Optimizations to kspace_style MSM, including improving the single-core…	Mar 6 2013
a3d29c1665c5	pscrozi	git-svn-id: svn://svn.icms.temple.edu/lammps-ro/trunk@9596 f3b2605a-c512-4ea7…	Mar 6 2013
70fbc16e7da8	sjplimp	git-svn-id: svn://svn.icms.temple.edu/lammps-ro/trunk@9595 f3b2605a-c512-4ea7…	Mar 6 2013
a5e982730c28	sjplimp	git-svn-id: svn://svn.icms.temple.edu/lammps-ro/trunk@9594 f3b2605a-c512-4ea7…	Mar 6 2013
e2736ada2cb4	sjplimp	git-svn-id: svn://svn.icms.temple.edu/lammps-ro/trunk@9593 f3b2605a-c512-4ea7…	Mar 6 2013
2d00a52dbe69	sjplimp	git-svn-id: svn://svn.icms.temple.edu/lammps-ro/trunk@9592 f3b2605a-c512-4ea7…	Mar 6 2013
7296a641ffb3	sjplimp	git-svn-id: svn://svn.icms.temple.edu/lammps-ro/trunk@9591 f3b2605a-c512-4ea7…	Mar 6 2013
72c9d2d11f04	sjplimp	git-svn-id: svn://svn.icms.temple.edu/lammps-ro/trunk@9590 f3b2605a-c512-4ea7…	Mar 6 2013
f611f9a58f6e	sjplimp	git-svn-id: svn://svn.icms.temple.edu/lammps-ro/trunk@9589 f3b2605a-c512-4ea7…	Mar 6 2013
5404f3c1b557	sjplimp	git-svn-id: svn://svn.icms.temple.edu/lammps-ro/trunk@9588 f3b2605a-c512-4ea7…	Mar 6 2013
db2aafd8f46e	sjplimp	git-svn-id: svn://svn.icms.temple.edu/lammps-ro/trunk@9587 f3b2605a-c512-4ea7…	Mar 6 2013
dfd6d4b943bd	sjplimp	git-svn-id: svn://svn.icms.temple.edu/lammps-ro/trunk@9586 f3b2605a-c512-4ea7…	Mar 6 2013
986c317c5d55	sjplimp	git-svn-id: svn://svn.icms.temple.edu/lammps-ro/trunk@9585 f3b2605a-c512-4ea7…	Mar 6 2013
4819ef9e1e2d	sjplimp	git-svn-id: svn://svn.icms.temple.edu/lammps-ro/trunk@9584 f3b2605a-c512-4ea7…	Mar 6 2013
18a04f2c5c8f	sjplimp	git-svn-id: svn://svn.icms.temple.edu/lammps-ro/trunk@9583 f3b2605a-c512-4ea7…	Mar 6 2013
ead9fe70299a	sjplimp	git-svn-id: svn://svn.icms.temple.edu/lammps-ro/trunk@9582 f3b2605a-c512-4ea7…	Mar 6 2013
adb129fe991d	sjplimp	git-svn-id: svn://svn.icms.temple.edu/lammps-ro/trunk@9581 f3b2605a-c512-4ea7…	Mar 6 2013

Changes (24)

				Path
	M			doc/Section_commands.html
	M			doc/Section_commands.txt
	M			doc/Section_start.html
	M			doc/pair_lj_long.html
	M			doc/pair_lj_long.txt
	M			doc/pair_modify.html
	M			doc/pair_modify.txt
	M			doc/read_dump.html
	M			doc/run_style.html
	M			src/KSPACE/commgrid.cpp
	M			src/KSPACE/commgrid.h
	M			src/KSPACE/msm.cpp
	M			src/KSPACE/msm.h
	M			src/KSPACE/msm_cg.cpp
	M			src/KSPACE/pair_lj_long_coul_long.cpp
	M			src/KSPACE/pppm_disp.cpp
	M			src/KSPACE/pppm_disp.h
	M			src/MC/fix_gcmc.cpp
	M			src/OPT/Install.sh
	M			src/STUBS/mpi.h
	M			src/USER-OMP/msm_cg_omp.cpp
	M			src/USER-OMP/respa_omp.cpp
	M			src/pair.cpp
	M			src/pair.h