Diffusion lammps 115df8a11649

Merge remote branch 'lammps-ro/master' into lammps-icms
115df8a11649
Actions

Authored by Axel Kohlmeyer <akohlmey@gmail.com> on Mar 5 2013, 13:25.

Description

Merge remote branch 'lammps-ro/master' into lammps-icms

Resolved Conflicts:
doc/Manual.txt
src/KSPACE/pair_lj_long_coul_long.cpp
src/KSPACE/pair_lj_long_coul_long.h
src/pair.h

Details

Committed

Axel Kohlmeyer <akohlmey@gmail.com>

Mar 5 2013, 13:25

Pushed

junge

Oct 6 2016, 16:49

Parents

rLAMMPS0a364f2bae1b: git-svn-id: svn://svn.icms.temple.edu/lammps-ro/trunk@9576 f3b2605a-c512-4ea7…
rLAMMPS1946865fd6b4: update documentation for new pair style

Branches

Unknown

Tags

Unknown

Event Timeline

Axel Kohlmeyer <akohlmey@gmail.com> committed rLAMMPS115df8a11649: Merge remote branch 'lammps-ro/master' into lammps-icms (authored by Axel Kohlmeyer <akohlmey@gmail.com>).Mar 5 2013, 13:25

Merged Changes

Commit	Author	Details	Committed
0a364f2bae1b	sjplimp	git-svn-id: svn://svn.icms.temple.edu/lammps-ro/trunk@9576 f3b2605a-c512-4ea7…	Mar 5 2013
28bcd038af48	sjplimp	git-svn-id: svn://svn.icms.temple.edu/lammps-ro/trunk@9575 f3b2605a-c512-4ea7…	Mar 5 2013
df40403cd966	sjplimp	git-svn-id: svn://svn.icms.temple.edu/lammps-ro/trunk@9574 f3b2605a-c512-4ea7…	Mar 5 2013
32ba98e947d9	sjplimp	git-svn-id: svn://svn.icms.temple.edu/lammps-ro/trunk@9573 f3b2605a-c512-4ea7…	Mar 5 2013
1fe23b30417a	sjplimp	git-svn-id: svn://svn.icms.temple.edu/lammps-ro/trunk@9572 f3b2605a-c512-4ea7…	Mar 5 2013
30370bb2aa24	sjplimp	git-svn-id: svn://svn.icms.temple.edu/lammps-ro/trunk@9571 f3b2605a-c512-4ea7…	Mar 5 2013
6903543002bd	sjplimp	git-svn-id: svn://svn.icms.temple.edu/lammps-ro/trunk@9570 f3b2605a-c512-4ea7…	Mar 5 2013
d4b33beba9ff	sjplimp	git-svn-id: svn://svn.icms.temple.edu/lammps-ro/trunk@9569 f3b2605a-c512-4ea7…	Mar 5 2013
b116401f4da2	sjplimp	git-svn-id: svn://svn.icms.temple.edu/lammps-ro/trunk@9568 f3b2605a-c512-4ea7…	Mar 5 2013
a746d1ce48c6	sjplimp	git-svn-id: svn://svn.icms.temple.edu/lammps-ro/trunk@9567 f3b2605a-c512-4ea7…	Mar 5 2013
a5c6bfb1c587	sjplimp	git-svn-id: svn://svn.icms.temple.edu/lammps-ro/trunk@9566 f3b2605a-c512-4ea7…	Mar 5 2013
fe7a7c25f1d0	sjplimp	git-svn-id: svn://svn.icms.temple.edu/lammps-ro/trunk@9564 f3b2605a-c512-4ea7…	Mar 4 2013
561b3086f8fb	sjplimp	git-svn-id: svn://svn.icms.temple.edu/lammps-ro/trunk@9563 f3b2605a-c512-4ea7…	Mar 4 2013
e57c8ddef18c	sjplimp	git-svn-id: svn://svn.icms.temple.edu/lammps-ro/trunk@9562 f3b2605a-c512-4ea7…	Mar 4 2013
9659cf67395b	athomps	Updated fix reax/c/bonds command to remove time averaging. Update the…	Mar 4 2013
3ae508356094	athomps	Updated fix reax/c/bonds command to remove time averaging. Update the…	Mar 4 2013
cc237b52a6d1	athomps	Removed reax/c time-averaging. Replaced integers with chemical symbols in…	Mar 4 2013
dd0d1ab85095	athomps	Removed reax/c time-averaging and merged reax and reax/c for fix reax/bonds and…	Mar 4 2013

Changes (123)

				Path
	M			doc/Manual.html
	M			doc/Manual.pdf
	M			doc/Manual.txt
	M			doc/Section_commands.html
	M			doc/Section_commands.txt
	M			doc/Section_errors.html
	M			doc/Section_errors.txt
	M			doc/fix_reax_bonds.html
	M			doc/fix_reax_bonds.txt
	D			doc/fix_reaxc_bonds.html
	D			doc/fix_reaxc_bonds.txt
	M			doc/pair_reax_c.html
	M			doc/pair_reax_c.txt
	M			examples/reax/AB/in.AB
	M			examples/reax/Au_O/in.AuO
	M			examples/reax/CHO/in.CHO
	M			examples/reax/Fe_O_H/in.FeOH3
	M			examples/reax/RDX/in.RDX
	M			examples/reax/V_O_H/in.VOH
	M			examples/reax/Zn_O_H/in.ZnOH2
	M			examples/reax/in.reaxc.rdx
	M			examples/reax/in.reaxc.tatb
	M			src/BODY/body_nparticle.cpp
	M			src/BODY/body_nparticle.h
	M			src/BODY/fix_nve_body.h
	M			src/BODY/pair_body.h
	M			src/CLASS2/pair_lj_class2_coul_long.h
	M			src/COLLOID/pair_colloid.h
	M			src/FLD/pair_brownian.h
	M			src/FLD/pair_brownian_poly.h
	M			src/FLD/pair_lubricate.h
	M			src/FLD/pair_lubricateU.h
	M			src/FLD/pair_lubricateU_poly.h
	M			src/FLD/pair_lubricate_poly.h
	M			src/GPU/pair_born_coul_long_gpu.cpp
	M			src/GPU/pair_born_coul_long_gpu.h
	M			src/GPU/pair_born_coul_wolf_gpu.cpp
	M			src/GPU/pair_born_coul_wolf_gpu.h
	M			src/GPU/pair_born_gpu.cpp
	M			src/GPU/pair_born_gpu.h
	M			src/GPU/pair_colloid_gpu.h
	M			src/GPU/pair_dipole_cut_gpu.h
	M			src/GPU/pair_gauss_gpu.cpp
	M			src/GPU/pair_gauss_gpu.h
	M			src/GPU/pair_yukawa_colloid_gpu.h
	M			src/GPU/pppm_gpu.h
	M			src/KIM/pair_kim.cpp
	M			src/KIM/pair_kim.h
	M			src/KSPACE/ewald.h
	M			src/KSPACE/ewald_disp.cpp
	M			src/KSPACE/ewald_disp.h
	M			src/KSPACE/msm.cpp
	M			src/KSPACE/msm.h
	M			src/KSPACE/msm_cg.h
	M			src/KSPACE/pair_born_coul_long.h
	M			src/KSPACE/pair_buck_coul_long.cpp
	M			src/KSPACE/pair_buck_coul_long.h
	M			src/KSPACE/pair_buck_long_coul_long.cpp
	M			src/KSPACE/pair_buck_long_coul_long.h
	M			src/KSPACE/pair_coul_long.h
	M			src/KSPACE/pair_lj_charmm_coul_long.h
	M			src/KSPACE/pair_lj_cut_coul_long.h
	M			src/KSPACE/pair_lj_cut_tip4p_long.h
	M			src/KSPACE/pair_lj_long_coul_long.cpp
	M			src/KSPACE/pair_lj_long_coul_long.h
	M			src/KSPACE/pair_lj_long_tip4p_long.cpp
	M			src/KSPACE/pair_lj_long_tip4p_long.h
	M			src/KSPACE/pppm.cpp
	M			src/KSPACE/pppm.h
	M			src/KSPACE/pppm_disp.cpp
	M			src/KSPACE/pppm_disp.h
	M			src/KSPACE/pppm_disp_tip4p.h
	M			src/KSPACE/pppm_old.h
	M			src/MC/fix_gcmc.cpp
	M			src/MC/fix_gcmc.h
	M			src/MOLECULE/improper_hybrid.h
	M			src/RIGID/fix_rigid.cpp
	M			src/RIGID/fix_rigid.h
	M			src/RIGID/fix_rigid_nh.cpp
	M			src/RIGID/fix_rigid_nh.h
	M			src/RIGID/fix_rigid_nph.cpp
	M			src/RIGID/fix_rigid_nph.h
	M			src/RIGID/fix_rigid_npt.cpp
	M			src/RIGID/fix_rigid_npt.h
	M			src/RIGID/fix_rigid_nvt.cpp
	M			src/RIGID/fix_rigid_nvt.h
	M			src/RIGID/fix_rigid_small.h
	M			src/SHOCK/fix_append_atoms.cpp
	M			src/SHOCK/fix_append_atoms.h
	M			src/SRD/fix_srd.h
	M			src/USER-REAXC/fix_reaxc_bonds.cpp
	M			src/USER-REAXC/fix_reaxc_bonds.h
	M			src/atom_vec_body.cpp
	M			src/atom_vec_body.h
	M			src/body.h
	M			src/domain.h
	M			src/fix_adapt.h
	M			src/fix_balance.h
	M			src/fix_box_relax.h
	M			src/fix_heat.cpp
	M			src/fix_heat.h
	M			src/fix_move.h
	M			src/fix_nh.cpp
	M			src/fix_nh.h
	M			src/fix_wall.h
	M			src/group.h
	M			src/input.h
	M			src/kspace.h
	M			src/lammps.h
	M			src/library.h
	A			src/my_pool.h
	M			src/neigh_bond.h
	M			src/neighbor.h
	M			src/pair.cpp
	M			src/pair.h
	M			src/pair_coul_dsf.h
	M			src/pair_lj_cut_coul_dsf.h
	M			src/read_data.h
	M			src/read_dump.h
	M			src/region_cylinder.h
	M			src/region_sphere.h
	M			src/variable.h
	M			src/version.h