Diffusion lammps 42ff3a7abaff

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

Authored by Axel Kohlmeyer <akohlmey@gmail.com> on Jul 7 2015, 13:39.

Description

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

Conflicts:
doc/Manual.html
doc/Manual.txt

Details

Committed

Axel Kohlmeyer <akohlmey@gmail.com>

Jul 7 2015, 13:39

Pushed

junge

Oct 6 2016, 16:49

Parents

rLAMMPS217fdbc36076: Added DATE reporting for parameter file
rLAMMPS0449d00dcade: Merge remote-tracking branch 'lammps-ro/master' into lammps-icms

Branches

Unknown

Tags

Unknown

Event Timeline

Axel Kohlmeyer <akohlmey@gmail.com> committed rLAMMPS42ff3a7abaff: Merge remote-tracking branch 'lammps-ro/master' into lammps-icms (authored by Axel Kohlmeyer <akohlmey@gmail.com>).Jul 7 2015, 13:39

Merged Changes

Commit	Author	Details	Committed
217fdbc36076	athomps	Added DATE reporting for parameter file	Jul 6 2015
e60ccb6f9ad3	sjplimp	git-svn-id: svn://svn.icms.temple.edu/lammps-ro/trunk@13533 f3b2605a-c512-4ea7…	Jul 6 2015
819276d7bb7d	sjplimp	git-svn-id: svn://svn.icms.temple.edu/lammps-ro/trunk@13532 f3b2605a-c512-4ea7…	Jul 6 2015
0ab61a40ca21	sjplimp	git-svn-id: svn://svn.icms.temple.edu/lammps-ro/trunk@13531 f3b2605a-c512-4ea7…	Jul 6 2015
fc933f28ff7e	sjplimp	git-svn-id: svn://svn.icms.temple.edu/lammps-ro/trunk@13530 f3b2605a-c512-4ea7…	Jul 6 2015
a0163ac95631	sjplimp	git-svn-id: svn://svn.icms.temple.edu/lammps-ro/trunk@13529 f3b2605a-c512-4ea7…	Jul 6 2015
1cfff7229587	sjplimp	git-svn-id: svn://svn.icms.temple.edu/lammps-ro/trunk@13528 f3b2605a-c512-4ea7…	Jul 6 2015
5aafb054869e	sjplimp	git-svn-id: svn://svn.icms.temple.edu/lammps-ro/trunk@13527 f3b2605a-c512-4ea7…	Jul 6 2015
da4f029cfb52	sjplimp	git-svn-id: svn://svn.icms.temple.edu/lammps-ro/trunk@13526 f3b2605a-c512-4ea7…	Jul 6 2015
4155d707486b	sjplimp	git-svn-id: svn://svn.icms.temple.edu/lammps-ro/trunk@13525 f3b2605a-c512-4ea7…	Jul 6 2015
480fdccae148	sjplimp	git-svn-id: svn://svn.icms.temple.edu/lammps-ro/trunk@13524 f3b2605a-c512-4ea7…	Jul 6 2015
dd8b6a6a6d2f	sjplimp	git-svn-id: svn://svn.icms.temple.edu/lammps-ro/trunk@13522 f3b2605a-c512-4ea7…	Jul 6 2015
5622ae88b41f	sjplimp	git-svn-id: svn://svn.icms.temple.edu/lammps-ro/trunk@13521 f3b2605a-c512-4ea7…	Jul 6 2015
29557ef39319	sjplimp	git-svn-id: svn://svn.icms.temple.edu/lammps-ro/trunk@13519 f3b2605a-c512-4ea7…	Jul 6 2015
a60a08840398	sjplimp	git-svn-id: svn://svn.icms.temple.edu/lammps-ro/trunk@13518 f3b2605a-c512-4ea7…	Jul 6 2015
6f3946bab5e1	sjplimp	git-svn-id: svn://svn.icms.temple.edu/lammps-ro/trunk@13517 f3b2605a-c512-4ea7…	Jul 6 2015
9d3ab0f52f62	sjplimp	git-svn-id: svn://svn.icms.temple.edu/lammps-ro/trunk@13515 f3b2605a-c512-4ea7…	Jul 6 2015

Changes (47)

				Path
	M			bench/Cu_u3.eam
	M			bench/POTENTIALS/in.dpd
	M			doc/Manual.html
	M			doc/Manual.txt
	M			doc/boundary.html
	M			doc/boundary.txt
	M			doc/pair_bop.html
	M			doc/pair_bop.txt
	M			examples/ELASTIC/Si.sw
	M			examples/comb/ffield.comb
	M			examples/comb/ffield.comb3
	M			examples/eim/ffield.eim
	M			examples/meam/Ni.meam
	M			examples/meam/SiC.meam
	M			examples/meam/library.meam
	M			examples/nb3b/MOH.nb3b.harmonic
	M			examples/neb/Si.sw
	M			examples/prd/Si.sw
	M			examples/reax/AB/ffield.reax.AB
	M			examples/reax/AuO/ffield.reax.AuO
	M			examples/reax/CHO/ffield.reax.cho
	M			examples/reax/FC/ffield.reax.FC
	M			examples/reax/FeOH3/ffield.reax.Fe_O_C_H
	M			examples/reax/RDX/ffield.reax.rdx
	M			examples/reax/VOH/ffield.reax.V_O_C_H
	M			examples/reax/ZnOH2/ffield.reax.ZnOH
	M			examples/reax/ffield.reax
	M			examples/shear/Ni_u3.eam
	M			examples/snap/Ta06A.snapcoeff
	M			examples/snap/Ta06A.snapparam
	M			examples/snap/Ta06A_pot.snap
	M			examples/tad/Si.sw
	A			potentials/AlCu.bop.table
	A			potentials/CCu_v1.bop.table
	D			potentials/CdTe.bop
	A			potentials/CuH.bop.table
	D			potentials/GaAs.bop
	M			potentials/README
	M			src/MANYBODY/pair_bop.cpp
	M			src/MANYBODY/pair_bop.h
	M			src/USER-REAXC/pair_reax_c.cpp
	M			src/USER-REAXC/reaxc_ffield.cpp
	M			src/USER-REAXC/reaxc_ffield.h
	M			src/USER-REAXC/reaxc_tool_box.cpp
	M			src/USER-REAXC/reaxc_tool_box.h
	M			src/fix_wall_region.cpp
	M			src/version.h