Skip to content
Snippets Groups Projects
  • Dilawar Singh's avatar
    Squashed 'moose-examples/' changes from cd2a2b9..37bf0cc · b0021958
    Dilawar Singh authored
    37bf0cc This might pass with upcoming release 3.1.3.
    feef205 Merge branch 'master' of github.com:BhallaLab/moose-examples
    c41af29 import fix to another file.
    2d30a30 Output comparision of GPU & CPU (#26)
    7295a8f numpy.array changed to np.array
    664f843 Maximum timeout is 1m for all script.
    0458697 Fixes to one more script. Error due to merge conflicts.
    27fddec Updated script.
    0694972 Run scripts now launches 8 process in parallel.
    15d3aa7 Merge branch 'master' of github.com:BhallaLab/moose-examples
    62d6c58 Enabled trap in bash script. Kill running test when user presses ctrl+c.
    65fb8a8 Added beta cmake based test flow.
    987c3fb Moved CMakeLists.txt to _travis folder. Old bash style build system is sufficient.
    d4a081f Removed one more duplicate file.
    9b13403 Removed duplicate files.
    98b5eb0 Fixes to script. Runs fine now.
    c42aa93 One more fix.
    626221e Removed merge conflict.
    f1b0bc4 Fixed one more script to make it work.
    09ca09e Merge branch 'master' of github.com:BhallaLab/moose-examples
    204d5e4 This is removed b'cos Rdesignuer does the job
    8c7c00c can pass command line arguments also
    70f83d0 cleanup in return type from None to moose.shell
    fe4238b indentation for python3
    3e81764 indentation fixes for python3
    66f1bb0 Removed <<<<, ===  and >>> from improper merge.
    0719a5d Merge commit '349abe7e'
    7054325 mooseaddChemSolver is needed in loadSbmlModel file
    6116c7e Indentation cleanup
    9fd501a conflict cleanups
    fe297f6 indentation correction
    2b24c64 indentation correction
    0e329d5 Merge branch 'master' of http://github.com/BhallaLab/moose-examples
    7ce262e corrected indentation
    864776c added deleted files
    87a6963 temp deleted
    0f1e722 Resolved merge conflict
    0ff3b05 temp deletion
    69062d9 For crossComptSimpleReac a temp fix so that segfault doesn't occur, rest cleanup
    729f216 deleted unwanted files and added new files
    7318878 cleanups
    045aa11 Fixed assert by Upi
    2b16c59 Deleted temp files.
    3881f8a khali khali
    97599aa Fixed docstring on example.
    
    git-subtree-dir: moose-examples
    git-subtree-split: 37bf0cc0a733d5b4c61659f9eb6e747f57530273
    b0021958