Diffusion lammps 6c80e2cc59f1

Merge remote-tracking branch 'lammps-ro/master' into lammps-icms
6c80e2cc59f1
Actions

Authored by Axel Kohlmeyer <akohlmey@gmail.com> on May 13 2016, 12:15.

Description

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

Details

Committed

Axel Kohlmeyer <akohlmey@gmail.com>

May 13 2016, 12:15

Pushed

junge

Oct 6 2016, 16:49

Parents

rLAMMPS74052b0b86a7: git-svn-id: svn://svn.icms.temple.edu/lammps-ro/trunk@15053 f3b2605a-c512-4ea7…
rLAMMPS48d18b8d1f1d: rewrite documentation of purpose of the weighting factor in CHARMM dihedrals

Branches

Unknown

Tags

Unknown

Event Timeline

Axel Kohlmeyer <akohlmey@gmail.com> committed rLAMMPS6c80e2cc59f1: Merge remote-tracking branch 'lammps-ro/master' into lammps-icms (authored by Axel Kohlmeyer <akohlmey@gmail.com>).May 13 2016, 12:15

Merged Changes

Commit	Author	Details	Committed
74052b0b86a7	sjplimp	git-svn-id: svn://svn.icms.temple.edu/lammps-ro/trunk@15053 f3b2605a-c512-4ea7…	May 12 2016
8976a2ffff91	sjplimp	git-svn-id: svn://svn.icms.temple.edu/lammps-ro/trunk@15052 f3b2605a-c512-4ea7…	May 12 2016
87e06310cb52	sjplimp	git-svn-id: svn://svn.icms.temple.edu/lammps-ro/trunk@15051 f3b2605a-c512-4ea7…	May 12 2016
62b95b6b34f4	sjplimp	git-svn-id: svn://svn.icms.temple.edu/lammps-ro/trunk@15050 f3b2605a-c512-4ea7…	May 12 2016
7ce9b111ebe1	sjplimp	git-svn-id: svn://svn.icms.temple.edu/lammps-ro/trunk@15046 f3b2605a-c512-4ea7…	May 12 2016
f4d70092040b	sjplimp	git-svn-id: svn://svn.icms.temple.edu/lammps-ro/trunk@15045 f3b2605a-c512-4ea7…	May 12 2016
3fc88d920587	sjplimp	git-svn-id: svn://svn.icms.temple.edu/lammps-ro/trunk@15044 f3b2605a-c512-4ea7…	May 12 2016
58befb3a2e39	sjplimp	git-svn-id: svn://svn.icms.temple.edu/lammps-ro/trunk@15043 f3b2605a-c512-4ea7…	May 12 2016
b013a4096541	sjplimp	git-svn-id: svn://svn.icms.temple.edu/lammps-ro/trunk@15042 f3b2605a-c512-4ea7…	May 12 2016
9653976f05e6	sjplimp	git-svn-id: svn://svn.icms.temple.edu/lammps-ro/trunk@15041 f3b2605a-c512-4ea7…	May 12 2016
212f64d2f16f	sjplimp	git-svn-id: svn://svn.icms.temple.edu/lammps-ro/trunk@15040 f3b2605a-c512-4ea7…	May 12 2016
c3a95c782bd6	sjplimp	git-svn-id: svn://svn.icms.temple.edu/lammps-ro/trunk@15039 f3b2605a-c512-4ea7…	May 12 2016
dfb0f528c09a	sjplimp	git-svn-id: svn://svn.icms.temple.edu/lammps-ro/trunk@15038 f3b2605a-c512-4ea7…	May 12 2016

Changes (50)

				Path
	M			doc/html/Section_howto.html
	M			doc/html/Section_packages.html
	M			doc/html/_sources/Section_howto.txt
	M			doc/html/_sources/Section_packages.txt
	M			doc/html/_sources/angle_cosine_shift.txt
	M			doc/html/_sources/angle_cosine_shift_exp.txt
	M			doc/html/_sources/angle_dipole.txt
	M			doc/html/_sources/bond_harmonic_shift_cut.txt
	M			doc/html/_sources/dihedral_cosine_shift_exp.txt
	M			doc/html/_sources/fix_lb_fluid.txt
	M			doc/html/_sources/fix_ti_rs.txt
	M			doc/html/_sources/neb.txt
	M			doc/html/_sources/pair_body.txt
	M			doc/html/_sources/pair_bop.txt
	M			doc/html/_sources/pair_coul_diel.txt
	M			doc/html/_sources/pair_gauss.txt
	M			doc/html/_sources/pair_list.txt
	M			doc/html/_sources/pair_lubricate.txt
	M			doc/html/_sources/pair_lubricateU.txt
	M			doc/html/_sources/pair_meam.txt
	M			doc/html/_sources/pair_smtbq.txt
	M			doc/html/_sources/pair_sph_idealgas.txt
	M			doc/html/_sources/pair_sph_taitwater.txt
	M			doc/html/angle_cosine_shift.html
	M			doc/html/angle_cosine_shift_exp.html
	M			doc/html/angle_dipole.html
	M			doc/html/bond_harmonic_shift_cut.html
	M			doc/html/dihedral_cosine_shift_exp.html
	M			doc/html/fix_lb_fluid.html
	M			doc/html/fix_ti_rs.html
	M			doc/html/neb.html
	M			doc/html/pair_body.html
	M			doc/html/pair_bop.html
	M			doc/html/pair_coul_diel.html
	M			doc/html/pair_gauss.html
	M			doc/html/pair_list.html
	M			doc/html/pair_lubricate.html
	M			doc/html/pair_lubricateU.html
	M			doc/html/pair_meam.html
	M			doc/html/pair_smtbq.html
	M			doc/html/pair_sph_idealgas.html
	M			doc/html/pair_sph_lj.html
	M			doc/html/pair_sph_taitwater.html
	M			doc/html/searchindex.js
	M			doc/lammps.book
	M			doc/src/Section_packages.txt
	M			doc/src/pair_sph_idealgas.txt
	P			examples/USER/manifold/virus/vir.in Copied from examples/USER/manifold/virus/virus.in
	M			src/USER-DPD/atom_vec_dpd.cpp
	M			src/USER-DPD/atom_vec_dpd.h