[cig-commits] [commit] master: Merge pull request #20 from eheien/master (de41758)

[cig_noreply at geodynamics.org]

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

On branch  : master
Link       : https://github.com/geodynamics/vc/compare/64c223c129f70f3916341f1ebdf52f6d2ae1deae...de41758e125fcac4ea5fb0935597c3b662ff523c

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

commit de41758e125fcac4ea5fb0935597c3b662ff523c
Merge: 64c223c c11c9fd
Author: Eric Heien <eheien at users.noreply.github.com>
Date:   Tue Oct 21 16:28:04 2014 -0700

    Merge pull request #20 from eheien/master
    
    Param file fixes, rename to VQ



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

de41758e125fcac4ea5fb0935597c3b662ff523c
 CMakeLists.txt                                     |  23 +-
 config.h.in                                        |  17 +-
 doc/graphics/{VCFlow.odg => VQFlow.odg}            | Bin
 doc/graphics/{VCFlow.pdf => VQFlow.pdf}            | Bin
 doc/{vc_flow.dot => graphics/vq_flow.dot}          |   0
 doc/{vc.bib => vq.bib}                             |   0
 doc/{vc.tex => vq.tex}                             | 269 ++++++++++-----------
 examples/CMakeLists.txt                            |  24 +-
 quakelib/src/QuakeLibIO.h                          |   2 +-
 src/CMakeLists.txt                                 | 167 +++++++------
 src/core/{VCBlock.cpp => Block.cpp}                |   2 +-
 src/core/{VCBlock.h => Block.h}                    |   4 +-
 src/core/{VCComm.cpp => Comm.cpp}                  |   2 +-
 src/core/{VCComm.h => Comm.h}                      |   6 +-
 .../{VCSimDataEvents.cpp => CommPartition.cpp}     |   2 +-
 src/core/{VCCommPartition.h => CommPartition.h}    |   6 +-
 src/core/{VCEvent.cpp => Event.cpp}                |   4 +-
 src/core/{VCEvent.h => Event.h}                    |  18 +-
 src/core/{VCInitBlocks.cpp => InitBlocks.cpp}      |   9 +-
 src/core/{VCInitBlocks.h => InitBlocks.h}          |   6 +-
 src/core/Params.cpp                                |  89 +++++++
 src/core/{VCParams.h => Params.h}                  | 123 ++++------
 src/core/{VCSimData.cpp => SimData.cpp}            |   3 +-
 src/core/{VCSimData.h => SimData.h}                |   8 +-
 .../{VCSimDataBlocks.cpp => SimDataBlocks.cpp}     |   3 +-
 src/core/{VCSimDataBlocks.h => SimDataBlocks.h}    |  18 +-
 .../{VCCommPartition.cpp => SimDataEvents.cpp}     |   2 +-
 src/core/{VCSimDataEvents.h => SimDataEvents.h}    |  14 +-
 src/core/SimError.h                                |  41 ----
 src/core/SimFramework.cpp                          |   3 +
 src/core/SimFramework.h                            |  15 +-
 src/core/SimTimer.cpp                              |   3 +-
 src/core/SimTimer.h                                |   2 +-
 src/core/{VCSimulation.cpp => Simulation.cpp}      |  66 +++--
 src/core/{VCSimulation.h => Simulation.h}          |  28 +--
 src/core/VCParams.cpp                              | 144 -----------
 src/io/CheckpointFileOutput.cpp                    |   8 +-
 src/io/CheckpointFileOutput.h                      |   4 +-
 src/io/CheckpointFileParse.cpp                     |   4 +-
 src/io/CheckpointFileParse.h                       |   2 +-
 src/io/EventOutput.cpp                             |  12 +-
 src/io/EventOutput.h                               |   8 +-
 src/io/GreensFileOutput.cpp                        |   5 +-
 src/io/GreensFileOutput.h                          |   2 +-
 src/io/HDF5Data.h                                  |   4 +-
 src/io/ReadModelFile.cpp                           |   2 +-
 src/io/ReadModelFile.h                             |   2 +-
 src/main.cpp                                       |   8 +-
 src/misc/ConfigFile.h                              |  15 ++
 src/misc/GreensFunctions.cpp                       |  15 +-
 src/misc/GreensFunctions.h                         |  20 +-
 src/simulation/BASSAftershocks.cpp                 |  20 +-
 src/simulation/BASSAftershocks.h                   |   6 +-
 src/simulation/GracefulQuit.cpp                    |   6 +-
 src/simulation/GracefulQuit.h                      |   4 +-
 src/simulation/GreensInit.cpp                      |   4 +-
 src/simulation/GreensKillInteraction.cpp           |   6 +-
 src/simulation/GreensKillInteraction.h             |   2 +-
 src/simulation/ProgressMonitor.cpp                 |   8 +-
 src/simulation/ProgressMonitor.h                   |   4 +-
 src/simulation/RunEvent.cpp                        |  17 +-
 src/simulation/RunEvent.h                          |  14 +-
 src/simulation/SanityCheck.cpp                     |   8 +-
 src/simulation/SanityCheck.h                       |   6 +-
 src/simulation/UpdateBlockStress.cpp               |   3 +-
 src/simulation/UpdateBlockStress.h                 |   4 +-
 66 files changed, 621 insertions(+), 725 deletions(-)