Diffusion lammps 2d5d56948630

Merge branch 'master' into lammps-icms
2d5d56948630
Actions

Authored by Axel Kohlmeyer <akohlmey@gmail.com> on Jan 11 2012, 16:45.

Description

Merge branch 'master' into lammps-icms

Details

Committed

Axel Kohlmeyer <akohlmey@gmail.com>

Jan 11 2012, 16:45

Pushed

junge

Oct 6 2016, 16:49

Parents

rLAMMPSefc68ec04882: git-svn-id: svn://svn.icms.temple.edu/lammps-ro/trunk@7538 f3b2605a-c512-4ea7…
rLAMMPS36b74d35dff4: Merge branch 'openmp-master' into lammps-icms

Branches

Unknown

Tags

Unknown

Event Timeline

Axel Kohlmeyer <akohlmey@gmail.com> committed rLAMMPS2d5d56948630: Merge branch 'master' into lammps-icms (authored by Axel Kohlmeyer <akohlmey@gmail.com>).Jan 11 2012, 16:45

Merged Changes

Commit	Author	Details	Committed
efc68ec04882	sjplimp	git-svn-id: svn://svn.icms.temple.edu/lammps-ro/trunk@7538 f3b2605a-c512-4ea7…	Jan 10 2012
02abc3673f12	sjplimp	git-svn-id: svn://svn.icms.temple.edu/lammps-ro/trunk@7532 f3b2605a-c512-4ea7…	Jan 10 2012
ef06e2b12d7b	sjplimp	git-svn-id: svn://svn.icms.temple.edu/lammps-ro/trunk@7531 f3b2605a-c512-4ea7…	Jan 10 2012
cc8860522a39	sjplimp	git-svn-id: svn://svn.icms.temple.edu/lammps-ro/trunk@7530 f3b2605a-c512-4ea7…	Jan 10 2012
06634ee31f67	sjplimp	git-svn-id: svn://svn.icms.temple.edu/lammps-ro/trunk@7528 f3b2605a-c512-4ea7…	Jan 10 2012
397ac7f1e7a8	sjplimp	git-svn-id: svn://svn.icms.temple.edu/lammps-ro/trunk@7526 f3b2605a-c512-4ea7…	Jan 10 2012
e8c725de48f0	sjplimp	git-svn-id: svn://svn.icms.temple.edu/lammps-ro/trunk@7525 f3b2605a-c512-4ea7…	Jan 10 2012
4522aea17e08	sjplimp	git-svn-id: svn://svn.icms.temple.edu/lammps-ro/trunk@7523 f3b2605a-c512-4ea7…	Jan 10 2012
472c12800425	sjplimp	git-svn-id: svn://svn.icms.temple.edu/lammps-ro/trunk@7522 f3b2605a-c512-4ea7…	Jan 10 2012
d9815fd9771a	sjplimp	git-svn-id: svn://svn.icms.temple.edu/lammps-ro/trunk@7521 f3b2605a-c512-4ea7…	Jan 10 2012
18f233f1b84c	sjplimp	git-svn-id: svn://svn.icms.temple.edu/lammps-ro/trunk@7519 f3b2605a-c512-4ea7…	Jan 10 2012
20386aee550c	sjplimp	git-svn-id: svn://svn.icms.temple.edu/lammps-ro/trunk@7518 f3b2605a-c512-4ea7…	Jan 10 2012
a23925846afd	sjplimp	git-svn-id: svn://svn.icms.temple.edu/lammps-ro/trunk@7516 f3b2605a-c512-4ea7…	Jan 10 2012
fb1509f2e79e	sjplimp	git-svn-id: svn://svn.icms.temple.edu/lammps-ro/trunk@7515 f3b2605a-c512-4ea7…	Jan 10 2012
c748f1e46a8d	sjplimp	git-svn-id: svn://svn.icms.temple.edu/lammps-ro/trunk@7514 f3b2605a-c512-4ea7…	Jan 10 2012
8c3a07c16901	sjplimp	git-svn-id: svn://svn.icms.temple.edu/lammps-ro/trunk@7513 f3b2605a-c512-4ea7…	Jan 10 2012
9a9ed90766b1	sjplimp	git-svn-id: svn://svn.icms.temple.edu/lammps-ro/trunk@7501 f3b2605a-c512-4ea7…	Jan 10 2012

Changes (27)

				Path
	A			doc/Eqs/angle_dipole_gamma.jpg
	A			doc/Eqs/angle_dipole_gamma.tex
	A			doc/Eqs/angle_dipole_potential.jpg
	P			doc/Eqs/angle_dipole_potential.tex Copied from doc/Eqs/angle_harmonic.tex
	A			doc/Eqs/angle_dipole_torque.jpg
	A			doc/Eqs/angle_dipole_torque.tex
	M			doc/Section_commands.html
	M			doc/Section_commands.txt
	M			doc/Section_howto.html
	M			doc/Section_howto.txt
	M			doc/Section_start.html
	M			doc/Section_start.txt
	A			doc/angle_dipole.html
	A			doc/angle_dipole.txt
	A			doc/dihedral_table.html
	A			doc/dihedral_table.txt
	M			doc/pair_lj_smooth_linear.html
	M			src/MOLECULE/atom_vec_angle.cpp
	M			src/MOLECULE/atom_vec_molecular.cpp
	M			src/USER-MISC/Install.sh
	M			src/USER-MISC/README
	A			src/USER-MISC/angle_dipole.cpp
	P			src/USER-MISC/angle_dipole.h Copied from src/MOLECULE/angle_cosine.h
	A			src/USER-MISC/dihedral_table.cpp
	A			src/USER-MISC/dihedral_table.h
	M			src/region_block.cpp
	M			src/version.h