Merge branch 'feature/spike_handling' into feature/probes (90e5106d) · 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

90e5106d

Commit 90e5106d authored 8 years ago by

Sam Yates

Downloads
- Plain Diff

Merge branch 'feature/spike_handling' into feature/probes

parents a867d77b a14a7485

No related branches found

No related tags found

No related merge requests found

Changes 14

Hide whitespace changes

Inline Side-by-side

Showing

CMakeLists.txt 8 additions, 1 deletion

CMakeLists.txt
miniapp/io.cpp 1 addition, 1 deletion

miniapp/io.cpp
miniapp/miniapp.cpp 42 additions, 67 deletions

miniapp/miniapp.cpp
src/CMakeLists.txt 2 additions, 0 deletions

src/CMakeLists.txt
src/cell_group.hpp 4 additions, 0 deletions

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

src/communication/global_policy.hpp
src/communication/mpi_global_policy.hpp 24 additions, 8 deletions

src/communication/mpi_global_policy.hpp
src/communication/serial_global_policy.hpp 8 additions, 4 deletions

src/communication/serial_global_policy.hpp
src/fvm_cell.hpp 14 additions, 30 deletions

src/fvm_cell.hpp
src/profiling/profiler.cpp 375 additions, 0 deletions

src/profiling/profiler.cpp
src/profiling/profiler.hpp 148 additions, 305 deletions

src/profiling/profiler.hpp
src/threading/serial.hpp 26 additions, 30 deletions

src/threading/serial.hpp
src/threading/tbb.hpp 15 additions, 8 deletions

src/threading/tbb.hpp
tests/CMakeLists.txt 6 additions, 0 deletions

tests/CMakeLists.txt

with 715 additions and 454 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