[cig-commits] [commit] master: Merge branch 'eheien_aftershock_mod' (633b4a9)
cig_noreply at geodynamics.org
cig_noreply at geodynamics.org
Wed Oct 8 17:06:49 PDT 2014
Repository : https://github.com/geodynamics/vc
On branch : master
Link : https://github.com/geodynamics/vc/compare/23464fca3efa2b6ad7ee0ce8f60c225b18b49741...e4325192ad1118379f46ba66899cb98143d09e04
>---------------------------------------------------------------
commit 633b4a98e08782cdf83d9ee5dee02378deaa4b84
Merge: 38aae7e ed22185
Author: Eric Heien <emheien at ucdavis.edu>
Date: Wed Oct 8 16:56:38 2014 -0700
Merge branch 'eheien_aftershock_mod'
Conflicts:
src/core/VCSimulation.cpp
>---------------------------------------------------------------
633b4a98e08782cdf83d9ee5dee02378deaa4b84
examples/CMakeLists.txt | 38 +-
examples/check_results.py | 152 ++-----
quakelib/python/quakelib.i | 72 ++-
quakelib/src/QuakeLib.h | 17 +-
quakelib/src/QuakeLibIO.cpp | 822 ++++++++++++++++++++++++++++++-----
quakelib/src/QuakeLibIO.h | 400 ++++++++++++++++-
quakelib/test/UtilUnitTest.py | 13 +
src/core/VCBlock.cpp | 5 +-
src/core/VCBlock.h | 10 +-
src/core/VCComm.cpp | 17 +-
src/core/VCComm.h | 2 +-
src/core/VCEvent.cpp | 186 --------
src/core/VCEvent.h | 277 +-----------
src/core/VCSimDataBlocks.h | 1 +
src/core/VCSimDataEvents.h | 27 +-
src/core/VCSimulation.cpp | 127 +++---
src/core/VCSimulation.h | 12 +-
src/io/EventOutput.cpp | 114 +++--
src/io/EventOutput.h | 7 +-
src/io/HDF5Data.cpp | 360 +--------------
src/io/HDF5Data.h | 131 ------
src/mesher.cpp | 0
src/misc/GreensFunctions.cpp | 6 +-
src/simulation/BASSAftershocks.cpp | 33 +-
src/simulation/BASSAftershocks.h | 11 +-
src/simulation/ProgressMonitor.cpp | 2 +-
src/simulation/RunEvent.cpp | 236 +++++++---
src/simulation/RunEvent.h | 18 +-
src/simulation/UpdateBlockStress.cpp | 82 ++--
src/simulation/UpdateBlockStress.h | 3 +-
30 files changed, 1744 insertions(+), 1437 deletions(-)
More information about the CIG-COMMITS
mailing list