Merge pull request #487 from akohlmey/pair_edip_multi_element
5d38cbbce9c6
Actions

Authored by sjplimp <sjplimp@sandia.gov> on May 18 2017, 17:13.

Description

Merge pull request #487 from akohlmey/pair_edip_multi_element

Import multi-element compatible pair style edip as edip/multi

Committed

GitHub <noreply@github.com>

May 18 2017, 17:13

Pushed

junge

Oct 19 2017, 09:53

Parents

Branches

Unknown

Tags

Unknown

Commit	Author	Details	Committed
4b1914aa1f29	Axel Kohlmeyer	update citations for multi-element edip potential	May 18 2017
8936b99e9f89	Axel Kohlmeyer	add contributed SiC.edip potential file	May 17 2017
35e92733e9da	Axel Kohlmeyer	import multi-element compatible pair style edip as edip/multi	May 16 2017

		Path
M		doc/src/Section_commands.txt
M		doc/src/pair_edip.txt
A	(dir)	examples/USER/misc/edip/
P		examples/USER/misc/edip/Si.edip Copied from potentials/Si.edip
A		examples/USER/misc/edip/SiC.edip
P		examples/USER/misc/edip/data.SiC Copied from examples/meam/data.meam
P		examples/USER/misc/edip/in.edip-Si Copied from examples/prd/in.prd
P		examples/USER/misc/edip/in.edip-Si-multi Copied from examples/prd/in.prd
P		examples/USER/misc/edip/in.edip-SiC Copied from examples/meam/in.meam
A		examples/USER/misc/edip/log.4May2017.g++.edip-Si-multi.1
A		examples/USER/misc/edip/log.4May2017.g++.edip-Si-multi.4
A		examples/USER/misc/edip/log.4May2017.g++.edip-Si.1
A		examples/USER/misc/edip/log.4May2017.g++.edip-Si.4
A		examples/USER/misc/edip/log.4May2017.g++.edip-SiC.1
A		examples/USER/misc/edip/log.4May2017.g++.edip-SiC.4
A		potentials/SiC.edip
M		src/.gitignore
M		src/USER-MISC/pair_edip.cpp
A		src/USER-MISC/pair_edip_multi.cpp
A		src/USER-MISC/pair_edip_multi.h