Diffusion lammps 9b799cc2af5f

Merge branch 'lammps-icms' into lammps-colvars
9b799cc2af5f
Actions

Authored by Axel Kohlmeyer <akohlmey@gmail.com> on Nov 28 2012, 16:40.

Description

Merge branch 'lammps-icms' into lammps-colvars

Details

Committed

Axel Kohlmeyer <akohlmey@gmail.com>

Nov 28 2012, 16:40

Pushed

junge

Oct 6 2016, 16:49

Parents

rLAMMPS9243e564604f: Merge branch 'master' into lammps-icms
rLAMMPS5bf5142f296a: Merge branch 'lammps-icms' into lammps-colvars

Branches

Unknown

Tags

Unknown

Event Timeline

Axel Kohlmeyer <akohlmey@gmail.com> committed rLAMMPS9b799cc2af5f: Merge branch 'lammps-icms' into lammps-colvars (authored by Axel Kohlmeyer <akohlmey@gmail.com>).Nov 28 2012, 16:40

Merged Changes

This commit merges a very large number of changes. Only the first 50 are shown.

Commit	Author	Details	Committed
9243e564604f	Axel Kohlmeyer	Merge branch 'master' into lammps-icms	Nov 28 2012
1f9e4dd2a709	Axel Kohlmeyer	remove package files not in the official distribution	Nov 28 2012
6d62d8be18c0	sjplimp	git-svn-id: svn://svn.icms.temple.edu/lammps-ro/trunk@9128 f3b2605a-c512-4ea7…	Nov 27 2012
4f948b9602e3	Axel Kohlmeyer	Merge branch 'make-purge' into lammps-icms	Nov 27 2012
bf3e36ebd94f	Axel Kohlmeyer	added make purge target	Nov 27 2012
af4e81ff64f1	Axel Kohlmeyer	Merge branch 'master' into lammps-icms	Nov 27 2012
3b24a0fba0a4	sjplimp	git-svn-id: svn://svn.icms.temple.edu/lammps-ro/trunk@9126 f3b2605a-c512-4ea7…	Nov 27 2012
532b77584725	sjplimp	git-svn-id: svn://svn.icms.temple.edu/lammps-ro/trunk@9125 f3b2605a-c512-4ea7…	Nov 27 2012
bbd15aea534d	sjplimp	git-svn-id: svn://svn.icms.temple.edu/lammps-ro/trunk@9124 f3b2605a-c512-4ea7…	Nov 27 2012
728a304c5d71	sjplimp	git-svn-id: svn://svn.icms.temple.edu/lammps-ro/trunk@9123 f3b2605a-c512-4ea7…	Nov 27 2012
94c2edcdcea8	pscrozi	git-svn-id: svn://svn.icms.temple.edu/lammps-ro/trunk@9120 f3b2605a-c512-4ea7…	Nov 27 2012
8b52a5b0f122	sjplimp	git-svn-id: svn://svn.icms.temple.edu/lammps-ro/trunk@9116 f3b2605a-c512-4ea7…	Nov 26 2012
46952617e2d1	sjplimp	git-svn-id: svn://svn.icms.temple.edu/lammps-ro/trunk@9115 f3b2605a-c512-4ea7…	Nov 26 2012
a0e653f65c19	sjplimp	git-svn-id: svn://svn.icms.temple.edu/lammps-ro/trunk@9114 f3b2605a-c512-4ea7…	Nov 26 2012
61b0e04dfb6b	sjplimp	git-svn-id: svn://svn.icms.temple.edu/lammps-ro/trunk@9113 f3b2605a-c512-4ea7…	Nov 26 2012
e09c64d180f2	sjplimp	git-svn-id: svn://svn.icms.temple.edu/lammps-ro/trunk@9111 f3b2605a-c512-4ea7…	Nov 26 2012
5d864d4c6b78	sjplimp	git-svn-id: svn://svn.icms.temple.edu/lammps-ro/trunk@9110 f3b2605a-c512-4ea7…	Nov 26 2012
00d8960bb011	sjplimp	git-svn-id: svn://svn.icms.temple.edu/lammps-ro/trunk@9109 f3b2605a-c512-4ea7…	Nov 26 2012
a64357160ff2	sjplimp	git-svn-id: svn://svn.icms.temple.edu/lammps-ro/trunk@9108 f3b2605a-c512-4ea7…	Nov 26 2012
eb7c94ccefc0	sjplimp	git-svn-id: svn://svn.icms.temple.edu/lammps-ro/trunk@9107 f3b2605a-c512-4ea7…	Nov 26 2012
d42dada97ca1	sjplimp	git-svn-id: svn://svn.icms.temple.edu/lammps-ro/trunk@9105 f3b2605a-c512-4ea7…	Nov 26 2012
cb3475086e02	sjplimp	git-svn-id: svn://svn.icms.temple.edu/lammps-ro/trunk@9104 f3b2605a-c512-4ea7…	Nov 26 2012
34390e058fb0	sjplimp	git-svn-id: svn://svn.icms.temple.edu/lammps-ro/trunk@9102 f3b2605a-c512-4ea7…	Nov 26 2012
790aba928253	sjplimp	git-svn-id: svn://svn.icms.temple.edu/lammps-ro/trunk@9101 f3b2605a-c512-4ea7…	Nov 26 2012
ed67e1d971c3	sjplimp	git-svn-id: svn://svn.icms.temple.edu/lammps-ro/trunk@9099 f3b2605a-c512-4ea7…	Nov 26 2012
faf4de5abe6d	sjplimp	git-svn-id: svn://svn.icms.temple.edu/lammps-ro/trunk@9098 f3b2605a-c512-4ea7…	Nov 26 2012
0ef7f58ff13c	sjplimp	git-svn-id: svn://svn.icms.temple.edu/lammps-ro/trunk@9097 f3b2605a-c512-4ea7…	Nov 26 2012
e5cc471307ba	Axel Kohlmeyer	Merge branch 'master' into lammps-icms	Nov 26 2012
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

Changes (100)

				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/compute.html
	M			doc/compute.txt
	A			doc/compute_inertia_molecule.html
	A			doc/compute_inertia_molecule.txt
	M			doc/compute_temp_profile.html
	M			doc/compute_temp_profile.txt
	M			doc/dihedral_fourier.html
	M			doc/dihedral_fourier.txt
	M			doc/dihedral_quadratic.html
	M			doc/dihedral_quadratic.txt
	M			doc/displace_atoms.html
	M			doc/displace_atoms.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_move.html
	M			doc/fix_move.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
	D			src/GPU/pair_cg_cmm_coul_msm.cpp
	D			src/GPU/pair_cg_cmm_coul_msm.h
	D			src/GPU/pair_cg_cmm_coul_msm_gpu.cpp
	D			src/GPU/pair_cg_cmm_coul_msm_gpu.h
	M			src/GPU/pair_dipole_sf_gpu.cpp
	D			src/GPU/pair_eam_lj_gpu.cpp
	D			src/GPU/pair_eam_lj_gpu.h
	D			src/GPU/pair_lj_cut_tgpu.cpp
	D			src/GPU/pair_lj_cut_tgpu.h
	D			src/GPU/pair_omp_gpu.cpp
	D			src/GPU/pair_omp_gpu.h
	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/MAKE/Makefile.cygwin
	M			src/MC/fix_gcmc.cpp
	M			src/MC/fix_gcmc.h
	M			src/Makefile
	M			src/RIGID/fix_rigid.cpp
	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/USER-MISC/pair_edip.cpp
	M			src/compute_gyration_molecule.cpp
	A			src/compute_inertia_molecule.cpp
	P			src/compute_inertia_molecule.h Copied from src/compute_temp_profile.h
	M			src/compute_reduce.cpp
	M			src/compute_temp_profile.cpp
	P			src/compute_temp_profile.h Copied to src/compute_inertia_molecule.h
	M			src/displace_atoms.cpp
	M			src/fix_move.cpp
	M			src/fix_tmd.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
	A			src/purge-list.txt
	M			src/random_park.cpp
	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
	A			tools/update-purge-list.pl