[cig-commits] [commit] master: Put in recursive guard check (23f37ce)

[cig_noreply at geodynamics.org]

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

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

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

commit 23f37ceed610216ddc5572726bc228528990fde7
Author: Eric Heien <emheien at ucdavis.edu>
Date:   Wed Sep 17 21:45:57 2014 -0700

    Put in recursive guard check


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

23f37ceed610216ddc5572726bc228528990fde7
 src/simulation/BASSAftershocks.cpp | 4 ++++
 1 file changed, 4 insertions(+)

diff --git a/src/simulation/BASSAftershocks.cpp b/src/simulation/BASSAftershocks.cpp
index 527d706..a5db798 100644
--- a/src/simulation/BASSAftershocks.cpp
+++ b/src/simulation/BASSAftershocks.cpp
@@ -35,6 +35,10 @@ SimRequest BASSAftershocks::run(SimFramework *_sim) {
     AftershockVector::iterator  it;
     quakelib::Conversion        convert;
 
+    // If the last event wasn't a static failure event, don't generate aftershocks
+    // Otherwise we're generating aftershocks for aftershocks, which is already done by the model
+    if (sim->getCurrentEvent().getEventTrigger() == UNDEFINED_BLOCK_ID) return SIM_STOP_OK;
+        
     // Get BASS parameters
     _Mm = sim->getBASSMinMagnitude();
     _dM = sim->getBASSAftershockStrength();