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

7d1294c8

Commit 7d1294c8 authored 8 years ago by

Ben Cumming Committed by GitHub 8 years ago

Downloads
- Plain Diff

Merge pull request #1 from eth-cscs/master

merge mainline into bcumming fork

parents 0aafd72d 7b2b5209

No related branches found

No related tags found

Changes 111

Hide whitespace changes

Inline Side-by-side

Showing

.gitignore 2 additions, 0 deletions

.gitignore
.ycm_extra_conf.py 2 additions, 2 deletions

.ycm_extra_conf.py
CMakeLists.txt 138 additions, 66 deletions

CMakeLists.txt
README.md 10 additions, 10 deletions

README.md
cmake/CompilerOptions.cmake 11 additions, 0 deletions

cmake/CompilerOptions.cmake
cmake/FindUnwind.cmake 3 additions, 0 deletions

cmake/FindUnwind.cmake
data/test.mod 18 additions, 0 deletions

data/test.mod
docs/model/formulation.tex 31 additions, 39 deletions

docs/model/formulation.tex
docs/model/images/cable.tex 6 additions, 0 deletions

docs/model/images/cable.tex
docs/model/report.tex 1 addition, 0 deletions

docs/model/report.tex
docs/model/symbols.tex 115 additions, 67 deletions

docs/model/symbols.tex
mechanisms/BuildModules.cmake 40 additions, 0 deletions

mechanisms/BuildModules.cmake
mechanisms/CMakeLists.txt 27 additions, 70 deletions

mechanisms/CMakeLists.txt
miniapp/CMakeLists.txt 2 additions, 2 deletions

miniapp/CMakeLists.txt
miniapp/io.cpp 10 additions, 1 deletion

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

miniapp/io.hpp
miniapp/miniapp.cpp 3 additions, 3 deletions

miniapp/miniapp.cpp
modcc/CMakeLists.txt 10 additions, 9 deletions

modcc/CMakeLists.txt
modcc/astmanip.cpp 30 additions, 0 deletions

modcc/astmanip.cpp
modcc/astmanip.hpp 38 additions, 0 deletions

modcc/astmanip.hpp

with 500 additions and 269 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