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

Authored by Axel Kohlmeyer <akohlmey@gmail.com> on Aug 26 2014, 18:33.

Description

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

Resolved Conflicts:
src/KSPACE/msm.cpp
src/KSPACE/msm_cg.cpp
src/KSPACE/pppm.cpp
src/KSPACE/pppm_cg.cpp
src/KSPACE/pppm_disp.cpp
src/KSPACE/pppm_disp_tip4p.cpp
src/KSPACE/pppm_stagger.cpp
src/KSPACE/pppm_tip4p.cpp

Details

Committed

Axel Kohlmeyer <akohlmey@gmail.com>

Aug 26 2014, 18:33

Pushed

junge

Oct 6 2016, 16:49

Parents

rLAMMPSb74fcc80ac13: git-svn-id: svn://svn.icms.temple.edu/lammps-ro/trunk@12350 f3b2605a-c512-4ea7…
rLAMMPSd6dfdd6cb1a0: fix documentation bug reported by Hamed Farokhi

Branches

Unknown

Tags

Unknown

Event Timeline

Axel Kohlmeyer <akohlmey@gmail.com> committed rLAMMPS54576e2b35ba: Merge remote-tracking branch 'lammps-ro/master' into lammps-icms (authored by Axel Kohlmeyer <akohlmey@gmail.com>).Aug 26 2014, 18:33

Merged Changes

Commit	Author	Details	Committed
b74fcc80ac13	sjplimp	git-svn-id: svn://svn.icms.temple.edu/lammps-ro/trunk@12350 f3b2605a-c512-4ea7…	Aug 25 2014
80b02160f1eb	sjplimp	git-svn-id: svn://svn.icms.temple.edu/lammps-ro/trunk@12349 f3b2605a-c512-4ea7…	Aug 25 2014
4ea728dc8007	sjplimp	git-svn-id: svn://svn.icms.temple.edu/lammps-ro/trunk@12348 f3b2605a-c512-4ea7…	Aug 25 2014
508ea4a57533	athomps	Added Steve's suggestions	Aug 25 2014
6e78f83b3de9	sjplimp	git-svn-id: svn://svn.icms.temple.edu/lammps-ro/trunk@12346 f3b2605a-c512-4ea7…	Aug 25 2014
6809f93138d3	sjplimp	git-svn-id: svn://svn.icms.temple.edu/lammps-ro/trunk@12345 f3b2605a-c512-4ea7…	Aug 25 2014
15ae2e3f5ec0	sjplimp	git-svn-id: svn://svn.icms.temple.edu/lammps-ro/trunk@12344 f3b2605a-c512-4ea7…	Aug 25 2014
fbbbb73d9b63	sjplimp	git-svn-id: svn://svn.icms.temple.edu/lammps-ro/trunk@12343 f3b2605a-c512-4ea7…	Aug 25 2014
05c3613356a8	sjplimp	git-svn-id: svn://svn.icms.temple.edu/lammps-ro/trunk@12342 f3b2605a-c512-4ea7…	Aug 25 2014
a0fba99324bb	sjplimp	git-svn-id: svn://svn.icms.temple.edu/lammps-ro/trunk@12341 f3b2605a-c512-4ea7…	Aug 25 2014
1bef8ec3a4e9	sjplimp	git-svn-id: svn://svn.icms.temple.edu/lammps-ro/trunk@12340 f3b2605a-c512-4ea7…	Aug 25 2014

Changes (29)

				Path
	M			doc/Section_accelerate.html
	M			doc/Section_accelerate.txt
	M			doc/Section_example.html
	M			doc/Section_example.txt
	M			doc/Section_intro.html
	M			doc/Section_intro.txt
	M			doc/Section_packages.html
	M			doc/Section_packages.txt
	M			doc/Section_start.html
	M			doc/Section_start.txt
	M			doc/fix_langevin.html
	M			doc/fix_langevin.txt
	M			doc/package.html
	M			doc/package.txt
	M			doc/suffix.html
	M			doc/suffix.txt
	M			src/KSPACE/msm.cpp
	M			src/KSPACE/msm_cg.cpp
	M			src/KSPACE/pppm.cpp
	M			src/KSPACE/pppm_cg.cpp
	M			src/KSPACE/pppm_disp.cpp
	M			src/KSPACE/pppm_disp_tip4p.cpp
	M			src/KSPACE/pppm_stagger.cpp
	M			src/KSPACE/pppm_tip4p.cpp
	M			src/MPIIO/dump_atom_mpiio.cpp
	M			src/MPIIO/dump_custom_mpiio.cpp
	M			src/MPIIO/dump_xyz_mpiio.cpp
	M			src/MPIIO/restart_mpiio.cpp
	M			src/USER-INTEL/README