Diffusion lammps 0ce5dc023451

Merge remote branch 'stanmoore1/ev_setup_kk' into USER…
0ce5dc023451
Actions

Authored by Stan Moore <stamoor@sandia.gov> on Mar 8 2017, 21:05.

Description

Merge remote branch 'stanmoore1/ev_setup_kk' into USER-DPD_kokkos_ev_setup_bugfix

Details

Committed

Stan Moore <stamoor@sandia.gov>

Mar 8 2017, 21:05

Pushed

junge

Oct 19 2017, 09:53

Parents

rLAMMPSd01f09dce237: Turn off use of OpenMP in MPIIO/dump_custom_mpiio.cpp if Kokkos is in use. The…
rLAMMPS1f6c1942b37e: Disable allocation of per-atom arrays in ev_setup for Kokkos styles

Branches

Unknown

Tags

Unknown

Event Timeline

Stan Moore <stamoor@sandia.gov> committed rLAMMPS0ce5dc023451: Merge remote branch 'stanmoore1/ev_setup_kk' into USER… (authored by Stan Moore <stamoor@sandia.gov>).Mar 8 2017, 21:05

Merged Changes

	Commit			Author	Details	Committed
	1f6c1942b37e			Stan Moore	Disable allocation of per-atom arrays in ev_setup for Kokkos styles	Mar 8 2017
	683023d8203f			Stan Moore	Adding alloc flag to ev_setup	Mar 8 2017

Changes (57)

				Path
	M			src/KOKKOS/angle_charmm_kokkos.cpp
	M			src/KOKKOS/angle_class2_kokkos.cpp
	M			src/KOKKOS/angle_harmonic_kokkos.cpp
	M			src/KOKKOS/bond_class2_kokkos.cpp
	M			src/KOKKOS/bond_fene_kokkos.cpp
	M			src/KOKKOS/bond_harmonic_kokkos.cpp
	M			src/KOKKOS/dihedral_charmm_kokkos.cpp
	M			src/KOKKOS/dihedral_class2_kokkos.cpp
	M			src/KOKKOS/dihedral_opls_kokkos.cpp
	M			src/KOKKOS/improper_class2_kokkos.cpp
	M			src/KOKKOS/improper_harmonic_kokkos.cpp
	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_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_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_sw_kokkos.cpp
	M			src/KOKKOS/pair_table_kokkos.cpp
	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/pppm_kokkos.cpp
	M			src/angle.cpp
	M			src/angle.h
	M			src/bond.cpp
	M			src/bond.h
	M			src/dihedral.cpp
	M			src/dihedral.h
	M			src/improper.cpp
	M			src/improper.h
	M			src/kspace.cpp
	M			src/kspace.h
	M			src/pair.cpp
	M			src/pair.h