Merge remote-tracking branch 'upstream/master' into feature/own-asserts (b2aca398) · Commits · arbor-sim / arbor · GitLab

Skip to content

GitLab

Explore

Sign in

Primary navigation

Project

A

arbor
- Activity
- Members
- Releases
- Contributor analytics
- Repository analytics

Snippets Groups Projects

b2aca398

Commit b2aca398 authored 8 years ago by

Sam Yates

Downloads
- Plain Diff

Merge remote-tracking branch 'upstream/master' into feature/own-asserts

parents a3c35136 336e0864

No related branches found

No related tags found

No related merge requests found

Changes 41

Hide whitespace changes

Inline Side-by-side

Showing

.gitignore 2 additions, 0 deletions

.gitignore
.ycm_extra_conf.py 3 additions, 0 deletions

.ycm_extra_conf.py
CMakeLists.txt 37 additions, 0 deletions

CMakeLists.txt
README.md 53 additions, 1 deletion

README.md
cmake/FindTBB.cmake 249 additions, 0 deletions

cmake/FindTBB.cmake
commit.msg 9 additions, 0 deletions

commit.msg
miniapp/CMakeLists.txt 23 additions, 0 deletions

miniapp/CMakeLists.txt
miniapp/io.cpp 25 additions, 0 deletions

miniapp/io.cpp
miniapp/io.hpp 22 additions, 0 deletions

miniapp/io.hpp
miniapp/miniapp.cpp 425 additions, 0 deletions

miniapp/miniapp.cpp
miniapp/plot.py 22 additions, 0 deletions

miniapp/plot.py
src/CMakeLists.txt 5 additions, 0 deletions

src/CMakeLists.txt
src/algorithms.hpp 1 addition, 1 deletion

src/algorithms.hpp
src/cell.cpp 6 additions, 1 deletion

src/cell.cpp
src/cell.hpp 62 additions, 5 deletions

src/cell.hpp
src/cell_group.hpp 189 additions, 0 deletions

src/cell_group.hpp
src/communication/communicator.hpp 273 additions, 0 deletions

src/communication/communicator.hpp
src/communication/connection.hpp 70 additions, 0 deletions

src/communication/connection.hpp
src/communication/global_policy.hpp 42 additions, 0 deletions

src/communication/global_policy.hpp
src/communication/mpi.cpp 59 additions, 0 deletions

src/communication/mpi.cpp

with 1577 additions and 8 deletions

0% 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