Merge branch 'USER-DPD_kokkos_updates' into USER-DPD_kokkos
b5c7d442992d
Actions

Authored by Stan Moore <stanmoore1@gmail.com> on Jan 3 2017, 20:35.

Description

Merge branch 'USER-DPD_kokkos_updates' into USER-DPD_kokkos

Committed

Stan Moore <stanmoore1@gmail.com>

Jan 3 2017, 20:35

Pushed

junge

Oct 19 2017, 09:53

Parents

Branches

Unknown

Tags

Unknown

Commit	Author	Details	Committed
ae0e882cde4c	Stan Moore	Updating pair_multi_lucy_rx_kokkos to USER-DPD changes	Jan 3 2017
f220b07625b7	Stan Moore	Updating pair_exp6_rx_kokkos to USER-DPD changes	Jan 3 2017
2af10cb8da9b	Stan Moore	Updating fix_eos_table_rx_kokkos to USER-DPD changes	Jan 3 2017
cc1b55e0310a	Stan Moore	Merging USER-DPD updates	Dec 23 2016

				Path
	M			doc/src/fix_eos_table_rx.txt
	M			doc/src/pair_exp6_rx.txt
	M			doc/src/pair_multi_lucy_rx.txt
	M			doc/src/pair_table_rx.txt
	M			examples/USER/dpd/dpde-vv/log.dpde-vv.reference
	M			examples/USER/dpd/dpdrx-shardlow/in.dpdrx-shardlow
	M			examples/USER/dpd/dpdrx-shardlow/log.dpdrx-shardlow.reference
	M			src/KOKKOS/fix_eos_table_rx_kokkos.cpp
	M			src/KOKKOS/fix_eos_table_rx_kokkos.h
	M			src/KOKKOS/pair_exp6_rx_kokkos.cpp
	M			src/KOKKOS/pair_exp6_rx_kokkos.h
	M			src/KOKKOS/pair_multi_lucy_rx_kokkos.cpp
	M			src/KOKKOS/pair_multi_lucy_rx_kokkos.h
	M			src/USER-DPD/fix_eos_table_rx.cpp
	M			src/USER-DPD/fix_eos_table_rx.h
	M			src/USER-DPD/fix_rx.cpp
	M			src/USER-DPD/pair_exp6_rx.cpp
	M			src/USER-DPD/pair_exp6_rx.h
	M			src/USER-DPD/pair_multi_lucy_rx.cpp
	M			src/USER-DPD/pair_multi_lucy_rx.h
	M			src/USER-DPD/pair_table_rx.cpp
	M			src/USER-DPD/pair_table_rx.h