Diffusion lammps 3be9d2af3282

Merge branch 'lammps-icms' into lammps-molfile
3be9d2af3282
Actions

Authored by Axel Kohlmeyer <akohlmey@gmail.com> on May 22 2012, 18:21.

Description

Merge branch 'lammps-icms' into lammps-molfile

Details

Committed

Axel Kohlmeyer <akohlmey@gmail.com>

May 22 2012, 18:21

Pushed

junge

Oct 6 2016, 16:49

Parents

rLAMMPS6b6e966d1a4b: Merge branch 'lammps-icms' into lammps-molfile
rLAMMPS5a0145c72ecc: Merge branch 'master' into lammps-icms

Branches

Unknown

Tags

Unknown

Event Timeline

Axel Kohlmeyer <akohlmey@gmail.com> committed rLAMMPS3be9d2af3282: Merge branch 'lammps-icms' into lammps-molfile (authored by Axel Kohlmeyer <akohlmey@gmail.com>).May 22 2012, 18:21

Merged Changes

Commit	Author	Details	Committed
5a0145c72ecc	Axel Kohlmeyer	Merge branch 'master' into lammps-icms	May 22 2012
828349de1086	sjplimp	git-svn-id: svn://svn.icms.temple.edu/lammps-ro/trunk@8109 f3b2605a-c512-4ea7…	May 21 2012
caabcf6db4b2	sjplimp	git-svn-id: svn://svn.icms.temple.edu/lammps-ro/trunk@8106 f3b2605a-c512-4ea7…	May 21 2012
5df5488c8c30	Axel Kohlmeyer	Merge branch 'master' into lammps-icms	May 20 2012
ce8f0898592a	sjplimp	git-svn-id: svn://svn.icms.temple.edu/lammps-ro/trunk@8105 f3b2605a-c512-4ea7…	May 19 2012
47f698b2a0f8	sjplimp	git-svn-id: svn://svn.icms.temple.edu/lammps-ro/trunk@8104 f3b2605a-c512-4ea7…	May 19 2012
d856d2d620a6	sjplimp	git-svn-id: svn://svn.icms.temple.edu/lammps-ro/trunk@8103 f3b2605a-c512-4ea7…	May 19 2012
174f9b850235	sjplimp	git-svn-id: svn://svn.icms.temple.edu/lammps-ro/trunk@8102 f3b2605a-c512-4ea7…	May 19 2012
bf0d66a03132	sjplimp	git-svn-id: svn://svn.icms.temple.edu/lammps-ro/trunk@8101 f3b2605a-c512-4ea7…	May 19 2012
7481744ecab6	sjplimp	git-svn-id: svn://svn.icms.temple.edu/lammps-ro/trunk@8100 f3b2605a-c512-4ea7…	May 19 2012
f35d71d798b6	sjplimp	git-svn-id: svn://svn.icms.temple.edu/lammps-ro/trunk@8099 f3b2605a-c512-4ea7…	May 19 2012
d99dd02a72b9	sjplimp	git-svn-id: svn://svn.icms.temple.edu/lammps-ro/trunk@8098 f3b2605a-c512-4ea7…	May 19 2012
2bddadb35428	sjplimp	git-svn-id: svn://svn.icms.temple.edu/lammps-ro/trunk@8097 f3b2605a-c512-4ea7…	May 19 2012
37d733fa8f3c	sjplimp	git-svn-id: svn://svn.icms.temple.edu/lammps-ro/trunk@8095 f3b2605a-c512-4ea7…	May 19 2012
9eeb69443254	sjplimp	git-svn-id: svn://svn.icms.temple.edu/lammps-ro/trunk@8094 f3b2605a-c512-4ea7…	May 19 2012
95cf2cb86f8c	sjplimp	git-svn-id: svn://svn.icms.temple.edu/lammps-ro/trunk@8093 f3b2605a-c512-4ea7…	May 18 2012
987aed440d2c	sjplimp	git-svn-id: svn://svn.icms.temple.edu/lammps-ro/trunk@8092 f3b2605a-c512-4ea7…	May 18 2012
8487639210ac	sjplimp	git-svn-id: svn://svn.icms.temple.edu/lammps-ro/trunk@8090 f3b2605a-c512-4ea7…	May 18 2012
159e44fa8c74	sjplimp	git-svn-id: svn://svn.icms.temple.edu/lammps-ro/trunk@8089 f3b2605a-c512-4ea7…	May 18 2012
e8308edb1535	sjplimp	git-svn-id: svn://svn.icms.temple.edu/lammps-ro/trunk@8088 f3b2605a-c512-4ea7…	May 18 2012

Changes (37)

				Path
	A			doc/PDF/kspace.pdf
	M			doc/compute_group_group.html
	M			doc/compute_group_group.txt
	M			doc/compute_pe.html
	M			doc/compute_pe.txt
	M			doc/compute_pe_atom.html
	M			doc/compute_pe_atom.txt
	M			doc/dump_modify.html
	M			doc/dump_modify.txt
	M			doc/read_data.html
	M			doc/read_data.txt
	M			doc/restart.html
	M			doc/restart.txt
	M			doc/thermo_modify.html
	M			doc/thermo_modify.txt
	M			src/KSPACE/ewald.cpp
	M			src/KSPACE/ewald.h
	M			src/KSPACE/pppm.cpp
	M			src/KSPACE/pppm.h
	M			src/REPLICA/prd.cpp
	M			src/REPLICA/tad.cpp
	M			src/compute_group_group.cpp
	M			src/compute_group_group.h
	M			src/fix.h
	M			src/fix_external.cpp
	M			src/input.cpp
	M			src/kspace.cpp
	M			src/kspace.h
	M			src/min.cpp
	M			src/modify.cpp
	M			src/modify.h
	M			src/neighbor.cpp
	M			src/output.cpp
	M			src/output.h
	M			src/read_data.cpp
	M			src/read_data.h
	M			src/version.h