Merge remote-tracking branch 'gonuke/decay_absorb' into decay_absorb

Author: gonuke

CHANGELOG.rst

@@ -42,6 +42,7 @@ Since last release
 
 
 **Changed:**
+* Absorb back to respect manual decay mode and the logic of the decay conditional (#1918)
 * Modified cycpp.py to fix a few whitespace-related bugs, and allow cyclus vars to be initialized (#1954)
 * Changed the epsilon (eps) in Material::Decay to 1e-4 allowing 1 day decay of tritium (#1946)
 * Changed the schema for recipes to require oneOrMore instead of zeroOrMore (#1940)

src/material.cc

@@ -103,29 +103,34 @@ Material::Ptr Material::ExtractComp(double qty, Composition::Ptr c,
 }
 
 void Material::Absorb(Material::Ptr mat) {
+  
+  bool tracked = HasContext();
+  bool mat_tracked = mat->HasContext();
 
-  // Handle absorb-specific decay rules
-  int common_decay_time;
-  if (HasContext() != mat->HasContext()) {
+  if (tracked != mat_tracked) {
     throw cyclus::Error("Cannot combine a tracked and untracked material!");
-  } else if (!HasContext()) {
-    // both materials are untracked
+  }
+
+  if (!tracked) {
     if (mat->prev_decay_time_ > prev_decay_time_) {
-      throw ValueError("Cannot absorb a material that is more decayed than this one");
-    } else {
-      common_decay_time = prev_decay_time_;
+      throw ValueError(
+          "Cannot absorb a material that is more decayed than this one");
     }
-  } else {
-    // both materials are tracked
-    common_decay_time = ctx_->time();    
-  }
 
-  mat->Decay(common_decay_time);
-  this->Decay(common_decay_time);
+    // Synchronize the incoming material with this material.
+    mat->Decay(prev_decay_time_);
+  } else if (ctx_->sim_info().decay == "lazy") {
+    // NOTE: Absorb will only Decay materials like this if the decay mode is
+    // set to lazy. If more decay modes are introduced in the future which 
+    // want Absorb to decay, this will need to be changed
+    int common_decay_time = ctx_->time();
+
+    mat->Decay(common_decay_time);
+    Decay(common_decay_time);
 
-  // manually update decay time in case the change was so small
-  // that no decay was invoked
-  this->prev_decay_time_ = common_decay_time;
+    // Decay may return early when the change is below its threshold.
+    prev_decay_time_ = common_decay_time;
+  }
 
   // these calls force lazy evaluation if in lazy decay mode
   Composition::Ptr c0 = comp();

tests/material_tests.cc

@@ -454,6 +454,12 @@ TEST_F(MaterialTest, TransmutePrevDecay) {
 
 TEST_F(MaterialTest, AbsorbPrevDecay) {
   FakeContext* fake_ctx = new FakeContext(&ti, &rec);
+  
+  // FakeContexts get generated with "manual" decay by default,
+  // so we need to set it to lazy to get Absorb to decay.
+  SimInfo lazy_si(100, 2015, 1, "", "lazy");
+  fake_ctx->InitSim(lazy_si);
+
   TestFacility* fake_fac = new TestFacility(fake_ctx);
 
   double untracked_qty = 1.0;