Merge pull request #2 from eth-cscs/master (81c5da48) · 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

81c5da48

Commit 81c5da48 authored 8 years ago by

w-klijn Committed by GitHub 8 years ago

Downloads
- Plain Diff

Merge pull request #2 from eth-cscs/master

Pull in upstream patches to local branch

parents afaada95 84c23425

No related branches found

No related tags found

Changes 61

Hide whitespace changes

Inline Side-by-side

Showing

external/modparser 1 addition, 1 deletion

external/modparser
miniapp/CMakeLists.txt 1 addition, 1 deletion

miniapp/CMakeLists.txt
miniapp/io.cpp 22 additions, 41 deletions

miniapp/io.cpp
miniapp/io.hpp 17 additions, 8 deletions

miniapp/io.hpp
miniapp/miniapp.cpp 125 additions, 395 deletions

miniapp/miniapp.cpp
miniapp/miniapp_recipes.cpp 234 additions, 0 deletions

miniapp/miniapp_recipes.cpp
miniapp/miniapp_recipes.hpp 46 additions, 0 deletions

miniapp/miniapp_recipes.hpp
miniapp/trace_sampler.hpp 70 additions, 0 deletions

miniapp/trace_sampler.hpp
src/CMakeLists.txt 1 addition, 1 deletion

src/CMakeLists.txt
src/algorithms.hpp 8 additions, 8 deletions

src/algorithms.hpp
src/cell.cpp 19 additions, 21 deletions

src/cell.cpp
src/cell.hpp 27 additions, 24 deletions

src/cell.hpp
src/cell_group.hpp 64 additions, 62 deletions

src/cell_group.hpp
src/cell_tree.hpp 30 additions, 25 deletions

src/cell_tree.hpp
src/common_types.hpp 55 additions, 0 deletions

src/common_types.hpp
src/common_types_io.cpp 8 additions, 0 deletions

src/common_types_io.cpp
src/communication/communicator.hpp 41 additions, 125 deletions

src/communication/communicator.hpp
src/communication/mpi_global_policy.hpp 7 additions, 8 deletions

src/communication/mpi_global_policy.hpp
src/communication/serial_global_policy.hpp 5 additions, 7 deletions

src/communication/serial_global_policy.hpp
src/compartment.hpp 4 additions, 3 deletions

src/compartment.hpp

with 785 additions and 730 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