Diffusion lammps f1118ab41dee

Merge branch 'master' into lammps-icms
f1118ab41dee
Actions

Authored by Axel Kohlmeyer <akohlmey@gmail.com> on Oct 7 2010, 15:59.

Description

Merge branch 'master' into lammps-icms

Details

Committed

Axel Kohlmeyer <akohlmey@gmail.com>

Oct 7 2010, 15:59

Pushed

junge

Oct 6 2016, 16:49

Parents

rLAMMPSdb3d5fa0b5eb: git-svn-id: svn://svn.icms.temple.edu/lammps-ro/trunk@4992 f3b2605a-c512-4ea7…
rLAMMPS767a0d4f60c2: some cleanup and fixes for 64-bit machines.

Branches

Unknown

Tags

Unknown

Event Timeline

Axel Kohlmeyer <akohlmey@gmail.com> committed rLAMMPSf1118ab41dee: Merge branch 'master' into lammps-icms (authored by Axel Kohlmeyer <akohlmey@gmail.com>).Oct 7 2010, 15:59

Merged Changes

Commit	Author	Details	Committed
db3d5fa0b5eb	sjplimp	git-svn-id: svn://svn.icms.temple.edu/lammps-ro/trunk@4992 f3b2605a-c512-4ea7…	Oct 7 2010
f1fee8d3e08d	sjplimp	git-svn-id: svn://svn.icms.temple.edu/lammps-ro/trunk@4991 f3b2605a-c512-4ea7…	Oct 7 2010
a4ef8e330f1c	sjplimp	git-svn-id: svn://svn.icms.temple.edu/lammps-ro/trunk@4990 f3b2605a-c512-4ea7…	Oct 7 2010
fb3c30a824bf	sjplimp	git-svn-id: svn://svn.icms.temple.edu/lammps-ro/trunk@4989 f3b2605a-c512-4ea7…	Oct 7 2010
53c01eb3238b	sjplimp	git-svn-id: svn://svn.icms.temple.edu/lammps-ro/trunk@4988 f3b2605a-c512-4ea7…	Oct 7 2010
7e8eb70e448e	sjplimp	git-svn-id: svn://svn.icms.temple.edu/lammps-ro/trunk@4987 f3b2605a-c512-4ea7…	Oct 6 2010
8bec33642409	sjplimp	git-svn-id: svn://svn.icms.temple.edu/lammps-ro/trunk@4986 f3b2605a-c512-4ea7…	Oct 6 2010
19504bd84769	sjplimp	git-svn-id: svn://svn.icms.temple.edu/lammps-ro/trunk@4984 f3b2605a-c512-4ea7…	Oct 6 2010
98f408427d0e	sjplimp	git-svn-id: svn://svn.icms.temple.edu/lammps-ro/trunk@4983 f3b2605a-c512-4ea7…	Oct 6 2010
e10badba4226	sjplimp	git-svn-id: svn://svn.icms.temple.edu/lammps-ro/trunk@4982 f3b2605a-c512-4ea7…	Oct 6 2010
a769d03a248a	sjplimp	git-svn-id: svn://svn.icms.temple.edu/lammps-ro/trunk@4981 f3b2605a-c512-4ea7…	Oct 6 2010
fdeead676d98	sjplimp	git-svn-id: svn://svn.icms.temple.edu/lammps-ro/trunk@4980 f3b2605a-c512-4ea7…	Oct 6 2010
50af532aa8e1	sjplimp	git-svn-id: svn://svn.icms.temple.edu/lammps-ro/trunk@4979 f3b2605a-c512-4ea7…	Oct 6 2010
397f967521f4	sjplimp	git-svn-id: svn://svn.icms.temple.edu/lammps-ro/trunk@4978 f3b2605a-c512-4ea7…	Oct 6 2010
af9d8dd1a00f	sjplimp	git-svn-id: svn://svn.icms.temple.edu/lammps-ro/trunk@4976 f3b2605a-c512-4ea7…	Oct 6 2010
ecbd64b0627f	sjplimp	git-svn-id: svn://svn.icms.temple.edu/lammps-ro/trunk@4975 f3b2605a-c512-4ea7…	Oct 6 2010

Changes (20)

				Path
	M			doc/neb.html
	M			doc/neb.txt
	M			doc/variable.html
	M			doc/variable.txt
	M			examples/neb/README
	M			examples/neb/in.neb.hop1
	M			examples/neb/in.neb.hop2
	M			examples/neb/log.neb.hop1.10Sep10.linux.4
	M			examples/neb/log.neb.hop2.10Sep10.linux.4
	M			lib/meam/meam_dens_init.F
	M			src/REPLICA/neb.cpp
	M			src/min.h
	M			src/variable.cpp
	M			src/variable.h
	M			src/version.h
	M			tools/python/README
	D			tools/python/neb1.py
	D			tools/python/neb2.py
	A			tools/python/neb_combine.py
	A			tools/python/neb_final.py