Diffusion lammps bdd81705ccd2

Merge branch 'master' into lammps-icms
bdd81705ccd2
Actions

Authored by Axel Kohlmeyer <akohlmey@gmail.com> on Feb 1 2013, 14:29.

Description

Merge branch 'master' into lammps-icms

Resolved Conflicts:
doc/Manual.txt

Details

Committed

Axel Kohlmeyer <akohlmey@gmail.com>

Feb 1 2013, 14:29

Pushed

junge

Oct 6 2016, 16:49

Parents

rLAMMPSb875cf826d3c: git-svn-id: svn://svn.icms.temple.edu/lammps-ro/trunk@9376 f3b2605a-c512-4ea7…
rLAMMPSd7962731c901: make msm/omp compatible with broken OpenMP in gcc 4.2

Branches

Unknown

Tags

Unknown

Event Timeline

Axel Kohlmeyer <akohlmey@gmail.com> committed rLAMMPSbdd81705ccd2: Merge branch 'master' into lammps-icms (authored by Axel Kohlmeyer <akohlmey@gmail.com>).Feb 1 2013, 14:29

Merged Changes

Commit	Author	Details	Committed
b875cf826d3c	sjplimp	git-svn-id: svn://svn.icms.temple.edu/lammps-ro/trunk@9376 f3b2605a-c512-4ea7…	Feb 1 2013
eb92fdb7e53e	sjplimp	git-svn-id: svn://svn.icms.temple.edu/lammps-ro/trunk@9375 f3b2605a-c512-4ea7…	Feb 1 2013
33fab0ee6228	sjplimp	git-svn-id: svn://svn.icms.temple.edu/lammps-ro/trunk@9373 f3b2605a-c512-4ea7…	Feb 1 2013
8be0384eaba3	sjplimp	git-svn-id: svn://svn.icms.temple.edu/lammps-ro/trunk@9372 f3b2605a-c512-4ea7…	Feb 1 2013
b8d27cd38cdb	sjplimp	git-svn-id: svn://svn.icms.temple.edu/lammps-ro/trunk@9371 f3b2605a-c512-4ea7…	Feb 1 2013
7ad05e6dab61	sjplimp	git-svn-id: svn://svn.icms.temple.edu/lammps-ro/trunk@9370 f3b2605a-c512-4ea7…	Feb 1 2013
8ed47916919d	sjplimp	git-svn-id: svn://svn.icms.temple.edu/lammps-ro/trunk@9369 f3b2605a-c512-4ea7…	Feb 1 2013
e40555ba59bd	sjplimp	git-svn-id: svn://svn.icms.temple.edu/lammps-ro/trunk@9367 f3b2605a-c512-4ea7…	Feb 1 2013
583ba721da59	sjplimp	git-svn-id: svn://svn.icms.temple.edu/lammps-ro/trunk@9366 f3b2605a-c512-4ea7…	Feb 1 2013
3d334d0a4caa	sjplimp	git-svn-id: svn://svn.icms.temple.edu/lammps-ro/trunk@9365 f3b2605a-c512-4ea7…	Feb 1 2013
7010236e26be	sjplimp	git-svn-id: svn://svn.icms.temple.edu/lammps-ro/trunk@9363 f3b2605a-c512-4ea7…	Jan 31 2013
a861dbf434c3	sjplimp	git-svn-id: svn://svn.icms.temple.edu/lammps-ro/trunk@9362 f3b2605a-c512-4ea7…	Jan 31 2013
e729c7431621	sjplimp	git-svn-id: svn://svn.icms.temple.edu/lammps-ro/trunk@9361 f3b2605a-c512-4ea7…	Jan 31 2013
2ed241a0cd20	sjplimp	git-svn-id: svn://svn.icms.temple.edu/lammps-ro/trunk@9360 f3b2605a-c512-4ea7…	Jan 31 2013
332b6b681431	sjplimp	git-svn-id: svn://svn.icms.temple.edu/lammps-ro/trunk@9359 f3b2605a-c512-4ea7…	Jan 31 2013
f8ac8768d048	sjplimp	git-svn-id: svn://svn.icms.temple.edu/lammps-ro/trunk@9358 f3b2605a-c512-4ea7…	Jan 31 2013
318f8c411c3a	sjplimp	git-svn-id: svn://svn.icms.temple.edu/lammps-ro/trunk@9357 f3b2605a-c512-4ea7…	Jan 31 2013
7e9d3e6d6a1f	sjplimp	git-svn-id: svn://svn.icms.temple.edu/lammps-ro/trunk@9356 f3b2605a-c512-4ea7…	Jan 31 2013
6839caaba796	sjplimp	git-svn-id: svn://svn.icms.temple.edu/lammps-ro/trunk@9355 f3b2605a-c512-4ea7…	Jan 31 2013
9ec2254d0cb5	sjplimp	git-svn-id: svn://svn.icms.temple.edu/lammps-ro/trunk@9354 f3b2605a-c512-4ea7…	Jan 31 2013
fa4ac917a96a	sjplimp	git-svn-id: svn://svn.icms.temple.edu/lammps-ro/trunk@9353 f3b2605a-c512-4ea7…	Jan 31 2013
573e55903424	sjplimp	git-svn-id: svn://svn.icms.temple.edu/lammps-ro/trunk@9352 f3b2605a-c512-4ea7…	Jan 31 2013
a5ddc9336516	sjplimp	git-svn-id: svn://svn.icms.temple.edu/lammps-ro/trunk@9351 f3b2605a-c512-4ea7…	Jan 31 2013
bde38bc21709	sjplimp	git-svn-id: svn://svn.icms.temple.edu/lammps-ro/trunk@9350 f3b2605a-c512-4ea7…	Jan 31 2013
d92d56d983f4	sjplimp	git-svn-id: svn://svn.icms.temple.edu/lammps-ro/trunk@9349 f3b2605a-c512-4ea7…	Jan 31 2013
647d4fe62666	sjplimp	git-svn-id: svn://svn.icms.temple.edu/lammps-ro/trunk@9348 f3b2605a-c512-4ea7…	Jan 31 2013
b648f55b2da1	sjplimp	git-svn-id: svn://svn.icms.temple.edu/lammps-ro/trunk@9347 f3b2605a-c512-4ea7…	Jan 31 2013
0c6b84987cf3	sjplimp	git-svn-id: svn://svn.icms.temple.edu/lammps-ro/trunk@9346 f3b2605a-c512-4ea7…	Jan 31 2013
21590469d01a	sjplimp	git-svn-id: svn://svn.icms.temple.edu/lammps-ro/trunk@9345 f3b2605a-c512-4ea7…	Jan 31 2013

Changes (151)
Show All Changes

Very Large Commit

This commit is very large. Load each file individually.

		Path
M		doc/Manual.html
M		doc/Manual.txt
M		doc/Section_commands.html
M		doc/Section_commands.txt
M		doc/Section_example.html
M		doc/Section_example.txt
M		doc/Section_howto.html
M		doc/Section_howto.txt
M		doc/Section_modify.html
M		doc/Section_modify.txt
M		doc/Section_start.html
M		doc/Section_start.txt
M		doc/atom_style.html
M		doc/atom_style.txt
A		doc/body.html
A		doc/body.txt
M		doc/compute.html
M		doc/compute.txt
M		doc/compute_angle_local.html
M		doc/compute_angle_local.txt
A		doc/compute_body_local.html
A		doc/compute_body_local.txt
M		doc/compute_bond_local.html
M		doc/compute_bond_local.txt
M		doc/compute_dihedral_local.html
M		doc/compute_dihedral_local.txt
M		doc/compute_improper_local.html
M		doc/compute_improper_local.txt
M		doc/compute_property_atom.html
M		doc/compute_property_atom.txt
M		doc/dimension.html
M		doc/dimension.txt
M		doc/dump.html
M		doc/dump.txt
M		doc/fix.html
M		doc/fix.txt
M		doc/fix_langevin.html
M		doc/fix_langevin.txt
M		doc/fix_nph_sphere.html
M		doc/fix_nph_sphere.txt
M		doc/fix_npt_sphere.html
M		doc/fix_npt_sphere.txt
P		doc/fix_nve_body.html Copied from doc/fix_nve_tri.html
P		doc/fix_nve_body.txt Copied from doc/fix_nve_tri.txt
M		doc/fix_nve_line.html
M		doc/fix_nve_line.txt
M		doc/fix_nve_sphere.html
M		doc/fix_nve_sphere.txt
P		doc/fix_nve_tri.html Copied to doc/fix_nve_body.html
P		doc/fix_nve_tri.txt Copied to doc/fix_nve_body.txt
M		doc/fix_nvt_sphere.html
M		doc/fix_nvt_sphere.txt
M		doc/fix_store_state.html
M		doc/fix_store_state.txt
M		doc/fix_temp_berendsen.html
M		doc/fix_temp_berendsen.txt
M		doc/fix_temp_rescale.html
M		doc/fix_temp_rescale.txt
A		doc/pair_body.html
A		doc/pair_body.txt
M		doc/pair_coeff.html
M		doc/pair_coeff.txt
M		doc/pair_gayberne.html
M		doc/pair_gayberne.txt
M		doc/pair_resquared.html
M		doc/pair_resquared.txt
M		doc/pair_style.html
M		doc/pair_style.txt
M		doc/read_data.html
M		doc/read_data.txt
M		doc/read_restart.html
M		doc/read_restart.txt
M		examples/README
A	(dir)	examples/body/
A		examples/body/data.body
A		examples/body/in.body
A		examples/body/log.body.31Jan13.linux.1
A		examples/body/log.body.31Jan13.linux.2
M		examples/ellipse/in.ellipse.gayberne
M		examples/srd/in.srd.pure
A	(dir)	src/BODY/
A		src/BODY/Install.sh
A		src/BODY/body_nparticle.cpp
A		src/BODY/body_nparticle.h
A		src/BODY/compute_body_local.cpp
A		src/BODY/compute_body_local.h
A		src/BODY/fix_nve_body.cpp
A		src/BODY/fix_nve_body.h
A		src/BODY/pair_body.cpp
A		src/BODY/pair_body.h
M		src/DIPOLE/atom_vec_dipole.cpp
M		src/DIPOLE/atom_vec_dipole.h
M		src/Depend.sh
M		src/KSPACE/pair_buck_long_coul_long.cpp
M		src/MOLECULE/atom_vec_angle.cpp
M		src/MOLECULE/atom_vec_angle.h
M		src/MOLECULE/atom_vec_bond.cpp
M		src/MOLECULE/atom_vec_bond.h
M		src/MOLECULE/atom_vec_full.cpp
M		src/MOLECULE/atom_vec_full.h
M		src/MOLECULE/atom_vec_molecular.cpp
M		src/MOLECULE/atom_vec_molecular.h
M		src/Make.sh
M		src/Makefile
M		src/PERI/atom_vec_peri.cpp
M		src/PERI/atom_vec_peri.h
M		src/RIGID/fix_rigid.cpp
M		src/USER-AWPMD/atom_vec_wavepacket.cpp
M		src/USER-AWPMD/atom_vec_wavepacket.h
M		src/USER-CUDA/atom_vec_angle_cuda.cpp
M		src/USER-CUDA/atom_vec_angle_cuda.h
M		src/USER-CUDA/atom_vec_atomic_cuda.cpp
M		src/USER-CUDA/atom_vec_atomic_cuda.h
M		src/USER-CUDA/atom_vec_charge_cuda.cpp
M		src/USER-CUDA/atom_vec_charge_cuda.h
M		src/USER-EFF/atom_vec_electron.cpp
M		src/USER-EFF/atom_vec_electron.h
M		src/USER-SPH/atom_vec_meso.cpp
M		src/USER-SPH/atom_vec_meso.h
M		src/atom.cpp
M		src/atom.h
M		src/atom_vec.cpp
M		src/atom_vec.h
M		src/atom_vec_atomic.cpp
M		src/atom_vec_atomic.h
P		src/atom_vec_body.cpp Copied from src/atom_vec_tri.cpp
P		src/atom_vec_body.h Copied from src/atom_vec_tri.h
M		src/atom_vec_charge.cpp
M		src/atom_vec_charge.h
M		src/atom_vec_ellipsoid.cpp
M		src/atom_vec_ellipsoid.h
M		src/atom_vec_hybrid.cpp
M		src/atom_vec_hybrid.h
M		src/atom_vec_line.cpp
M		src/atom_vec_line.h
M		src/atom_vec_sphere.cpp
M		src/atom_vec_sphere.h
P		src/atom_vec_tri.cpp Copied to src/atom_vec_body.cpp
P		src/atom_vec_tri.h Copied to src/atom_vec_body.h
A		src/body.cpp
A		src/body.h
M		src/comm.cpp
M		src/compute_property_atom.cpp
M		src/compute_property_atom.h
M		src/dump_local.cpp
M		src/math_extra.h
M		src/read_data.cpp
M		src/read_data.h
M		src/read_restart.cpp
M		src/version.h
M		src/write_restart.cpp