Diffusion lammps bc900935fdaf

Merge branch 'merge-pull-33' into lammps-icms
bc900935fdaf
Actions

Authored by Axel Kohlmeyer <akohlmey@gmail.com> on Mar 2 2016, 23:46.

Description

Merge branch 'merge-pull-33' into lammps-icms

Details

Committed

Axel Kohlmeyer <akohlmey@gmail.com>

Mar 2 2016, 23:46

Pushed

junge

Oct 6 2016, 16:49

Parents

rLAMMPSffd213d9fd8d: Merge branch 'master' of https://github.com/crtrott/lammps into merge-pull-33
rLAMMPS375c1cc72144: remove stray "same" from morse pair style docs

Branches

Unknown

Tags

Unknown

Event Timeline

Axel Kohlmeyer <akohlmey@gmail.com> committed rLAMMPSbc900935fdaf: Merge branch 'merge-pull-33' into lammps-icms (authored by Axel Kohlmeyer <akohlmey@gmail.com>).Mar 2 2016, 23:46

Merged Changes

Commit	Author	Details	Committed
ffd213d9fd8d	Axel Kohlmeyer	Merge branch 'master' of https://github.com/crtrott/lammps into merge-pull-33	Mar 2 2016
569736630afc	crtrott	Revert changes in benchmark examples	Mar 2 2016
9807c6fb5a4b	crtrott	Kokkos: fix missing namespace start in LJ2 class2 pair styles	Mar 2 2016
ca39c079865e	crtrott	Kokkos: fix verlet_kokkos if no pair style is used	Mar 2 2016
b01892757ad1	crtrott	Merge remote-tracking branch 'main/master'	Mar 1 2016
5931b2f7cdf8	crtrott	Kokkos: remove print statement	Mar 1 2016
35c29a061041	crtrott	Kokkos: make lammps instantiate a kokkos atom_vec style if kokkos on	Mar 1 2016
29de3e2403be	crtrott	Kokkos: improper_harmonic: make reallocation check size first	Mar 1 2016
e3fa5bfd4f87	crtrott	KOKKOS: fixing an issue in atom_vect styles with missing modify statements	Mar 1 2016
ceb9f09e29d3	crtrott	Kokkos: fix some bonded interactions to work with /kk/host	Mar 1 2016
216f543e2e7c	crtrott	Kokkos: reenable support for all neighbor styles	Feb 26 2016
4b755fb93b07	crtrott	Kokkos: support overlapping host device calculation commit 9	Feb 26 2016
ba6abbd9d3fc	crtrott	Kokkos: support overlapping host device calculation commit 8	Feb 26 2016
35dbc63af200	crtrott	Kokkos: support overlapping host device calculation commit 7	Feb 26 2016
9df1b66d1e14	crtrott	Kokkos: support overlapping host device calculation commit 6	Feb 25 2016
8aecc2baed13	crtrott	Kokkos: support overlapping host device calculation commit 5	Feb 25 2016
a9452c807f85	crtrott	Kokkos: support overlapping host device calculation commit 4	Feb 25 2016
f3716023e16a	crtrott	Kokkos: support overlapping host device calculation commit 3	Feb 25 2016
2b2c4755c84e	crtrott	Kokkos: support overlapping host device calculation commit 1	Feb 25 2016
46be84ff1fa5	crtrott	Kokkos: support overlapping host device calculation commit 1	Feb 25 2016
2aebaf5d45e7	crtrott	KOKKOS: fixing clang compiler issues	Feb 25 2016
a8bdd2450b4c	crtrott	KOKKOS: workaround for compiler bug in GCC 5.1	Feb 25 2016
2a288504ddbd	crtrott	Merge remote-tracking branch 'main/master'	Feb 25 2016
5146f1894fae	crtrott	Kokkos: Fix again wrong usage of DualView	Dec 9 2015
c91323578131	crtrott	Kokkos: change Makefile.kokkos for LAMMPS usecase	Dec 9 2015
7c246c418282	crtrott	Snapshot of kokkos.git from commit c1c9e8d6b30e58b04700bb4602494bb417d42fbc	Dec 9 2015
34e2c78a3992	crtrott	Merge branch 'master' of github.com:crtrott/lammps	Dec 9 2015
86b22bb8c990	crtrott	Replacing use of isfinite with macro ISFINITE	Dec 9 2015
9e70d356c2dc	crtrott	Kokkos: Fix wrong usage of dual view in verlet_kokkos	Dec 9 2015
b35aaf4e756a	crtrott	Merge remote-tracking branch 'main/master'	Dec 9 2015
8d0330d0ad47	crtrott	Merge branch 'primary'	Oct 10 2015
92f0f87b3629	crtrott	Kokkos: Pair EAM: remove old code	Aug 5 2015
ad4ee55e5c47	crtrott	Kokkos: updating path to kokkos to point to lib in LAMMPS	Aug 4 2015
d0a8cd76e551	crtrott	Kokkos: Fixing issue in verlet_kokkos.cpp	Aug 4 2015
ca954d51819b	crtrott	Kokkos: Adding support for experimental view implementation	Aug 4 2015
bd44d50ef221	crtrott	Kokkos: EAM Adding option to use FLOAT4 loads for splines	Aug 4 2015
e75742356c0b	crtrott	Updating Kokkos	Aug 4 2015

Changes (81)

				Path
	M			src/KOKKOS/angle_charmm_kokkos.cpp
	M			src/KOKKOS/angle_charmm_kokkos.h
	M			src/KOKKOS/angle_harmonic_kokkos.cpp
	M			src/KOKKOS/angle_harmonic_kokkos.h
	M			src/KOKKOS/atom_kokkos.cpp
	M			src/KOKKOS/atom_kokkos.h
	M			src/KOKKOS/atom_vec_angle_kokkos.cpp
	M			src/KOKKOS/atom_vec_angle_kokkos.h
	M			src/KOKKOS/atom_vec_atomic_kokkos.cpp
	M			src/KOKKOS/atom_vec_atomic_kokkos.h
	M			src/KOKKOS/atom_vec_bond_kokkos.cpp
	M			src/KOKKOS/atom_vec_bond_kokkos.h
	M			src/KOKKOS/atom_vec_charge_kokkos.cpp
	M			src/KOKKOS/atom_vec_charge_kokkos.h
	M			src/KOKKOS/atom_vec_full_kokkos.cpp
	M			src/KOKKOS/atom_vec_full_kokkos.h
	M			src/KOKKOS/atom_vec_kokkos.cpp
	M			src/KOKKOS/atom_vec_kokkos.h
	M			src/KOKKOS/atom_vec_molecular_kokkos.cpp
	M			src/KOKKOS/atom_vec_molecular_kokkos.h
	M			src/KOKKOS/bond_fene_kokkos.cpp
	M			src/KOKKOS/bond_harmonic_kokkos.cpp
	M			src/KOKKOS/bond_harmonic_kokkos.h
	M			src/KOKKOS/comm_kokkos.cpp
	M			src/KOKKOS/compute_temp_kokkos.cpp
	M			src/KOKKOS/dihedral_charmm_kokkos.cpp
	M			src/KOKKOS/dihedral_charmm_kokkos.h
	M			src/KOKKOS/dihedral_opls_kokkos.cpp
	M			src/KOKKOS/domain_kokkos.cpp
	M			src/KOKKOS/fix_deform_kokkos.cpp
	M			src/KOKKOS/fix_langevin_kokkos.cpp
	M			src/KOKKOS/fix_nh_kokkos.cpp
	M			src/KOKKOS/fix_nph_kokkos.cpp
	M			src/KOKKOS/fix_npt_kokkos.cpp
	M			src/KOKKOS/fix_nve_kokkos.cpp
	M			src/KOKKOS/fix_nvt_kokkos.cpp
	M			src/KOKKOS/fix_setforce_kokkos.cpp
	M			src/KOKKOS/fix_wall_reflect_kokkos.cpp
	M			src/KOKKOS/improper_harmonic_kokkos.cpp
	M			src/KOKKOS/improper_harmonic_kokkos.h
	M			src/KOKKOS/kokkos.cpp
	M			src/KOKKOS/kokkos_type.h
	M			src/KOKKOS/modify_kokkos.cpp
	M			src/KOKKOS/neigh_bond_kokkos.cpp
	M			src/KOKKOS/neigh_list_kokkos.cpp
	M			src/KOKKOS/neighbor_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_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/region_block_kokkos.cpp
	M			src/KOKKOS/verlet_kokkos.cpp
	M			src/KOKKOS/verlet_kokkos.h
	M			src/lammps.cpp