Squashed 'moose-core/' changes from e5ba823ba..33d4803ee
33d4803ee Merge pull request #228 from upibhalla/master c9e9fa6fd Update test_muparser.py 419661b6e Update test_muparser.py 7c8ca61a6 Merge branch 'master' of https://github.com/upibhalla/moose-core b13fc98cc Fix for muparser tests 7eefdca47 Merge branch 'master' into master 1ad271b07 Merge pull request #229 from dilawar/master 30fe94cda Optimizations for rdesigneur in _parseComptField function d862de4e9 Merge branch 'master' of https://github.com/BhallaLab/moose-core 3eef327f1 Added instructions on what to do post-build. 985af4e11 Fixes BhallaLab/moose#224 and BhallaLab/moose-core#230 . 917d68db0 Merge branch 'master' of github.com:BhallaLab/moose-core 586d48a62 Merge pull request #222 from hrani/master 3c7ce10fa New line added e7c8d0e81 Merge branch 'master' of http://github.com/hrani/moose-core 7ce91a0f2 import rdesigneur.rmoogli as rmoogli is added at init file, otherwise script that uses rmoogli gives and error "NameError: global name \'rmoogli...
Showing
- CMakeLists.txt 46 additions, 60 deletionsCMakeLists.txt
- biophysics/Neuron.cpp 4 additions, 4 deletionsbiophysics/Neuron.cpp
- builtins/TableBase.cpp 26 additions, 0 deletionsbuiltins/TableBase.cpp
- builtins/TableBase.h 3 additions, 0 deletionsbuiltins/TableBase.h
- cmake_modules/FindNumPy.cmake 0 additions, 2 deletionscmake_modules/FindNumPy.cmake
- dependencies_list_script/dependencies 0 additions, 19 deletionsdependencies_list_script/dependencies
- dependencies_list_script/ubuntu-dep 0 additions, 12 deletionsdependencies_list_script/ubuntu-dep
- pymoose/CMakeLists.txt 12 additions, 0 deletionspymoose/CMakeLists.txt
- python/moose/SBML/readSBML.py 2 additions, 2 deletionspython/moose/SBML/readSBML.py
- python/moose/chemMerge/merge.py 7 additions, 5 deletionspython/moose/chemMerge/merge.py
- python/rdesigneur/__init__.py 1 addition, 0 deletionspython/rdesigneur/__init__.py
- python/rdesigneur/rdesigneur.py 33 additions, 35 deletionspython/rdesigneur/rdesigneur.py
- python/setup.cmake.py 85 additions, 0 deletionspython/setup.cmake.py
- tests/python/abstrModelEqns9.py 1 addition, 0 deletionstests/python/abstrModelEqns9.py
- tests/python/test_muparser.py 165 additions, 167 deletionstests/python/test_muparser.py
Please register or sign in to comment