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

Authored by Axel Kohlmeyer <akohlmey@gmail.com> on Jun 11 2014, 12:15.

Description

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

Committed

Axel Kohlmeyer <akohlmey@gmail.com>

Jun 11 2014, 12:15

Pushed

junge

Oct 6 2016, 16:49

Parents

Branches

Unknown

Tags

Unknown

Commit	Author	Details	Committed
eabfaf18ec17	sjplimp	git-svn-id: svn://svn.icms.temple.edu/lammps-ro/trunk@12117 f3b2605a-c512-4ea7…	Jun 11 2014
abf916584832	sjplimp	git-svn-id: svn://svn.icms.temple.edu/lammps-ro/trunk@12116 f3b2605a-c512-4ea7…	Jun 11 2014
5e1cc8e250cf	sjplimp	git-svn-id: svn://svn.icms.temple.edu/lammps-ro/trunk@12115 f3b2605a-c512-4ea7…	Jun 11 2014
b9eb6f0afaa8	athomps	git-svn-id: svn://svn.icms.temple.edu/lammps-ro/trunk@12114 f3b2605a-c512-4ea7…	Jun 10 2014
7e1c6ccfac6f	stamoor	Fixing more broken USER-EFF examples	Jun 10 2014
2642b7d3a55f	sjplimp	git-svn-id: svn://svn.icms.temple.edu/lammps-ro/trunk@12112 f3b2605a-c512-4ea7…	Jun 10 2014
d37745fa1b9c	sjplimp	git-svn-id: svn://svn.icms.temple.edu/lammps-ro/trunk@12111 f3b2605a-c512-4ea7…	Jun 10 2014
fcb81d2b48e5	stamoor	Fixing broken USER-EFF examples	Jun 10 2014
00db690e6437	stamoor	Updating USER-EFF examples to use compute property/atom	Jun 10 2014
e9bcfbbaea55	sjplimp	git-svn-id: svn://svn.icms.temple.edu/lammps-ro/trunk@12108 f3b2605a-c512-4ea7…	Jun 10 2014
28b9fa375408	sjplimp	git-svn-id: svn://svn.icms.temple.edu/lammps-ro/trunk@12107 f3b2605a-c512-4ea7…	Jun 10 2014

				Path
	M			doc/pair_style.html
	M			doc/pair_style.txt
	M			doc/run.html
	M			doc/run.txt
	M			examples/USER/eff/Auger-Adamantane/in.adamantane_ionized.nve
	M			examples/USER/eff/Be-solid/in.Be-solid.spe
	M			examples/USER/eff/CH4/in.ch4.dynamics
	M			examples/USER/eff/CH4/in.ch4.min
	M			examples/USER/eff/CH4/in.ch4_ionized.dynamics
	M			examples/USER/eff/ECP/Si2H6/in.Si2H6
	M			examples/USER/eff/ECP/Si2H6/in.Si2H6.ang
	M			examples/USER/eff/ECP/SiC/bulk/in.SiC
	M			examples/USER/eff/ECP/SiH4/in.SiH4
	M			examples/USER/eff/ECP/SiH4/in.SiH4.ang
	M			examples/USER/eff/H/in.h_atom.spe.ang
	M			examples/USER/eff/H2/in.h2
	M			examples/USER/eff/H_plasma/in.h2bulk.npt
	M			examples/USER/eff/H_plasma/in.h2bulk.nve
	M			examples/USER/eff/H_plasma/in.h2bulk.nve.ang
	M			examples/USER/eff/Li-dendritic/in.Li-dendritic.min
	M			examples/USER/eff/Li-dendritic/in.Li-dendritic.nvt
	M			examples/USER/eff/Li-solid/in.Li.ang
	M			examples/USER/eff/Li-solid/in.Li.bohr
	M			examples/USER/eff/fixed-core/C2H6/in.C2H6fc.ang
	M			examples/USER/eff/fixed-core/C2H6/in.C2H6fc.bohr
	M			examples/USER/eff/fixed-core/CH4/in.CH4fc.ang
	M			examples/USER/eff/fixed-core/CH4/in.CH4fc.bohr
	M			examples/USER/eff/fixed-core/CH4/in.CH4fc.spe.ang
	M			examples/USER/eff/fixed-core/CH4/in.CH4fc.spe.bohr
	M			src/KOKKOS/verlet_kokkos.cpp
	M			src/MOLECULE/improper_umbrella.cpp
	M			src/MOLECULE/improper_umbrella.h
	M			src/fix_ave_spatial.cpp
	M			src/neigh_request.cpp
	M			src/neighbor.cpp