[cig-commits] [commit] master: Merge pull request #1 from karredondo/master (fb1839e)

[cig_noreply at geodynamics.org]

Repository : ssh://geoshell/citcoms

On branch  : master
Link       : https://github.com/geodynamics/citcoms/compare/c770f8e2897398470734bc655d8a155819f81c57...fb1839e7e93bc56eb542afd64b3db70f2df6a5d8

>---------------------------------------------------------------

commit fb1839e7e93bc56eb542afd64b3db70f2df6a5d8
Merge: c770f8e 7ca37a6
Author: Eric Heien <eheien at users.noreply.github.com>
Date:   Fri Feb 14 14:32:46 2014 -0800

    Merge pull request #1 from karredondo/master
    
    Add ability to combine "heating" output



>---------------------------------------------------------------

fb1839e7e93bc56eb542afd64b3db70f2df6a5d8
 visual/autocombine.py  | 27 ++++++++++++++++++++++++++-
 visual/batchcombine.py |  2 +-
 visual/combine.py      | 46 +++++++++++++++++++++++++++++++++++++++++++++-
 3 files changed, 72 insertions(+), 3 deletions(-)