keep_packaging resbuf

cyclus · Jul 24, 2024 · d5cc4dc · d5cc4dc
1 parent c358180
commit d5cc4dc
Show file tree

Hide file tree

Showing 2 changed files with 6 additions and 9 deletions.
diff --git a/src/reactor.cc b/src/reactor.cc
@@ -64,9 +64,9 @@ void Reactor::EnterNotify() {
   cyclus::Facility::EnterNotify();
 
   // Set keep packaging parameter in all ResBufs
-  fresh.unpackaged(!keep_packaging);
-  core.unpackaged(!keep_packaging);
-  spent.unpackaged(!keep_packaging);
+  fresh.keep_packaging(keep_packaging);
+  core.keep_packaging(keep_packaging);
+  spent.keep_packaging(keep_packaging);
 
   // If the user ommitted fuel_prefs, we set it to zeros for each fuel
   // type.  Without this segfaults could occur - yuck.

diff --git a/src/reactor.h b/src/reactor.h
@@ -421,14 +421,11 @@ class Reactor : public cyclus::Facility,
 
   // Resource inventories - these must be defined AFTER/BELOW the member vars
   // referenced (e.g. n_batch_fresh, assem_size, etc.).
-  #pragma cyclus var {"capacity": "n_assem_fresh * assem_size", \
-    "keep_packaging": "keep_packaging"}
+  #pragma cyclus var {"capacity": "n_assem_fresh * assem_size"}
   cyclus::toolkit::ResBuf<cyclus::Material> fresh;
-  #pragma cyclus var {"capacity": "n_assem_core * assem_size", \
-    "keep_packaging": "keep_packaging"}
+  #pragma cyclus var {"capacity": "n_assem_core * assem_size"}
   cyclus::toolkit::ResBuf<cyclus::Material> core;
-  #pragma cyclus var {"capacity": "n_assem_spent * assem_size", \
-    "keep_packaging": "keep_packaging"}
+  #pragma cyclus var {"capacity": "n_assem_spent * assem_size"}
   cyclus::toolkit::ResBuf<cyclus::Material> spent;