Merge branch 'master' into doc-reorg-start and resolve merge conflicts with master (aca9416c) · Commits · multiscale / lammps · GitLab

Skip to content

GitLab

Explore

Sign in

Primary navigation

Project

L

lammps
- Activity
- Members
- Labels
- Issues
- Issue boards
- Milestones
- Wiki
- Environments
- Incidents

Snippets Groups Projects

aca9416c

Commit aca9416c authored 6 years ago by Axel Kohlmeyer

Downloads
- Plain Diff

Merge branch 'master' into doc-reorg-start and resolve merge conflicts with master

Conflicts:
	doc/src/Speed_kokkos.txt
	doc/src/package.txt

parents f7164e59 6663fbeb

No related branches found

No related tags found

No related merge requests found

Changes 9

Hide whitespace changes

Inline Side-by-side

Showing

doc/src/Speed_kokkos.txt 24 additions, 9 deletions

doc/src/Speed_kokkos.txt
doc/src/compute_property_local.txt 2 additions, 2 deletions

doc/src/compute_property_local.txt
doc/src/package.txt 28 additions, 11 deletions

doc/src/package.txt
src/KOKKOS/comm_kokkos.cpp 21 additions, 3 deletions

src/KOKKOS/comm_kokkos.cpp
src/KOKKOS/gridcomm_kokkos.cpp 39 additions, 4 deletions

src/KOKKOS/gridcomm_kokkos.cpp
src/KOKKOS/kokkos.cpp 78 additions, 2 deletions

src/KOKKOS/kokkos.cpp
src/KOKKOS/kokkos.h 1 addition, 0 deletions

src/KOKKOS/kokkos.h
src/balance.cpp 15 additions, 0 deletions

src/balance.cpp
src/rcb.cpp 3 additions, 1 deletion

src/rcb.cpp

with 211 additions and 32 deletions

Loading

0% Loading or .

You are about to add 0 people to the discussion. Proceed with caution.

Finish editing this message first!

Please register or sign in to comment