Merge branch 'master' into lammps-icms
3aa9c732be6a
Actions

Authored by Axel Kohlmeyer <akohlmey@gmail.com> on Sep 18 2012, 01:35.

Description

Merge branch 'master' into lammps-icms

Committed

Axel Kohlmeyer <akohlmey@gmail.com>

Sep 18 2012, 01:35

Pushed

junge

Oct 6 2016, 16:49

Parents

Branches

Unknown

Tags

Unknown

Axel Kohlmeyer <akohlmey@gmail.com> committed rLAMMPS3aa9c732be6a: Merge branch 'master' into lammps-icms (authored by Axel Kohlmeyer <akohlmey@gmail.com>).Sep 18 2012, 01:35

Commit	Author	Details	Committed
48a72604fe95	sjplimp	git-svn-id: svn://svn.icms.temple.edu/lammps-ro/trunk@8791 f3b2605a-c512-4ea7…	Sep 14 2012
0a3b68b5fa9e	sjplimp	git-svn-id: svn://svn.icms.temple.edu/lammps-ro/trunk@8790 f3b2605a-c512-4ea7…	Sep 14 2012
4cdd76ed6d8a	sjplimp	git-svn-id: svn://svn.icms.temple.edu/lammps-ro/trunk@8788 f3b2605a-c512-4ea7…	Sep 14 2012
52626080b7a7	sjplimp	git-svn-id: svn://svn.icms.temple.edu/lammps-ro/trunk@8787 f3b2605a-c512-4ea7…	Sep 14 2012
ea0ce8fec7b3	sjplimp	git-svn-id: svn://svn.icms.temple.edu/lammps-ro/trunk@8786 f3b2605a-c512-4ea7…	Sep 14 2012
7aaf99482303	sjplimp	git-svn-id: svn://svn.icms.temple.edu/lammps-ro/trunk@8785 f3b2605a-c512-4ea7…	Sep 14 2012
6f215d4a2392	sjplimp	git-svn-id: svn://svn.icms.temple.edu/lammps-ro/trunk@8783 f3b2605a-c512-4ea7…	Sep 13 2012
5bc864de6606	sjplimp	git-svn-id: svn://svn.icms.temple.edu/lammps-ro/trunk@8781 f3b2605a-c512-4ea7…	Sep 13 2012
ace4980800d3	pscrozi	Adding MSM code.	Sep 13 2012
20a11e138a56	pscrozi	Adding MSM stuff to kspace.cpp/h.	Sep 13 2012
ef70a452da2d	pscrozi	Adding MSM documentation.	Sep 13 2012
01f20e806b4d	sjplimp	git-svn-id: svn://svn.icms.temple.edu/lammps-ro/trunk@8776 f3b2605a-c512-4ea7…	Sep 13 2012
25b5a253cb0b	pscrozi	Updating timings tests in pppm_old.cpp/h to match those in pppm.cpp/h	Sep 13 2012

				Path
	M			doc/fix_spring_self.html
	M			doc/fix_spring_self.txt
	M			doc/kspace_modify.html
	M			doc/kspace_modify.txt
	M			doc/kspace_style.html
	M			doc/kspace_style.txt
	A			src/KSPACE/msm.cpp
	A			src/KSPACE/msm.h
	M			src/KSPACE/pair_born_coul_long.cpp
	M			src/KSPACE/pair_born_coul_long.h
	A			src/KSPACE/pair_born_coul_msm.cpp
	P			src/KSPACE/pair_born_coul_msm.h Copied from src/pair_morse.h
	M			src/KSPACE/pair_buck_coul_long.h
	A			src/KSPACE/pair_buck_coul_msm.cpp
	P			src/KSPACE/pair_buck_coul_msm.h Copied from src/pair_morse.h
	P			src/KSPACE/pair_coul_long.h Copied to multiple locations: src/KSPACE/pair_coul_msm.h src/KSPACE/pair_lj_charmm_coul_msm.h src/KSPACE/pair_lj_cut_coul_msm.h
	P			src/KSPACE/pair_coul_msm.cpp Copied from src/KSPACE/pair_coul_long.cpp
	P			src/KSPACE/pair_coul_msm.h Copied from src/KSPACE/pair_coul_long.h
	M			src/KSPACE/pair_lj_charmm_coul_long.h
	P			src/KSPACE/pair_lj_charmm_coul_msm.cpp Copied from src/KSPACE/pair_lj_charmm_coul_long.cpp
	P			src/KSPACE/pair_lj_charmm_coul_msm.h Copied from src/KSPACE/pair_coul_long.h
	M			src/KSPACE/pair_lj_cut_coul_long.h
	A			src/KSPACE/pair_lj_cut_coul_msm.cpp
	P			src/KSPACE/pair_lj_cut_coul_msm.h Copied from src/KSPACE/pair_coul_long.h
	M			src/KSPACE/pppm_old.cpp
	M			src/KSPACE/pppm_old.h
	M			src/kspace.cpp
	M			src/kspace.h
	M			src/pair_born_coul_wolf.cpp
	M			src/version.h