Diffusion lammps b34be30be6f5

Merge pull request #53 from stanmoore1/new-neighbor
b34be30be6f5
Actions

Authored by Axel Kohlmeyer <akohlmey@gmail.com> on Dec 12 2016, 19:18.

Description

Merge pull request #53 from stanmoore1/new-neighbor

New neighbor Kokkos

Details

Committed

GitHub <noreply@github.com>

Dec 12 2016, 19:18

Pushed

junge

Oct 19 2017, 09:53

Parents

rLAMMPS13b6196b8235: Fixing Kokkos compile error
rLAMMPSb5c3d2f66c25: Merge pull request #52 from timattox/new-neighbor

Branches

Unknown

Tags

Unknown

Event Timeline

GitHub <noreply@github.com> committed rLAMMPSb34be30be6f5: Merge pull request #53 from stanmoore1/new-neighbor (authored by Axel Kohlmeyer <akohlmey@gmail.com>).Dec 12 2016, 19:18

Merged Changes

Commit	Author	Details	Committed
13b6196b8235	Stan Moore	Fixing Kokkos compile error	Dec 12 2016
baf55c90f472	Stan Moore	Whitespace change	Dec 12 2016
770f5d0bf736	Stan Moore	Whitespace change	Dec 12 2016
a31b00965a81	Stan Moore	Updating to master	Dec 12 2016
a5e46e3e6ad9	Stan Moore	Merging	Dec 10 2016
31be0da59008	Stan Moore	Merging pull request	Dec 10 2016
0f3b2544a13c	stanmoore1/GitHub	Merge pull request #1 from timattox/new-neighbor	Dec 10 2016
586514e05c51	stanmoore1/GitHub	Merge branch 'new-neighbor' into new-neighbor	Dec 10 2016
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 (61)

				Path
	M			src/KOKKOS/Install.sh
	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/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