Merge branch 'master' into USER-DPD_kokkos as of patch 13Feb17
96a43e8ef1a4
Actions

Authored by Tim Mattox <timothy.mattox@engilitycorp.com> on Feb 13 2017, 18:29.

Description

Merge branch 'master' into USER-DPD_kokkos as of patch 13Feb17

Committed

Tim Mattox <timothy.mattox@engilitycorp.com>

Feb 13 2017, 18:29

Pushed

junge

Oct 19 2017, 09:53

Parents

Branches

Unknown

Tags

Unknown

Tim Mattox <timothy.mattox@engilitycorp.com> committed rLAMMPS96a43e8ef1a4: Merge branch 'master' into USER-DPD_kokkos as of patch 13Feb17 (authored by Tim Mattox <timothy.mattox@engilitycorp.com>).Feb 13 2017, 18:29

Commit	Author	Details	Committed
cb982f2f28ab	Steve Plimpton	sync 13Feb17 patch back to GH	Feb 13 2017
4843296d4e57	sjplimp/GitHub	Merge pull request #372 from akohlmey/fft-cleanup	Feb 13 2017
2bdda8f6c013	Steve Plimpton	patch 12Feb17 - change int to tagint for compute group/group	Feb 13 2017
0068ef56168f	Steve Plimpton	added molecule option to compute group/group command	Feb 10 2017
02b0e6cc55ab	sjplimp/GitHub	Merge pull request #375 from akohlmey/small-updates-and-fixes	Feb 10 2017
fbb24c2406d3	sjplimp/GitHub	Merge pull request #374 from agiliopadua/master	Feb 10 2017
a5f830c40c6e	Axel Kohlmeyer	fix typo	Feb 8 2017
8c074a363ae8	Axel Kohlmeyer	Merge branch 'master' into small-updates-and-fixes	Feb 8 2017
27aca14094e9	Agilio Padua	Updated polarizer.py to use coul/long/cs	Feb 4 2017
191453e1c73d	Axel Kohlmeyer	Merge branch 'master' into fft-cleanup	Feb 3 2017
6595fde0a18b	Axel Kohlmeyer	explain in more detail the handling of error checking for numerical inputs	Feb 2 2017
9d1991bf840c	Axel Kohlmeyer	remove support for obsolete legacy FFT libraries and point -DFFT_FFTW to FFTW3	Feb 2 2017

				Path
	M			doc/src/Manual.txt
	M			doc/src/Section_commands.txt
	M			doc/src/Section_errors.txt
	M			doc/src/Section_start.txt
	M			doc/src/compute_group_group.txt
	M			doc/src/compute_rdf.txt
	M			examples/VISCOSITY/in.einstein.2d
	V			examples/coreshell/{log.9Nov16.coreshell.dsf.1 → log.9Nov16.coreshell.dsf.g++.1}
	V			examples/coreshell/{log.9Nov16.coreshell.dsf.g++.1 ← log.9Nov16.coreshell.dsf.1}
	A			examples/coreshell/log.9Nov16.coreshell.dsf.g++.4
	A			potentials/Ge.tersoff
	M			src/GRANULAR/fix_wall_gran_region.cpp
	M			src/GRANULAR/pair_gran_hooke_history.cpp
	M			src/GRANULAR/pair_gran_hooke_history.h
	M			src/KOKKOS/pair_tersoff_mod_kokkos.cpp
	M			src/KSPACE/fft3d.cpp
	M			src/KSPACE/fft3d.h
	M			src/MAKE/MACHINES/Makefile.bgl
	M			src/MAKE/MACHINES/Makefile.bgq
	M			src/MAKE/MACHINES/Makefile.bgq.details
	M			src/MAKE/MACHINES/Makefile.chama
	M			src/MAKE/MACHINES/Makefile.cygwin
	M			src/MAKE/MACHINES/Makefile.glory
	M			src/MAKE/MACHINES/Makefile.mac
	M			src/MAKE/MACHINES/Makefile.mac_mpi
	M			src/MAKE/MACHINES/Makefile.power
	M			src/MAKE/MACHINES/Makefile.redsky
	M			src/MAKE/MACHINES/Makefile.storm
	M			src/MAKE/MACHINES/Makefile.tacc
	M			src/MAKE/MACHINES/Makefile.xe6
	M			src/MAKE/MACHINES/Makefile.xt3
	M			src/MAKE/MACHINES/Makefile.xt5
	M			src/USER-MISC/dihedral_nharmonic.cpp
	M			src/compute_group_group.cpp
	M			src/compute_group_group.h
	M			src/fix.cpp
	M			src/pair_buck.cpp
	M			src/version.h
	M			tools/drude/polarizer.py