Merge pull request #9 from halfflat/master (45f2afab) · 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

45f2afab

Commit 45f2afab authored 8 years ago by

Ben Cumming Committed by GitHub 8 years ago

Downloads
- Plain Diff

Merge pull request #9 from halfflat/master

Merge Sam's work into my fork

parents 0417e072 cf33c0d2

No related branches found

No related tags found

Changes 35

Hide whitespace changes

Inline Side-by-side

Showing

cmake/FindTBB.cmake 1 addition, 1 deletion

cmake/FindTBB.cmake
data/validation/ball_and_3stick.json 158 additions, 0 deletions

data/validation/ball_and_3stick.json
data/validation/ball_and_stick.json 158 additions, 0 deletions

data/validation/ball_and_stick.json
data/validation/simple_exp2_synapse.json 90 additions, 0 deletions

data/validation/simple_exp2_synapse.json
data/validation/simple_exp_synapse.json 90 additions, 0 deletions

data/validation/simple_exp_synapse.json
data/validation/soma.json 62 additions, 0 deletions

data/validation/soma.json
mechanisms/CMakeLists.txt 1 addition, 1 deletion

mechanisms/CMakeLists.txt
mechanisms/mod/exp2syn.mod 50 additions, 0 deletions

mechanisms/mod/exp2syn.mod
mechanisms/mod/expsyn.mod 1 addition, 1 deletion

mechanisms/mod/expsyn.mod
miniapp/io.cpp 6 additions, 1 deletion

miniapp/io.cpp
miniapp/io.hpp 1 addition, 0 deletions

miniapp/io.hpp
miniapp/miniapp.cpp 30 additions, 16 deletions

miniapp/miniapp.cpp
nrn/ball_and_3stick.py 11 additions, 1 deletion

nrn/ball_and_3stick.py
nrn/ball_and_stick.py 11 additions, 1 deletion

nrn/ball_and_stick.py
nrn/generate_validation.sh 2 additions, 1 deletion

nrn/generate_validation.sh
nrn/simple_synapse.py 25 additions, 4 deletions

nrn/simple_synapse.py
nrn/soma.py 11 additions, 1 deletion

nrn/soma.py
scripts/README.md 81 additions, 0 deletions

scripts/README.md
scripts/tsplot 363 additions, 0 deletions

scripts/tsplot
src/cell.cpp 0 additions, 10 deletions

src/cell.cpp

with 1152 additions and 38 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