[cig-commits] [commit] master: Change to use right function for simulation year (c967297)

[cig_noreply at geodynamics.org]

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

On branch  : master
Link       : https://github.com/geodynamics/vc/compare/23464fca3efa2b6ad7ee0ce8f60c225b18b49741...e4325192ad1118379f46ba66899cb98143d09e04

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

commit c967297f1d5bb7e11d1815eb95f1aaa8099cf7e4
Author: Eric Heien <emheien at ucdavis.edu>
Date:   Wed Sep 17 15:33:53 2014 -0700

    Change to use right function for simulation year


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

c967297f1d5bb7e11d1815eb95f1aaa8099cf7e4
 src/simulation/UpdateBlockStress.cpp | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/src/simulation/UpdateBlockStress.cpp b/src/simulation/UpdateBlockStress.cpp
index 904168a..854ee4a 100644
--- a/src/simulation/UpdateBlockStress.cpp
+++ b/src/simulation/UpdateBlockStress.cpp
@@ -132,7 +132,7 @@ SimRequest UpdateBlockStress::run(SimFramework *_sim) {
  */
 void UpdateBlockStress::nextAftershock(BlockVal &next_aftershock) {
     if (sim->isRootNode() && sim->numAftershocksToProcess() > 0) {
-        next_aftershock.val = sim->curTime() - sim->nextAftershockTime();
+        next_aftershock.val = sim->getYear() - sim->nextAftershockTime();
         next_aftershock.block_id = UNDEFINED_BLOCK_ID;
     } else {
         next_aftershock.val = DBL_MAX;