Diffusion lammps 8ba1c4c565c6

Merge branch 'master' into lammps-icms
8ba1c4c565c6
Actions

Authored by Axel Kohlmeyer <akohlmey@gmail.com> on Oct 19 2012, 16:00.

Description

Merge branch 'master' into lammps-icms

Resolved Conflicts:
src/REPLICA/prd.cpp

Details

Committed

Axel Kohlmeyer <akohlmey@gmail.com>

Oct 19 2012, 16:00

Pushed

junge

Oct 6 2016, 16:49

Parents

rLAMMPS7b8bede0f132: Changes to coulomb tables.
rLAMMPS9a0e9670fb05: Merge branch 'master' into lammps-icms

Branches

Unknown

Tags

Unknown

Event Timeline

Axel Kohlmeyer <akohlmey@gmail.com> committed rLAMMPS8ba1c4c565c6: Merge branch 'master' into lammps-icms (authored by Axel Kohlmeyer <akohlmey@gmail.com>).Oct 19 2012, 16:00

Merged Changes

Commit	Author	Details	Committed
7b8bede0f132	pscrozi	Changes to coulomb tables.	Oct 18 2012
0b10887ad460	pscrozi	Changes to coulomb tables.	Oct 18 2012
6a4b2a601cc0	pscrozi	git-svn-id: svn://svn.icms.temple.edu/lammps-ro/trunk@8972 f3b2605a-c512-4ea7…	Oct 16 2012
fd4f2472afc1	pscrozi	git-svn-id: svn://svn.icms.temple.edu/lammps-ro/trunk@8971 f3b2605a-c512-4ea7…	Oct 16 2012
07b7faaf4db7	pscrozi	git-svn-id: svn://svn.icms.temple.edu/lammps-ro/trunk@8970 f3b2605a-c512-4ea7…	Oct 16 2012
0c03748009da	sjplimp	git-svn-id: svn://svn.icms.temple.edu/lammps-ro/trunk@8968 f3b2605a-c512-4ea7…	Oct 15 2012
640235a4f848	sjplimp	git-svn-id: svn://svn.icms.temple.edu/lammps-ro/trunk@8966 f3b2605a-c512-4ea7…	Oct 15 2012
8c55ffbce0f3	sjplimp	git-svn-id: svn://svn.icms.temple.edu/lammps-ro/trunk@8965 f3b2605a-c512-4ea7…	Oct 15 2012
f9334b12df1d	sjplimp	git-svn-id: svn://svn.icms.temple.edu/lammps-ro/trunk@8964 f3b2605a-c512-4ea7…	Oct 15 2012
64c87e863c5e	sjplimp	git-svn-id: svn://svn.icms.temple.edu/lammps-ro/trunk@8963 f3b2605a-c512-4ea7…	Oct 15 2012
3a8f0cc4e4a3	sjplimp	git-svn-id: svn://svn.icms.temple.edu/lammps-ro/trunk@8961 f3b2605a-c512-4ea7…	Oct 13 2012
8b2448329b78	sjplimp	git-svn-id: svn://svn.icms.temple.edu/lammps-ro/trunk@8960 f3b2605a-c512-4ea7…	Oct 13 2012
0ac2b54e583d	sjplimp	git-svn-id: svn://svn.icms.temple.edu/lammps-ro/trunk@8959 f3b2605a-c512-4ea7…	Oct 13 2012
1920aec29ec1	sjplimp	git-svn-id: svn://svn.icms.temple.edu/lammps-ro/trunk@8956 f3b2605a-c512-4ea7…	Oct 12 2012
2f78a063180c	sjplimp	git-svn-id: svn://svn.icms.temple.edu/lammps-ro/trunk@8955 f3b2605a-c512-4ea7…	Oct 12 2012
946ec565c26f	sjplimp	git-svn-id: svn://svn.icms.temple.edu/lammps-ro/trunk@8954 f3b2605a-c512-4ea7…	Oct 12 2012
5b6ec31a145c	sjplimp	git-svn-id: svn://svn.icms.temple.edu/lammps-ro/trunk@8953 f3b2605a-c512-4ea7…	Oct 12 2012
fe2278f1b773	sjplimp	git-svn-id: svn://svn.icms.temple.edu/lammps-ro/trunk@8952 f3b2605a-c512-4ea7…	Oct 12 2012
08a691bfeda9	sjplimp	git-svn-id: svn://svn.icms.temple.edu/lammps-ro/trunk@8951 f3b2605a-c512-4ea7…	Oct 12 2012
6984d53442fe	sjplimp	git-svn-id: svn://svn.icms.temple.edu/lammps-ro/trunk@8950 f3b2605a-c512-4ea7…	Oct 12 2012

Changes (55)

				Path
	M			doc/communicate.html
	M			doc/communicate.txt
	M			doc/compute_bond_local.html
	M			doc/compute_bond_local.txt
	M			doc/dump.html
	M			doc/dump.txt
	M			doc/fix_balance.html
	M			doc/fix_balance.txt
	M			doc/kspace_modify.html
	M			doc/kspace_modify.txt
	M			doc/kspace_style.html
	M			doc/kspace_style.txt
	M			doc/neigh_modify.html
	M			doc/neigh_modify.txt
	M			src/KSPACE/Install.sh
	A			src/KSPACE/commgrid.cpp
	A			src/KSPACE/commgrid.h
	M			src/KSPACE/msm.cpp
	M			src/KSPACE/msm.h
	M			src/KSPACE/pair_born_coul_long.cpp
	M			src/KSPACE/pair_born_coul_long.h
	M			src/KSPACE/pair_born_coul_msm.cpp
	M			src/KSPACE/pair_buck_coul_long.cpp
	M			src/KSPACE/pair_buck_coul_long.h
	M			src/KSPACE/pair_buck_long_coul_long.cpp
	M			src/KSPACE/pair_buck_long_coul_long.h
	M			src/KSPACE/pair_coul_long.cpp
	M			src/KSPACE/pair_coul_long.h
	M			src/KSPACE/pair_coul_msm.cpp
	M			src/KSPACE/pair_coul_msm.h
	M			src/KSPACE/pair_lj_charmm_coul_long.cpp
	M			src/KSPACE/pair_lj_charmm_coul_long.h
	M			src/KSPACE/pair_lj_charmm_coul_msm.cpp
	M			src/KSPACE/pair_lj_charmm_coul_msm.h
	M			src/KSPACE/pair_lj_cut_coul_long.cpp
	M			src/KSPACE/pair_lj_cut_coul_long.h
	M			src/KSPACE/pair_lj_cut_coul_msm.cpp
	M			src/KSPACE/pair_lj_cut_coul_msm.h
	M			src/KSPACE/pair_lj_long_coul_long.cpp
	M			src/KSPACE/pair_lj_long_coul_long.h
	M			src/KSPACE/pppm.cpp
	M			src/KSPACE/pppm.h
	M			src/KSPACE/pppm_disp.cpp
	M			src/KSPACE/pppm_disp.h
	M			src/REPLICA/prd.cpp
	M			src/finish.cpp
	M			src/fix_balance.cpp
	M			src/kspace.cpp
	M			src/kspace.h
	M			src/neigh_bond.cpp
	M			src/neighbor.cpp
	M			src/neighbor.h
	M			src/pair.cpp
	M			src/pair.h
	M			src/version.h