Diffusion lammps b99c3da7ad97

Merge branch 'master' into lammps-icms
b99c3da7ad97
Actions

Authored by Axel Kohlmeyer <akohlmey@gmail.com> on Jul 4 2012, 14:43.

Description

Merge branch 'master' into lammps-icms

Details

Committed

Axel Kohlmeyer <akohlmey@gmail.com>

Jul 4 2012, 14:43

Pushed

junge

Oct 6 2016, 16:49

Parents

rLAMMPS7a388da069df: git-svn-id: svn://svn.icms.temple.edu/lammps-ro/trunk@8475 f3b2605a-c512-4ea7…
rLAMMPS8be34761c8cb: include bugfix from tom coles.

Branches

Unknown

Tags

Unknown

Event Timeline

Axel Kohlmeyer <akohlmey@gmail.com> committed rLAMMPSb99c3da7ad97: Merge branch 'master' into lammps-icms (authored by Axel Kohlmeyer <akohlmey@gmail.com>).Jul 4 2012, 14:43

Merged Changes

Commit	Author	Details	Committed
7a388da069df	sjplimp	git-svn-id: svn://svn.icms.temple.edu/lammps-ro/trunk@8475 f3b2605a-c512-4ea7…	Jul 4 2012
e86cb77378e8	athomps	Updated error message in fix nvt/npt/nph	Jul 4 2012
194d503cd3a8	athomps	Updated error message in fix nvt/npt/nph	Jul 4 2012
c89a12ff717e	athomps	Added tilt factor scaling and fixed-point features to fix box/relax	Jul 4 2012
959f12463b2c	athomps	Added tilt factor scaling and fixed-point features to fix box/relax	Jul 4 2012
f3404420e445	sjplimp	git-svn-id: svn://svn.icms.temple.edu/lammps-ro/trunk@8469 f3b2605a-c512-4ea7…	Jul 4 2012
5a6c205b6f99	pscrozi	Adding in a new slab option for Jeremy Templeton. Invoked by "kspace_modify…	Jul 3 2012
4a0601f8751e	pscrozi	Adding in a new slab option for Jeremy Templeton. Invoked by "kspace_modify…	Jul 3 2012
56ca4db42cd2	pscrozi	Improved rms force error estimate for coulomb tables. Now takes into…	Jul 3 2012
93adc50c750c	sjplimp	git-svn-id: svn://svn.icms.temple.edu/lammps-ro/trunk@8462 f3b2605a-c512-4ea7…	Jul 3 2012

Changes (106)
Show All Changes

Very Large Commit

This commit is very large. Load each file individually.

		Path
A	(dir)	bench/GPU/
A		bench/GPU/README
A		bench/GPU/in.eam.cpu
A		bench/GPU/in.eam.cuda
A		bench/GPU/in.eam.gpu
A		bench/GPU/in.lj.cpu
A		bench/GPU/in.lj.cuda
A		bench/GPU/in.lj.gpu
A		bench/GPU/in.rhodo.cpu
A		bench/GPU/in.rhodo.cuda
A		bench/GPU/in.rhodo.gpu
A	(dir)	bench/POTENTIALS/
A		bench/POTENTIALS/CH.airebo
A		bench/POTENTIALS/CdTe.bop
A		bench/POTENTIALS/Cu_u3.eam
A		bench/POTENTIALS/Ni.adp
A		bench/POTENTIALS/Ni.meam
A		bench/POTENTIALS/README
A		bench/POTENTIALS/Si.sw
A		bench/POTENTIALS/Si.tersoff
A		bench/POTENTIALS/ffield.comb
A		bench/POTENTIALS/ffield.eim
A		bench/POTENTIALS/ffield.reax
A		bench/POTENTIALS/in.adp
A		bench/POTENTIALS/in.airebo
A		bench/POTENTIALS/in.bop
A		bench/POTENTIALS/in.comb
A		bench/POTENTIALS/in.dpd
A		bench/POTENTIALS/in.eam
A		bench/POTENTIALS/in.eff
A		bench/POTENTIALS/in.eim
A		bench/POTENTIALS/in.fene
A		bench/POTENTIALS/in.gb
A		bench/POTENTIALS/in.granular
A		bench/POTENTIALS/in.lj
A		bench/POTENTIALS/in.meam
A		bench/POTENTIALS/in.peri
A		bench/POTENTIALS/in.protein
A		bench/POTENTIALS/in.reax
A		bench/POTENTIALS/in.reaxc
A		bench/POTENTIALS/in.rebo
A		bench/POTENTIALS/in.spce
A		bench/POTENTIALS/in.sw
A		bench/POTENTIALS/in.tersoff
A		bench/POTENTIALS/library.meam
A		bench/POTENTIALS/log.26Jun12.adp.1
A		bench/POTENTIALS/log.26Jun12.adp.4
A		bench/POTENTIALS/log.26Jun12.airebo.1
A		bench/POTENTIALS/log.26Jun12.airebo.4
A		bench/POTENTIALS/log.26Jun12.bop.1
A		bench/POTENTIALS/log.26Jun12.bop.4
A		bench/POTENTIALS/log.26Jun12.comb.1
A		bench/POTENTIALS/log.26Jun12.comb.4
A		bench/POTENTIALS/log.26Jun12.dpd.1
A		bench/POTENTIALS/log.26Jun12.dpd.4
A		bench/POTENTIALS/log.26Jun12.eam.1
A		bench/POTENTIALS/log.26Jun12.eam.4
A		bench/POTENTIALS/log.26Jun12.eff.1
A		bench/POTENTIALS/log.26Jun12.eff.4
A		bench/POTENTIALS/log.26Jun12.eim.1
A		bench/POTENTIALS/log.26Jun12.eim.4
A		bench/POTENTIALS/log.26Jun12.fene.1
A		bench/POTENTIALS/log.26Jun12.fene.4
A		bench/POTENTIALS/log.26Jun12.gb.1
A		bench/POTENTIALS/log.26Jun12.gb.4
A		bench/POTENTIALS/log.26Jun12.granular.1
A		bench/POTENTIALS/log.26Jun12.granular.4
A		bench/POTENTIALS/log.26Jun12.lj.1
A		bench/POTENTIALS/log.26Jun12.lj.4
A		bench/POTENTIALS/log.26Jun12.meam.1
A		bench/POTENTIALS/log.26Jun12.meam.4
A		bench/POTENTIALS/log.26Jun12.peri.1
A		bench/POTENTIALS/log.26Jun12.peri.4
A		bench/POTENTIALS/log.26Jun12.protein.1
A		bench/POTENTIALS/log.26Jun12.protein.4
A		bench/POTENTIALS/log.26Jun12.reax.1
A		bench/POTENTIALS/log.26Jun12.reax.4
A		bench/POTENTIALS/log.26Jun12.reaxc.1
A		bench/POTENTIALS/log.26Jun12.reaxc.4
A		bench/POTENTIALS/log.26Jun12.rebo.1
A		bench/POTENTIALS/log.26Jun12.rebo.4
A		bench/POTENTIALS/log.26Jun12.spce.1
A		bench/POTENTIALS/log.26Jun12.spce.4
A		bench/POTENTIALS/log.26Jun12.sw.1
A		bench/POTENTIALS/log.26Jun12.sw.4
A		bench/POTENTIALS/log.26Jun12.tersoff.1
A		bench/POTENTIALS/log.26Jun12.tersoff.4
A		bench/POTENTIALS/reax_defs.h
M		bench/README
M		doc/dihedral_style.html
M		doc/dihedral_style.txt
M		doc/fix_box_relax.html
M		doc/fix_box_relax.txt
M		doc/fix_nh.html
M		doc/fix_nh.txt
M		doc/kspace_modify.html
M		doc/kspace_modify.txt
M		src/KSPACE/ewald.cpp
M		src/KSPACE/pppm.cpp
M		src/fix_box_relax.cpp
M		src/fix_box_relax.h
M		src/fix_nh.cpp
M		src/fix_nh.h
M		src/kspace.cpp
M		src/kspace.h
M		src/version.h