Merge branch 'main' into compiler-warnings

Signed-off-by: Ben Nibbelink <[email protected]>
abachma2 · Sep 24, 2024 · 7b9bf6f · 7b9bf6f
2 parents b08d6f3 + bde9307
commit 7b9bf6f
Show file tree

Hide file tree

Showing 2 changed files with 9 additions and 3 deletions.
diff --git a/CHANGELOG.rst b/CHANGELOG.rst
@@ -40,6 +40,8 @@ Since last release
 * Updated action versions to avoid node.js deprecation (#1802)
 * Removed the module imports in `cyclus/__init__.py` and removed the need for multi-phase initialization of Cython modules (#1809)
 * No longer use deprecated Numpy Cython api when Cython>=3 (#1811)
+* ResTracker Extract gave the wrong parent_id to one of the child resources (#1806)
+
 
 v1.6.0
 ====================

diff --git a/src/res_tracker.cc b/src/res_tracker.cc
@@ -49,15 +49,19 @@ void ResTracker::Extract(ResTracker* removed) {
   if (res_->quantity() > eps_rsrc()) {
     parent1_ = res_->state_id();
     parent2_ = 0;
-
-    Record();
   }
 
+  // removed parent must be set before the resource is recorded, otherwise
+  // removed ends up with parent1 of the other child (which is this resource
+  // after being bumped)
   removed->parent1_ = res_->state_id();
   removed->parent2_ = 0;
   removed->tracked_ = tracked_;
-
   removed->Record();
+
+  if (res_->quantity() > eps_rsrc()) {
+    Record();
+  }
 }
 
 void ResTracker::Absorb(ResTracker* absorbed) {