Diffusion lammps e5cc471307ba

Merge branch 'master' into lammps-icms
e5cc471307ba
Actions

Authored by Axel Kohlmeyer <akohlmey@gmail.com> on Nov 26 2012, 14:47.

Description

Merge branch 'master' into lammps-icms

Details

Committed

Axel Kohlmeyer <akohlmey@gmail.com>

Nov 26 2012, 14:47

Pushed

junge

Oct 6 2016, 16:49

Parents

rLAMMPS0a5d5cd8f9ff: git-svn-id: svn://svn.icms.temple.edu/lammps-ro/trunk@9095 f3b2605a-c512-4ea7…
rLAMMPS880e389dfb6d: Merge branch 'master' into lammps-icms

Branches

Unknown

Tags

Unknown

Event Timeline

Axel Kohlmeyer <akohlmey@gmail.com> committed rLAMMPSe5cc471307ba: Merge branch 'master' into lammps-icms (authored by Axel Kohlmeyer <akohlmey@gmail.com>).Nov 26 2012, 14:47

Merged Changes

Commit	Author	Details	Committed
0a5d5cd8f9ff	sjplimp	git-svn-id: svn://svn.icms.temple.edu/lammps-ro/trunk@9095 f3b2605a-c512-4ea7…	Nov 21 2012
f26347d47616	sjplimp	git-svn-id: svn://svn.icms.temple.edu/lammps-ro/trunk@9091 f3b2605a-c512-4ea7…	Nov 21 2012
88645b6c96af	sjplimp	git-svn-id: svn://svn.icms.temple.edu/lammps-ro/trunk@9090 f3b2605a-c512-4ea7…	Nov 21 2012
e6a0e1ee5113	sjplimp	git-svn-id: svn://svn.icms.temple.edu/lammps-ro/trunk@9089 f3b2605a-c512-4ea7…	Nov 21 2012
de40c5ec0a94	sjplimp	git-svn-id: svn://svn.icms.temple.edu/lammps-ro/trunk@9088 f3b2605a-c512-4ea7…	Nov 21 2012
fe96c839e11f	sjplimp	git-svn-id: svn://svn.icms.temple.edu/lammps-ro/trunk@9087 f3b2605a-c512-4ea7…	Nov 21 2012
6f7eabd60ddd	sjplimp	git-svn-id: svn://svn.icms.temple.edu/lammps-ro/trunk@9086 f3b2605a-c512-4ea7…	Nov 21 2012
da156c32228b	sjplimp	git-svn-id: svn://svn.icms.temple.edu/lammps-ro/trunk@9085 f3b2605a-c512-4ea7…	Nov 21 2012
9eeec79ff1a3	sjplimp	git-svn-id: svn://svn.icms.temple.edu/lammps-ro/trunk@9083 f3b2605a-c512-4ea7…	Nov 16 2012
55c99e046362	sjplimp	git-svn-id: svn://svn.icms.temple.edu/lammps-ro/trunk@9082 f3b2605a-c512-4ea7…	Nov 16 2012
0a042754e56f	pscrozi	git-svn-id: svn://svn.icms.temple.edu/lammps-ro/trunk@9081 f3b2605a-c512-4ea7…	Nov 16 2012
a8db93558b58	sjplimp	git-svn-id: svn://svn.icms.temple.edu/lammps-ro/trunk@9079 f3b2605a-c512-4ea7…	Nov 16 2012
261b99b58a18	sjplimp	git-svn-id: svn://svn.icms.temple.edu/lammps-ro/trunk@9078 f3b2605a-c512-4ea7…	Nov 16 2012
d98fb889879c	sjplimp	git-svn-id: svn://svn.icms.temple.edu/lammps-ro/trunk@9074 f3b2605a-c512-4ea7…	Nov 14 2012
318d26b0b523	sjplimp	git-svn-id: svn://svn.icms.temple.edu/lammps-ro/trunk@9072 f3b2605a-c512-4ea7…	Nov 14 2012
8da7579a57ae	sjplimp	git-svn-id: svn://svn.icms.temple.edu/lammps-ro/trunk@9071 f3b2605a-c512-4ea7…	Nov 14 2012
81cddd4f1d8a	sjplimp	git-svn-id: svn://svn.icms.temple.edu/lammps-ro/trunk@9070 f3b2605a-c512-4ea7…	Nov 14 2012
be2f66cd8138	sjplimp	git-svn-id: svn://svn.icms.temple.edu/lammps-ro/trunk@9069 f3b2605a-c512-4ea7…	Nov 14 2012
773f0155fa88	sjplimp	git-svn-id: svn://svn.icms.temple.edu/lammps-ro/trunk@9068 f3b2605a-c512-4ea7…	Nov 14 2012
ccd1963121db	sjplimp	git-svn-id: svn://svn.icms.temple.edu/lammps-ro/trunk@9065 f3b2605a-c512-4ea7…	Nov 14 2012
92f7702140df	sjplimp	git-svn-id: svn://svn.icms.temple.edu/lammps-ro/trunk@9064 f3b2605a-c512-4ea7…	Nov 14 2012
d4b7bd9ec4de	pscrozi	Adding molecule capability to fix GCMC.	Nov 13 2012
b1c7c64624bd	pscrozi	Adding molecule capability to fix GCMC.	Nov 13 2012
c3de9349669d	sjplimp	git-svn-id: svn://svn.icms.temple.edu/lammps-ro/trunk@9057 f3b2605a-c512-4ea7…	Nov 13 2012
a259373e89a0	sjplimp	git-svn-id: svn://svn.icms.temple.edu/lammps-ro/trunk@9056 f3b2605a-c512-4ea7…	Nov 12 2012
cc101e578afc	pscrozi	Adding coulomb tabling.	Nov 12 2012
9d084fc66270	pscrozi	git-svn-id: svn://svn.icms.temple.edu/lammps-ro/trunk@9054 f3b2605a-c512-4ea7…	Nov 12 2012
e8a29953b881	sjplimp	git-svn-id: svn://svn.icms.temple.edu/lammps-ro/trunk@9052 f3b2605a-c512-4ea7…	Nov 10 2012
8cc9aa5698fd	sjplimp	git-svn-id: svn://svn.icms.temple.edu/lammps-ro/trunk@9050 f3b2605a-c512-4ea7…	Nov 10 2012
75e9a2e21898	sjplimp	git-svn-id: svn://svn.icms.temple.edu/lammps-ro/trunk@9049 f3b2605a-c512-4ea7…	Nov 10 2012
25db2bbb132e	sjplimp	git-svn-id: svn://svn.icms.temple.edu/lammps-ro/trunk@9048 f3b2605a-c512-4ea7…	Nov 9 2012
c1470a2c3979	sjplimp	git-svn-id: svn://svn.icms.temple.edu/lammps-ro/trunk@9047 f3b2605a-c512-4ea7…	Nov 9 2012
11df706ded81	sjplimp	git-svn-id: svn://svn.icms.temple.edu/lammps-ro/trunk@9045 f3b2605a-c512-4ea7…	Nov 9 2012
d8efe2a7d32f	sjplimp	git-svn-id: svn://svn.icms.temple.edu/lammps-ro/trunk@9044 f3b2605a-c512-4ea7…	Nov 9 2012
ac51e677abc6	sjplimp	git-svn-id: svn://svn.icms.temple.edu/lammps-ro/trunk@9042 f3b2605a-c512-4ea7…	Nov 9 2012
81ba64c9d87d	sjplimp	git-svn-id: svn://svn.icms.temple.edu/lammps-ro/trunk@9041 f3b2605a-c512-4ea7…	Nov 9 2012
53a1f74ef107	sjplimp	git-svn-id: svn://svn.icms.temple.edu/lammps-ro/trunk@9040 f3b2605a-c512-4ea7…	Nov 9 2012
617709b400ce	sjplimp	git-svn-id: svn://svn.icms.temple.edu/lammps-ro/trunk@9039 f3b2605a-c512-4ea7…	Nov 9 2012
31c2a6f05fe1	pscrozi	git-svn-id: svn://svn.icms.temple.edu/lammps-ro/trunk@9038 f3b2605a-c512-4ea7…	Nov 8 2012
dd022fc64f37	pscrozi	git-svn-id: svn://svn.icms.temple.edu/lammps-ro/trunk@9037 f3b2605a-c512-4ea7…	Nov 8 2012
ed53c9d2d538	sjplimp	git-svn-id: svn://svn.icms.temple.edu/lammps-ro/trunk@9036 f3b2605a-c512-4ea7…	Nov 7 2012

Changes (65)

				Path
	A			doc/Eqs/pair_mie.jpg
	A			doc/Eqs/pair_mie.tex
	A			doc/Eqs/pair_mie2.jpg
	A			doc/Eqs/pair_mie2.tex
	M			doc/Section_commands.html
	M			doc/Section_commands.txt
	M			doc/dihedral_fourier.html
	M			doc/dihedral_fourier.txt
	M			doc/dihedral_quadratic.html
	M			doc/dihedral_quadratic.txt
	M			doc/dump.html
	M			doc/dump.txt
	M			doc/dump_modify.html
	M			doc/dump_modify.txt
	M			doc/fix_gcmc.html
	M			doc/fix_gcmc.txt
	M			doc/fix_thermal_conductivity.html
	M			doc/fix_thermal_conductivity.txt
	M			doc/fix_viscosity.html
	M			doc/fix_viscosity.txt
	M			doc/improper_fourier.html
	M			doc/improper_fourier.txt
	M			doc/kspace_style.html
	M			doc/kspace_style.txt
	M			doc/next.html
	M			doc/next.txt
	M			doc/pair_coeff.html
	M			doc/pair_coeff.txt
	A			doc/pair_mie.html
	A			doc/pair_mie.txt
	M			doc/pair_reax_c.html
	M			doc/pair_reax_c.txt
	M			doc/pair_style.html
	M			doc/pair_style.txt
	M			doc/variable.html
	M			doc/variable.txt
	M			python/lammps.py
	M			src/CLASS2/pair_lj_class2_coul_long.cpp
	M			src/GPU/pair_dipole_sf_gpu.cpp
	M			src/GPU/pppm_gpu.cpp
	M			src/GPU/pppm_gpu.h
	P			src/GRANULAR/pair_gran_hooke_history.h Copied to src/pair_mie_cut.h
	M			src/KSPACE/fft3d.h
	M			src/KSPACE/pair_born_coul_long.cpp
	M			src/KSPACE/pair_buck_coul_long.cpp
	M			src/KSPACE/pair_coul_long.cpp
	M			src/KSPACE/pppm.h
	M			src/MC/fix_gcmc.cpp
	M			src/MC/fix_gcmc.h
	M			src/USER-MISC/angle_fourier_simple.cpp
	M			src/USER-MISC/dihedral_fourier.cpp
	M			src/USER-MISC/dihedral_fourier.h
	M			src/USER-MISC/dihedral_nharmonic.cpp
	M			src/USER-MISC/improper_fourier.cpp
	M			src/compute_reduce.cpp
	M			src/neigh_request.cpp
	M			src/output.cpp
	A			src/pair_mie_cut.cpp
	P			src/pair_mie_cut.h Copied from src/GRANULAR/pair_gran_hooke_history.h
	M			src/read_data.cpp
	M			src/thermo.cpp
	M			src/variable.cpp
	M			src/variable.h
	M			src/verlet.cpp
	M			src/version.h