Diffusion lammps 736e063971bc

Merge branch 'master' (21893539cb Aug 25) into USER-DPD_kokkos_merge
736e063971bc
Actions

Authored by Tim Mattox <timothy.mattox@engilitycorp.com> on Aug 28 2017, 21:26.

Description

Merge branch 'master' (21893539cb Aug 25) into USER-DPD_kokkos_merge

Resolved conflicts in src/KOKKOS/npair_kokkos.cpp

Details

Committed

Tim Mattox <timothy.mattox@engilitycorp.com>

Aug 28 2017, 21:46

Pushed

junge

Oct 19 2017, 09:53

Parents

rLAMMPSe52a28f8afaf: Update docs for Kokkos version of USER-DPD package
rLAMMPS21893539cbca: Merge pull request #633 from lammps/doc-user-meso

Branches

Unknown

Tags

Unknown

Event Timeline

Tim Mattox <timothy.mattox@engilitycorp.com> committed rLAMMPS736e063971bc: Merge branch 'master' (21893539cb Aug 25) into USER-DPD_kokkos_merge (authored by Tim Mattox <timothy.mattox@engilitycorp.com>).Aug 28 2017, 21:46

Merged Changes

Commit	Author	Details	Committed
21893539cbca	Steve Plimpton/GitHub	Merge pull request #633 from lammps/doc-user-meso	Aug 26 2017
dd101db79ced	Steve Plimpton/GitHub	Merge pull request #582 from stanmoore1/kk_changes	Aug 26 2017
81ba181349d7	Steve Plimpton	tweak an eq in USER-MESO, also allow neigh to be built w/out styles	Aug 26 2017
5cd1dc93dc59	Stan Moore	Revert 7edb294b447c62d3d2dbd4f9df984fb8d14f9a7c temporarily	Jul 31 2017
7edb294b447c	Stan Moore	Fix execution space issues in comm_kokkos	Jul 28 2017
8e834d8be149	Stan Moore	Add missing sync to neigh_bond_kokkos	Jul 27 2017
8f59c0e188b9	Stan Moore	Fix modify/sync issue in neigh_bond_kokkos	Jul 27 2017
c3c9f357fdfa	Stan Moore	Fix concurrent modification issue in comm_kokkos	Jul 25 2017
76fb4e08152f	Stan Moore	Merge branch 'master' into kk_changes	Jul 25 2017
d3fa882280a9	Stan Moore	Fix execution space issues in Kokkos EAM pairstyles	Jul 25 2017
557e5b964ad8	Stan Moore	Fixing Kokkos execution space issue with regions	Jul 25 2017
633ca33f2f91	Stan Moore	Fix issue in Kokkos neighborlist	Jul 25 2017
8d485ea128d9	Stan Moore	Remove hardcoded execution spaces	Jul 22 2017
f4b6b67f6ee6	Stan Moore	Fixing more execution space issues in KOKKOS package	Jul 21 2017
8ed881947ff9	Stan Moore	Fix execution space in manybody potentials	Jul 21 2017
1b34bec81a2c	Stan Moore	Prefer DeviceType specification over RangePolicy	Jul 18 2017
9df61b642e56	Stan Moore	Removing stray file	Jul 18 2017
3c88b2a9805b	Stan Moore	Fixing execution space issues in KOKKOS package	Jul 18 2017

Changes (75)

				Path
	M			doc/src/Eqs/fix_mvv_dpd.jpg
	M			doc/src/Eqs/fix_mvv_dpd.tex
	M			src/KOKKOS/angle_charmm_kokkos.cpp
	M			src/KOKKOS/atom_vec_angle_kokkos.h
	M			src/KOKKOS/atom_vec_atomic_kokkos.h
	M			src/KOKKOS/atom_vec_bond_kokkos.h
	M			src/KOKKOS/atom_vec_charge_kokkos.h
	M			src/KOKKOS/atom_vec_full_kokkos.h
	M			src/KOKKOS/atom_vec_molecular_kokkos.h
	M			src/KOKKOS/bond_fene_kokkos.cpp
	M			src/KOKKOS/bond_fene_kokkos.h
	M			src/KOKKOS/comm_kokkos.cpp
	M			src/KOKKOS/dihedral_charmm_kokkos.cpp
	M			src/KOKKOS/dihedral_opls_kokkos.cpp
	M			src/KOKKOS/dihedral_opls_kokkos.h
	M			src/KOKKOS/fix_deform_kokkos.h
	M			src/KOKKOS/fix_nh_kokkos.cpp
	M			src/KOKKOS/fix_nve_kokkos.cpp
	M			src/KOKKOS/fix_qeq_reax_kokkos.cpp
	M			src/KOKKOS/fix_reaxc_bonds_kokkos.cpp
	M			src/KOKKOS/fix_reaxc_bonds_kokkos.h
	M			src/KOKKOS/fix_reaxc_species_kokkos.cpp
	M			src/KOKKOS/fix_reaxc_species_kokkos.h
	M			src/KOKKOS/fix_setforce_kokkos.cpp
	M			src/KOKKOS/fix_setforce_kokkos.h
	M			src/KOKKOS/improper_harmonic_kokkos.cpp
	M			src/KOKKOS/neigh_bond_kokkos.cpp
	M			src/KOKKOS/neighbor_kokkos.cpp
	M			src/KOKKOS/npair_kokkos.cpp
	M			src/KOKKOS/npair_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_coul_cut_kokkos.cpp
	M			src/KOKKOS/pair_coul_debye_kokkos.cpp
	M			src/KOKKOS/pair_coul_long_kokkos.cpp
	M			src/KOKKOS/pair_eam_alloy_kokkos.cpp
	M			src/KOKKOS/pair_eam_alloy_kokkos.h
	M			src/KOKKOS/pair_eam_fs_kokkos.cpp
	M			src/KOKKOS/pair_eam_fs_kokkos.h
	M			src/KOKKOS/pair_eam_kokkos.cpp
	M			src/KOKKOS/pair_eam_kokkos.h
	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_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_expand_kokkos.cpp
	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_morse_kokkos.cpp
	M			src/KOKKOS/pair_reaxc_kokkos.cpp
	M			src/KOKKOS/pair_reaxc_kokkos.h
	M			src/KOKKOS/pair_sw_kokkos.cpp
	M			src/KOKKOS/pair_sw_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/pair_vashishta_kokkos.cpp
	M			src/KOKKOS/pair_vashishta_kokkos.h
	M			src/KOKKOS/region_block_kokkos.cpp
	M			src/KOKKOS/region_block_kokkos.h
	M			src/KOKKOS/verlet_kokkos.h
	M			src/accelerator_kokkos.h
	M			src/neighbor.cpp
	M			src/region.cpp
	M			src/region.h