Diffusion lammps f3c591960603

Merge remote branch 'upstream/master' into USER-DPD_kokkos
f3c591960603
Actions

Authored by Stan Moore <stanmoore1@gmail.com> on Jan 27 2017, 16:08.

Description

Merge remote branch 'upstream/master' into USER-DPD_kokkos

Details

Committed

Stan Moore <stanmoore1@gmail.com>

Jan 27 2017, 16:08

Pushed

junge

Oct 19 2017, 09:53

Parents

rLAMMPSebe27c65e186: Removing duplicate code in pair_exp6_rx_kokkos
rLAMMPSf8506fee23e1: sync GHub with SVN

Branches

Unknown

Tags

Unknown

Event Timeline

Stan Moore <stanmoore1@gmail.com> committed rLAMMPSf3c591960603: Merge remote branch 'upstream/master' into USER-DPD_kokkos (authored by Stan Moore <stanmoore1@gmail.com>).Jan 27 2017, 16:08

Merged Changes

Commit	Author	Details	Committed
f8506fee23e1	Steve Plimpton	sync GHub with SVN	Jan 26 2017
18e55843113a	sjplimp/GitHub	Merge pull request #354 from stanmoore1/kokkos_bugfixes	Jan 26 2017
851f80464fd2	sjplimp/GitHub	Merge pull request #361 from akohlmey/user-omp-fix-per-atom-data	Jan 26 2017
5971d4c9948c	sjplimp/GitHub	Merge pull request #358 from ibaned/warnings	Jan 26 2017
868d95f0a500	sjplimp/GitHub	Merge pull request #352 from akohlmey/fix-skip-with-ghost-issue	Jan 26 2017
a5ff35435a4e	sjplimp/GitHub	Merge pull request #351 from timattox/USER-DPD_pair_exp6_bugfix	Jan 26 2017
8b7bd9d88eb4	Axel Kohlmeyer	fix bug where per atom data for USER-OMP was reducing the wrong arrays with…	Jan 26 2017
672bbbe494df	Dan Ibanez	add more missing KOKKOS_INLINE_FUNCTION attributes	Jan 26 2017
03c9c4653386	Dan Ibanez	add missing KOKKOS_INLINE_FUNCTION attributes	Jan 25 2017
e992bfe510b5	Dan Ibanez	remove unused variable	Jan 25 2017
053ee54a274c	Dan Ibanez	remove unused variable	Jan 25 2017
1074c6734be5	Dan Ibanez	add missing return keywords	Jan 25 2017
60b48c9d661f	Dan Ibanez	add missing KOKKOS_INLINE_FUNCTION attributes	Jan 25 2017
3d40b5170868	Dan Ibanez	remove unused variable	Jan 25 2017
effbe18c466f	Dan Ibanez	fix domain boundary indexing	Jan 25 2017
6328beb7d791	Dan Ibanez	fix double-return warning	Jan 25 2017
26c8d3d98f47	Stan Moore	Fixing GPU memory issue in fix_langevin_kokkos	Jan 25 2017
73177d650de3	Stan Moore	Fixing GPU memory issue in domain_kokkos	Jan 25 2017
b5cb74bd3343	Axel Kohlmeyer	skip list build is compatible with NP_GHOST	Jan 24 2017
31976d1dee2d	Axel Kohlmeyer	skip list definition was missing NP_HALFFULL flag	Jan 24 2017
c8260af37cc0	Christopher Stone	Possible uninitialized variable in USER-DPD/pair_exp6_rx.cpp bugfix.	Jan 23 2017

Changes (30)

				Path
	M			doc/src/Manual.txt
	A			potentials/WL.meam
	M			src/KOKKOS/domain_kokkos.cpp
	M			src/KOKKOS/fix_langevin_kokkos.cpp
	M			src/KOKKOS/math_special_kokkos.h
	M			src/KOKKOS/neighbor_kokkos.cpp
	M			src/KOKKOS/pair_buck_coul_cut_kokkos.h
	M			src/KOKKOS/pair_buck_coul_long_kokkos.h
	M			src/KOKKOS/pair_buck_kokkos.h
	M			src/KOKKOS/pair_coul_debye_kokkos.h
	M			src/KOKKOS/pair_lj_class2_kokkos.h
	M			src/KOKKOS/pair_lj_expand_kokkos.h
	M			src/KOKKOS/pair_lj_gromacs_kokkos.h
	M			src/USER-DPD/pair_exp6_rx.cpp
	M			src/USER-OMP/npair_skip_omp.h
	M			src/USER-OMP/thr_omp.cpp
	M			src/angle_hybrid.cpp
	M			src/bond_hybrid.cpp
	M			src/compute_coord_atom.cpp
	M			src/dihedral_hybrid.cpp
	M			src/domain.cpp
	M			src/improper_hybrid.cpp
	M			src/library.cpp
	M			src/math_special.h
	M			src/neigh_request.cpp
	M			src/neigh_request.h
	M			src/neighbor.cpp
	M			src/neighbor.h
	M			src/npair_skip.h
	M			src/version.h