Diffusion lammps 586514e05c51

Merge branch 'new-neighbor' into new-neighbor
586514e05c51
Actions

Authored by stanmoore1 <stanmoore1@gmail.com> on Dec 10 2016, 00:08.

Description

Merge branch 'new-neighbor' into new-neighbor

Details

Committed

GitHub <noreply@github.com>

Dec 10 2016, 00:08

Pushed

junge

Oct 19 2017, 09:53

Parents

rLAMMPS5187cb97e5f1: USER-DPD: Make fix_shardlow request its own SSA-specific neighbor list, instead…
rLAMMPS43c459ba5694: More changes for Kokkos neighbor

Branches

Unknown

Tags

Unknown

Event Timeline

GitHub <noreply@github.com> committed rLAMMPS586514e05c51: Merge branch 'new-neighbor' into new-neighbor (authored by stanmoore1 <stanmoore1@gmail.com>).Dec 10 2016, 00:08

Merged Changes

Commit	Author	Details	Committed
43c459ba5694	Stan Moore	More changes for Kokkos neighbor	Dec 9 2016
435421301b0b	Stan Moore	Small tweaks to Kokkos neighbor	Dec 9 2016
9b48c49f8348	Stan Moore	Removing used Kokkos file	Dec 8 2016
8318c6781697	Stan Moore	Kokkos neighbor refactor	Dec 7 2016

Changes (63)

				Path
	M			src/KOKKOS/Install.sh
	M			src/KOKKOS/atom_vec_kokkos.h
	M			src/KOKKOS/fix_qeq_reax_kokkos.cpp
	M			src/KOKKOS/kokkos.cpp
	M			src/KOKKOS/kokkos.h
	A			src/KOKKOS/nbin_kokkos.cpp
	A			src/KOKKOS/nbin_kokkos.h
	V			src/KOKKOS/{neigh_full_kokkos.h → npair_kokkos.cpp}
	M			src/KOKKOS/neigh_list_kokkos.cpp
	M			src/KOKKOS/neigh_list_kokkos.h
	M			src/KOKKOS/neighbor_kokkos.cpp
	P			src/KOKKOS/neighbor_kokkos.h Copied to src/KOKKOS/npair_kokkos.h
	P			src/KOKKOS/npair_copy_kokkos.cpp Copied from src/npair_copy.cpp
	P			src/KOKKOS/npair_copy_kokkos.h Copied from src/USER-OMP/npair_full_nsq_omp.h
	V			src/KOKKOS/{npair_kokkos.cpp ← neigh_full_kokkos.h}
	P			src/KOKKOS/npair_kokkos.h Copied from src/KOKKOS/neighbor_kokkos.h
	M			src/KOKKOS/pair_buck_coul_cut_kokkos.cpp
	M			src/KOKKOS/pair_buck_coul_long_kokkos.cpp
	M			src/KOKKOS/pair_buck_kokkos.cpp
	M			src/KOKKOS/pair_buck_kokkos.h
	M			src/KOKKOS/pair_coul_cut_kokkos.cpp
	M			src/KOKKOS/pair_coul_debye_kokkos.cpp
	M			src/KOKKOS/pair_coul_dsf_kokkos.cpp
	M			src/KOKKOS/pair_coul_long_kokkos.cpp
	M			src/KOKKOS/pair_coul_wolf_kokkos.cpp
	M			src/KOKKOS/pair_eam_alloy_kokkos.cpp
	M			src/KOKKOS/pair_eam_fs_kokkos.cpp
	M			src/KOKKOS/pair_eam_kokkos.cpp
	M			src/KOKKOS/pair_kokkos.h
	M			src/KOKKOS/pair_lj_charmm_coul_charmm_implicit_kokkos.cpp
	M			src/KOKKOS/pair_lj_charmm_coul_charmm_kokkos.cpp
	M			src/KOKKOS/pair_lj_charmm_coul_long_kokkos.cpp
	M			src/KOKKOS/pair_lj_class2_coul_cut_kokkos.cpp
	M			src/KOKKOS/pair_lj_class2_coul_long_kokkos.cpp
	M			src/KOKKOS/pair_lj_class2_kokkos.cpp
	M			src/KOKKOS/pair_lj_class2_kokkos.h
	M			src/KOKKOS/pair_lj_cut_coul_cut_kokkos.cpp
	M			src/KOKKOS/pair_lj_cut_coul_debye_kokkos.cpp
	M			src/KOKKOS/pair_lj_cut_coul_dsf_kokkos.cpp
	M			src/KOKKOS/pair_lj_cut_coul_long_kokkos.cpp
	M			src/KOKKOS/pair_lj_cut_kokkos.cpp
	M			src/KOKKOS/pair_lj_cut_kokkos.h
	M			src/KOKKOS/pair_lj_expand_kokkos.cpp
	M			src/KOKKOS/pair_lj_expand_kokkos.h
	M			src/KOKKOS/pair_lj_gromacs_coul_gromacs_kokkos.cpp
	M			src/KOKKOS/pair_lj_gromacs_kokkos.cpp
	M			src/KOKKOS/pair_lj_sdk_kokkos.cpp
	M			src/KOKKOS/pair_lj_sdk_kokkos.h
	M			src/KOKKOS/pair_reax_c_kokkos.cpp
	M			src/KOKKOS/pair_sw_kokkos.cpp
	M			src/KOKKOS/pair_table_kokkos.cpp
	M			src/KOKKOS/pair_table_kokkos.h
	M			src/KOKKOS/pair_tersoff_kokkos.cpp
	M			src/KOKKOS/pair_tersoff_mod_kokkos.cpp
	M			src/KOKKOS/pair_tersoff_zbl_kokkos.cpp
	M			src/KOKKOS/region_block_kokkos.h
	M			src/finish.cpp
	M			src/neigh_list.cpp
	M			src/neigh_list.h
	M			src/neighbor.cpp
	M			src/neighbor.h
	M			src/npair.h
	M			src/nstencil.h