Homec4science
Diffusion lammps 56372120b65b

Merge remote-tracking branch 'lammps-ro/master' into lammps-icms
56372120b65b
Actions

Authored by Axel Kohlmeyer <akohlmey@gmail.com> on Mar 19 2016, 11:16.

Description

Merge remote-tracking branch 'lammps-ro/master' into lammps-icms

  1. Resolved Conflicts:
  2. src/KOKKOS/pair_lj_charmm_coul_charmm_kokkos.cpp
  3. src/lammps.cpp

Details

Committed
Axel Kohlmeyer <akohlmey@gmail.com>Mar 19 2016, 11:16
Pushed
jungeOct 6 2016, 16:49
Parents
rLAMMPS042f50ac9c28: Christian's kokkos patch that allows concurrent host and device threading
rLAMMPS87df1f2fe079: Merge branch 'lammps-icms' of bitbucket.org:akohlmey/lammps-icms into lammps…
Branches
Unknown
Tags
Unknown

Event Timeline

Axel Kohlmeyer <akohlmey@gmail.com> committed rLAMMPS56372120b65b: Merge remote-tracking branch 'lammps-ro/master' into lammps-icms (authored by Axel Kohlmeyer <akohlmey@gmail.com>).Mar 19 2016, 11:16

Merged Changes

CommitAuthorDetailsCommitted
042f50ac9c28stamoor
Christian's kokkos patch that allows concurrent host and device threading 
Mar 18 2016

Changes (2)

Path
Msrc/KOKKOS/pair_lj_charmm_coul_charmm_kokkos.cpp
Msrc/lammps.cpp

rLAMMPS56372120b65b

View Options

src/KOKKOS/pair_lj_charmm_coul_charmm_kokkos.cpp

Loading...
View Options

src/lammps.cpp

Loading...
c4science · Help