Diffusion lammps 783142ff2e17

Merge branch 'master' into lammps-icms
783142ff2e17
Actions

Authored by Axel Kohlmeyer <akohlmey@gmail.com> on Jan 31 2012, 14:38.

Description

Merge branch 'master' into lammps-icms

Details

Committed

Axel Kohlmeyer <akohlmey@gmail.com>

Jan 31 2012, 14:38

Pushed

junge

Oct 6 2016, 16:49

Parents

rLAMMPS32dba78215df: git-svn-id: svn://svn.icms.temple.edu/lammps-ro/trunk@7618 f3b2605a-c512-4ea7…
rLAMMPScae4ecf1fc72: remove backup file from repo

Branches

Unknown

Tags

Unknown

Event Timeline

Axel Kohlmeyer <akohlmey@gmail.com> committed rLAMMPS783142ff2e17: Merge branch 'master' into lammps-icms (authored by Axel Kohlmeyer <akohlmey@gmail.com>).Jan 31 2012, 14:38

Merged Changes

Commit	Author	Details	Committed
32dba78215df	sjplimp	git-svn-id: svn://svn.icms.temple.edu/lammps-ro/trunk@7618 f3b2605a-c512-4ea7…	Jan 31 2012
a6a995940fa1	sjplimp	git-svn-id: svn://svn.icms.temple.edu/lammps-ro/trunk@7617 f3b2605a-c512-4ea7…	Jan 31 2012
8149b411038d	sjplimp	git-svn-id: svn://svn.icms.temple.edu/lammps-ro/trunk@7616 f3b2605a-c512-4ea7…	Jan 31 2012
670b92333d13	sjplimp	git-svn-id: svn://svn.icms.temple.edu/lammps-ro/trunk@7615 f3b2605a-c512-4ea7…	Jan 31 2012
5ffc4b9bc138	sjplimp	git-svn-id: svn://svn.icms.temple.edu/lammps-ro/trunk@7614 f3b2605a-c512-4ea7…	Jan 31 2012
17f864c4813f	sjplimp	git-svn-id: svn://svn.icms.temple.edu/lammps-ro/trunk@7613 f3b2605a-c512-4ea7…	Jan 31 2012
80e8507fd93b	sjplimp	git-svn-id: svn://svn.icms.temple.edu/lammps-ro/trunk@7612 f3b2605a-c512-4ea7…	Jan 31 2012
12659b418f38	sjplimp	git-svn-id: svn://svn.icms.temple.edu/lammps-ro/trunk@7611 f3b2605a-c512-4ea7…	Jan 30 2012
07973688a3ac	sjplimp	git-svn-id: svn://svn.icms.temple.edu/lammps-ro/trunk@7610 f3b2605a-c512-4ea7…	Jan 30 2012
a1d98696c493	sjplimp	git-svn-id: svn://svn.icms.temple.edu/lammps-ro/trunk@7609 f3b2605a-c512-4ea7…	Jan 30 2012
04407d4f15ca	sjplimp	git-svn-id: svn://svn.icms.temple.edu/lammps-ro/trunk@7608 f3b2605a-c512-4ea7…	Jan 30 2012
0e1c7f13a1da	sjplimp	git-svn-id: svn://svn.icms.temple.edu/lammps-ro/trunk@7607 f3b2605a-c512-4ea7…	Jan 30 2012
152112d85a69	sjplimp	git-svn-id: svn://svn.icms.temple.edu/lammps-ro/trunk@7606 f3b2605a-c512-4ea7…	Jan 30 2012
da9de9438566	sjplimp	git-svn-id: svn://svn.icms.temple.edu/lammps-ro/trunk@7605 f3b2605a-c512-4ea7…	Jan 30 2012

Changes (34)

		Path
M		doc/Section_commands.html
M		doc/Section_commands.txt
A		doc/pair_kim.html
A		doc/pair_kim.txt
M		examples/README
A	(dir)	examples/kim/
P		examples/kim/Cu_u3.eam Copied from bench/Cu_u3.eam
P		examples/kim/in.kim.eam Copied from examples/USER/openmp/in.eam-omp
P		examples/kim/in.kim.eam.lmp Copied from examples/USER/openmp/in.eam
A		examples/kim/in.kim.lj
A		examples/kim/in.kim.lj.lmp
M		lib/README
A	(dir)	lib/kim/
A		lib/kim/Makefile.lammps
A		lib/kim/README
M		src/GPU/Install.sh
A	(dir)	src/KIM/
A		src/KIM/Install.sh
A		src/KIM/pair_kim.cpp
A		src/KIM/pair_kim.h
M		src/MEAM/Install.sh
M		src/Makefile
M		src/POEMS/Install.sh
M		src/REAX/Install.sh
M		src/USER-ATC/Install.sh
M		src/USER-AWPMD/Install.sh
M		src/USER-CUDA/Install.sh
M		src/comm.cpp
M		src/fix_deform.cpp
M		src/fix_deform.h
M		src/fix_efield.cpp
M		src/pair.cpp
M		src/pair.h
M		src/pair_hybrid.cpp