Skip to content
Snippets Groups Projects
  1. Aug 02, 2018
  2. May 25, 2018
    • Dilawar Singh's avatar
      Merge commit '3bac28c4' · 2c86c624
      Dilawar Singh authored
      2c86c624
    • Dilawar Singh's avatar
      Squashed 'moose-gui/' changes from 76564f0873..3fd3739e86 · 3bac28c4
      Dilawar Singh authored
      3fd3739e86 From Editor Widget add plot of n or conc
      a15524b05e from runWidget plot can be added either n or conc and function can have Neutral as parent as compared to pool
      
      git-subtree-dir: moose-gui
      git-subtree-split: 3fd3739e86802afb217c540b0cf72cb268dd6242
      3bac28c4
    • Dilawar Singh's avatar
      Merge commit 'ec5baf0e' · ec3ab2df
      Dilawar Singh authored
      ec3ab2df
    • Dilawar Singh's avatar
      Squashed 'moose-core/' changes from 0cceb296d0..cddc3bd16d · ec5baf0e
      Dilawar Singh authored
      cddc3bd16d Merge pull request #265 from upibhalla/master
      5856ac1fa7 Fixes for travis.yml
      219f474a2e Fix to HSolve to prevent segv during destruction. Update to rdesigneur to not create HSolve when turnOffElec flag is set
      9ca16e8246 Merge branch 'master' of https://github.com/BhallaLab/moose-core
      58e630b4dc Updates to the Voltage clamp modules. The key thing to note is to use the standalone VClamp object in preference to individually building the circuit with DiffAmp. RC and PID.
      12cf83e17a Updates to Hsolve to be able to delete and recreate it. Still problematic for HHChannels. Also added Vclamp to the rdesigneurProtos.
      3dc99b53e6 Changes made to object name which had number in starting
      3ec52cd9e4 Small bugfix to rdesigneur
      241c3d59cb Use sys.executable to execute test. It breaks on python3.
      f527490ff0 Fixes to rdesigneur to use the new system for cross-compartment reactions
      501ff45939 Major cleanup to get rid of legacy cross-compartment code
      f4b4772f0a Numerical improvment for Dsolve::calcJunction done by splitting diffusion and channel calculations into two dt/2 segments bracketing the mass-exchange calculation of calcJnXfer.
      35db4b5a31 Major changes to handling of cross-compartment reactions and to the flow of control in Ksolve, during chemical reac-diff simulations. Not yet optimized. Several tests cleared.
      1b3b11504b Install pymoose in debug mode as well.
      6d911de9fa Test install target with python2 on travis.
      ba0bab2206 Fixes to installation prefix (reported by Harsha over email). Chamcham branch patch was not correctly applied.
      1a57a54c5b Fixes for Debian.
      fab88be5d8 Fix to ConcChan lookup logic
      efcb412ff3 Fixes so that CubeMesh can be used with diffusion solver, needed now that Dsolve is required for multi-compartment reactions.
      f54acebcb9 PyMOOSE installation directory can work.
      fe3061b0a5 temp changes. [skip ci]
      b4313cdcca Merge commit 'a039fc3a'
      1dc7a63356 Added numProducts field to EnzBase
      0f1ecebcb0 Major update so that the diffusion system handles channels across membranes, which are implemented as ConcChans.
      53b0e60dc3 Merge branch 'chennapoda' of github.com:BhallaLab/moose
      db52562e0b Merge branch 'chennapoda'
      f208e2b6fb Merge commit '33bf735f'
      ecce024d42 Merge commit 'a1f7f5ea'
      643226e2cf Install in debian layout in packages. Added option in setup.cfg file Its delicate solution. Added a note.
      c2a574289b Finally. Needs to write setup.cfg file to make /usr/local  and /usr prefix consistent.
      ac7e7e5cf4 bdist_egg is more consistent on both RPM and DEB based systems.
      c866f9f2d9 Merge commit 'bcf5c52d' into chennapoda
      aacb0300ee Fixed typo in command.
      d773b400d0 Merge commit 'a1a6faa7' into chennapoda
      1e23289141 multiple fix to build system. - dont use python setup.py install . It does not work anymore if --prefix   directory is not in PYTHONPATH. - Use python setup.py bdist -d INSTALL_DIR and let cmake unarchive and copy it   to desired location. This is much better solution.
      f2537df577 Use bdist instead of install for creating binay distrution. During installation, untar this to destination.
      43891c6900 Tweaks to setup.cmake.py file.
      fa4a545df0 Test on travis.
      16eea973b1 Merge commit '6d651b60'
      ba1065cdb9 Added EndoMesh and updated other meshes to match. Updated diffusion code to do cross-compartment reactions.
      545ee72491 Merge commit 'e0b8959c'
      ef650c8ec0 On debian/ubuntu install-layout option is set to deb. [skip ci]
      2a02c27dc4 Merge commit 'f80ae40d'
      f11b189779 This fixes moose but a better solution to install pymoose in moose-core must be found.
      635dedf798 Merge commit '6f7697fb'
      7687f3c446 Merge commit '627f1ce1'
      419d65dd2a Merge commit '7b3c355a'
      5cb77cc213 Squashed 'moose-core/' changes from d4417dcffd..2657e3345e (#222)
      59bf6585ff Fixed the syntax causing failure.
      448fb46d87 Handling MOOSE_VERSION is better way.
      cc09546ecf Merge commit 'fba17845'
      9bd9c55d3c Merge commit '750df413'
      c85e8fc03b Force --install-layout=deb when on debian/ubuntu.
      cf20c6c086 Merge commit '99b934e9'
      2bc6d025ed Merge commit '2f038f21'
      8e8f75f08b Merge commit 'd0e1cee1'
      9fd3829997 Merge commit '0014d826'
      c39f533796 Follow up fixes to calcium-hsolve  (#221)
      c3204e010e Merge branch 'master' into asiaszmek
      62b315f08a Merge commit 'e6e83b76' as 'moose-core'
      3e88642a5f Calcium hsolve (#218)
      a33619039f Merge commit '7fe1c2e7'
      4547a9f1d2 Merge commit 'af3c29a4'
      fbdaafb332 Fixes to allow moose module to be installed and imported (#220)
      42fa11cac2 All changes from previous repository. No new file is added here.
      9170767ac7 Merge commit '0f6f5d27'
      d9819894f7 Added missing Revision macro file from chamcham branch.
      5627ad198f Merge commit 'b4d20b7c'
      5ec49526f0 Fixed revision issue.
      b3418608f7 Cmake changes from chamcham branch. Build for launchpad.
      485c150c85 Do not copy VERSION file for python. Lets find a better and more portable solution.
      40bfbf631e Updated default version in setup.py file.
      baab7ef505 Merge commit '0ff1b77a'
      79e1a65c0d VERSION string is fixed to today's date if not given.
      f1adfd3ff9 Fixed for snappy builds.
      68e138a565 Let cmake find path of Python.h file.
      cf8faf32d8 Merge commit '4489d159'
      91a4b30ab1 More changes to snap. Needs to add Python.h path [skip ci]
      567c8013ce Removed <<<<, ===  and >>> from improper merge.
      435188aa4b Added snapcraft file.
      3131b29c76 VERSION conflict file is added
      a3a81ace57 Merge commit '628138cb'
      4bbbf6ddff Merge commit '7c713058'
      a205390e4e Script testing DifShells
      0fcafe248d Merge commit 'a5122cfb'
      8b1c110945 Fixed docstring on example.
      f87a802bdb Merge commit '5bceacfe'
      f6f5dd58cd Merge branch 'difshell' of https://github.com/asiaszmek/moose into asiaszmek-difshell
      d9d0f6e382 Change order of operations to slightly improve accuracy
      d7f378074f Small changes to make the code more alike genesis and other moose objects
      4ce676215f Difshells and difbuffers initialize close to equilibrium
      ebab1aee87 Add forgotten setting of helper variables to zero after calculations
      04d7c5227e Add state in t(i-1)
      6779a6e0a4 Fix wrong definitions
      10f549bbfd Fix errors in volume calculation
      f66bf285a8 Indentation
      25feaf08f7 Add MMPump to scheduling and makefiles
      c410524b90 Add MMPump to DifShell
      2f31fa17cd Implementation of MMPump
      f58668f93a Add ticks for DifBufferBase and DifShellBase
      372b34f71a Fix bugs: DifShell now compiles and seems to give correct results
      efd6ca0bd9 Fix a typo in zombify
      4fa3f001bb Rewrite DifShell. Inherit from DifShellBase
      82284b9b2c Write base class for DifShell
      a3d45d71bd Indentation
      e32896701b Implement exponential Euler for DifShell
      8d0e9c3ace Move source messages to class. Correctly initialize Faraday's constant
      0b2b708d21 Move source messages to class
      6c2234bf82 Make DifBuffer look more like other moose classes and fix ticks
      0de0b1ba06 Add DifBuffer to clocks
      e1586d63a9 Add DifBuffer to compilation
      bea1f0a18d Fix no ticks when initializing difshells warning
      c986fd8172 Remove useless variable
      65e67a0bd5 Reintroduce an old version of DifBuffer from moose
      cede2afd61 Moved to cmake folder.
      fff821e0d0 Merge commit '0d12ebb0'
      ea023b6ae7 master branch.
      340c310fea Fixes to BhallaLab/moose#204.
      0b083f83d6 Merge commit '04170cb4'
      bbd455a47f Updated.
      ff2aec915b Fixed, python2 incompatible print function use.
      725d2c9c47 Some updates to fix static hdf5 libraries.
      b6d80ccd7e This project build pymoose, gui and its examples. TODO: ctest must check each example as well.
      44b458500f Builds whole moose project.
      bbedb768be Added some sanity tests for both moose and moogli.
      32e2226897 Merge commit '1680bac6'
      20b1010d24 Changes to cmake file so that we can find the correct static library.
      527bc4d489 Fix a development warning in cmake.
      30dda99116 Removing shebangs from the python scripts. These scripts were never called as standalone executables.
      20641912cd A test commit to package hdf5-devel BhallaLab/moose#201.
      077989b4d4 Fixed another typo in FindGSL. Library list was converted to string.
      0ddc8bd15f Fixed a typo in FindGSL file.
      ebe9a39888 FindGSL also looks for GSL_VERSION now.
      07d432d580 Fixes to travis failure.
      2c91dddfcc Updated CMake and FindGSL.
      11c933e476 Fixes to extension bug.
      fff7ce57ab Some fixes to static library dependencies [skip ci]
      05856011a9 Cleanup in cmake files. Using bash scripts to generate subprojects. This way I can handle environment variables cleanly.
      493c7c49b8 New hdf5 version generates static library with different name. Fix it.
      c9f6b7767b This should pass on travis.
      d3ac4b814d Merge commit 'd0a6060b'
      4d37569e6c Merge commit 'b5a7c2e2'
      a39a84acb1 Merge commit '273124ec'
      4c79628c60 Merge commit '8bfef2e6'
      49c322da4c Merge commit '6c8f2012'
      f9e56dd7e3 Merge commit '96580978'
      633b9e0503 A test case test_sbml_support.py which inturn calls to write moosewriteSBML which needs networkx which is added as a dependency for travis
      f21e02bf7f Oops moment. Fixed the typo in compiler flag for apple-clang
      3da3dec81b updated apple-clang flags in compiler. Fix to missing symbols from stl.
      70d1a5d90a Merge commit '2af833a0'
      24a742712e Moved docs to moose. Removed temp directory.
      26f20a818e Merge commit '6b27e69e' as 'moose-core'
      
      git-subtree-dir: moose-core
      git-subtree-split: cddc3bd16d3a8e9e3668bdeae524986b0f68b6d4
      ec5baf0e
  3. Mar 13, 2018
  4. Mar 07, 2018
  5. Mar 06, 2018
  6. Mar 02, 2018
    • Dilawar Singh's avatar
    • Dilawar Singh's avatar
      Merge branch 'chennapoda' · 5203f6de
      Dilawar Singh authored
      5203f6de
    • Dilawar Singh's avatar
      Merge commit '3aff9008' · 2ad8f754
      Dilawar Singh authored
      2ad8f754
    • Dilawar Singh's avatar
      Squashed 'moose-examples/' changes from bd41d06..3047477 · 3aff9008
      Dilawar Singh authored
      3047477 python3/python2 compatible call to raw_input.
      
      git-subtree-dir: moose-examples
      git-subtree-split: 3047477ce74705290cb282ac1dca7fcff3f4cf3f
      3aff9008
    • Dilawar Singh's avatar
      Squashed 'moose-core/' changes from f1dcea8..f38dc5d · 33bf735f
      Dilawar Singh authored
      f38dc5d On tumbleweed, cmake returns python3 default but python-numpy is python2 version. Won't fix it. Its a upstream problem.
      REVERT: f1dcea8 Install in debian layout in packages. Added option in setup.cfg file Its delicate solution. Added a note.
      REVERT: 5a73acb Finally. Needs to write setup.cfg file to make /usr/local  and /usr prefix consistent.
      REVERT: d7c41e4 bdist_egg is more consistent on both RPM and DEB based systems.
      REVERT: be42fd2 Merge commit 'bcf5c52d' into chennapoda
      REVERT: d27db9c Do not use -p switch. its not easy to get required info from all linux-distributions.
      REVERT: e667953 Fixed message to set in cmake.
      REVERT: 8523290 Fixed typo in command.
      REVERT: 0b125f6 Fixed typo in cmake file.
      REVERT: f3118f0 multiple fix to build system. - dont use python setup.py install . It does not work anymore if --prefix   directory is not in PYTHONPATH. - Use python setup.py bdist -d INSTALL_DIR and let cmake unarchive and copy it   to desired location. This is much better solution.
      REVERT: 03d5899 Use bdist instead of install for creating binay distrution. During installation, untar this to destination.
      REVERT: a08658e Tweaks to setup.cmake.py file.
      REVERT: c5f1d91 Test on travis.
      REVERT: 6b32fde Merge commit '6d651b60'
      REVERT: 324a20c Merge commit 'e0b8959c'
      REVERT: 59f6e9e On debian/ubuntu install-layout option is set to deb. [skip ci]
      REVERT: 62201d9 Merge commit 'f80ae40d'
      REVERT: 9b81dfc This fixes moose but a better solution to install pymoose in moose-core must be found.
      REVERT: 7e27f80 Merge commit '6f7697fb'
      REVERT: 939c734 Merge commit '627f1ce1'
      REVERT: 4775933 Merge commit '7b3c355a'
      REVERT: 43c0674 Squashed 'moose-core/' changes from d4417dcffd..2657e3345e (#222)
      REVERT: 8c9ad49 Fixed the syntax causing failure.
      REVERT: 397efaf Handling MOOSE_VERSION is better way.
      
      git-subtree-dir: moose-core
      git-subtree-split: f38dc5d6b2d6a3bcb5439a2f5ba680adad754ec7
      33bf735f
    • Dilawar Singh's avatar
      Merge commit '33bf735f' · e0c4ba41
      Dilawar Singh authored
      e0c4ba41
    • Dilawar Singh's avatar
      master branch. · 3854645f
      Dilawar Singh authored
      3854645f
    • Dilawar Singh's avatar
      Merge commit 'a1f7f5ea' · 4643c665
      Dilawar Singh authored
      4643c665
    • Dilawar Singh's avatar
      Squashed 'moose-core/' changes from 49d5b3e..f1dcea8 · a1f7f5ea
      Dilawar Singh authored
      f1dcea8 Install in debian layout in packages. Added option in setup.cfg file Its delicate solution. Added a note.
      5a73acb Finally. Needs to write setup.cfg file to make /usr/local  and /usr prefix consistent.
      d7c41e4 bdist_egg is more consistent on both RPM and DEB based systems.
      be42fd2 Merge commit 'bcf5c52d' into chennapoda
      d27db9c Do not use -p switch. its not easy to get required info from all linux-distributions.
      e667953 Fixed message to set in cmake.
      8523290 Fixed typo in command.
      0b125f6 Fixed typo in cmake file.
      f3118f0 multiple fix to build system. - dont use python setup.py install . It does not work anymore if --prefix   directory is not in PYTHONPATH. - Use python setup.py bdist -d INSTALL_DIR and let cmake unarchive and copy it   to desired location. This is much better solution.
      03d5899 Use bdist instead of install for creating binay distrution. During installation, untar this to destination.
      a08658e Tweaks to setup.cmake.py file.
      c5f1d91 Test on travis.
      6b32fde Merge commit '6d651b60'
      324a20c Merge commit 'e0b8959c'
      59f6e9e On debian/ubuntu install-layout option is set to deb. [skip ci]
      62201d9 Merge commit 'f80ae40d'
      9b81dfc This fixes moose but a better solution to install pymoose in moose-core must be found.
      7e27f80 Merge commit '6f7697fb'
      939c734 Merge commit '627f1ce1'
      4775933 Merge commit '7b3c355a'
      43c0674 Squashed 'moose-core/' changes from d4417dcffd..2657e3345e (#222)
      8c9ad49 Fixed the syntax causing failure.
      397efaf Handling MOOSE_VERSION is better way.
      
      git-subtree-dir: moose-core
      git-subtree-split: f1dcea850568ddaabc765771566ab93891ceb312
      a1f7f5ea
    • Dilawar Singh's avatar
      Merge commit 'd5292d09' into chennapoda · 3b701166
      Dilawar Singh authored
      3b701166
    • Dilawar Singh's avatar
      Squashed 'moose-examples/' changes from bd41d06..7f3d27f · d5292d09
      Dilawar Singh authored
      7f3d27f Merge branch 'master' into chennapoda
      3047477 python3/python2 compatible call to raw_input.
      d314d4c Documentation update #1 (#225)
      cd494a6 Merge commit 'b5ec7b3c'
      8032817 Merge commit 'd07f7ea6'
      17cf9ef Merge commit 'f27ad439'
      ad1dcdc Merge commit 'b0021958'
      a6f09fc Merge commit 'b3c86406' as 'moose-examples'
      e699bcdb moose-examples keep creating troble. May be I don't know how to handle git subtree.
      6c967dfa Merge commit '0014d826'
      0014d826 Squashed 'moose-core/' changes from 2c3fe7516..052318cb4
      45411b66 Follow up fixes to calcium-hsolve  (#221)
      98ae1a9c Merge commit '378bf23c' as 'moose-examples'
      378bf23c Squashed 'moose-examples/' content from commit 3a960983fe
      82043dbb Dirty commit in moose-examples as well.
      f2a691b4 Merge commit '60c5802a'
      60c5802a Squashed 'moose-examples/' changes from 0c5527e77d..3a960983fe
      53206f84 Squashed 'moose-core/' changes from fe77059f98..2c3fe7516a
      0e361288 Merge commit '53206f84'
      d38e324e Merge branch 'master' into asiaszmek
      82ee30f3 Merge commit '37cdf0cc'
      37cdf0cc Squashed 'moose-gui/' changes from 49779ba730..38da92b048
      dfa32490 Squashed 'moose-examples/' changes from 80169bcc5c..0c5527e77d
      b960aed1 Merge commit 'dfa32490'
      e6e83b76 Squashed 'moose-core/' content from commit fe77059f98
      3404d0b5 Merge commit 'e6e83b76' as 'moose-core'
      be87aea0 Deleted moose-core due to dirty history in upstream moose-core.
      48fc9733 Squashed 'moose-examples/' changes from 2eb5fa888f..80169bcc5c
      1051706f Merge commit '48fc9733'
      304173cc Merge commit 'd27e942f'
      d27e942f Squashed 'moose-core/' changes from 69e0354705..b096503233
      0f741382 Calcium hsolve (#218)
      fbf9dbd4 Fixes to bad-merging.
      2ea8560e Travis required changes after yesterday upgrade.
      849103d0 Merge commit '320e525a'
      320e525a Squashed 'moose-gui/' changes from d282884250..49779ba730
      7fe1c2e7 Squashed 'moose-core/' changes from 2ecab963b2..69e0354705
      faf993a1 Merge commit '7fe1c2e7'
      edd901da Squashed 'moose-examples/' content from commit 2eb5fa888
      be2d4ec3 Merge commit 'edd901da' as 'moose-examples'
      
      git-subtree-dir: moose-examples
      git-subtree-split: 7f3d27fa0f2b5c5f2ace0e8cfddae2b5944b9186
      d5292d09