[cig-commits] [commit] master: Merge branch 'eheien-cff-output' (57fa194)

[cig_noreply at geodynamics.org]

Repository : https://github.com/geodynamics/vq

On branch  : master
Link       : https://github.com/geodynamics/vq/compare/06902a05cf4d70bc94c85d1c195c073d4e74cdad...c935dfd33f870a081b6c01cce97a060ad1cbdbda

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

commit 57fa1946bff41a7c40384cbab4de770575415c85
Merge: 63db716 6653564
Author: Eric Heien <emheien at ucdavis.edu>
Date:   Thu Nov 27 00:29:06 2014 -0800

    Merge branch 'eheien-cff-output'



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

57fa1946bff41a7c40384cbab4de770575415c85
 .gitignore                           |   2 +
 quakelib/src/QuakeLib.h              |  23 +-
 quakelib/src/QuakeLibIO.cpp          | 443 ++++++++++++++++++++++++++++++++++-
 quakelib/src/QuakeLibIO.h            | 188 ++++++++++++++-
 quakelib/src/QuakeLibUtil.h          |   2 +-
 src/core/Block.cpp                   |  57 +----
 src/core/Block.h                     | 145 +-----------
 src/core/InitBlocks.cpp              |   7 -
 src/core/Params.cpp                  |   3 +
 src/core/Params.h                    |  10 +
 src/core/SimData.cpp                 |  55 ++++-
 src/core/SimData.h                   |  54 ++---
 src/core/SimDataBlocks.cpp           |   2 -
 src/core/Simulation.cpp              | 132 +++++++++--
 src/core/Simulation.h                | 124 +++++++++-
 src/io/CheckpointFileOutput.cpp      |   2 +-
 src/io/HDF5Data.cpp                  |  20 +-
 src/io/HDF5Data.h                    |  11 -
 src/io/ReadModelFile.cpp             |   5 -
 src/simulation/GreensInit.cpp        |   2 +
 src/simulation/ProgressMonitor.cpp   |   2 +-
 src/simulation/RunEvent.cpp          |  69 +++---
 src/simulation/SanityCheck.cpp       |   2 +-
 src/simulation/UpdateBlockStress.cpp |  32 ++-
 24 files changed, 1029 insertions(+), 363 deletions(-)