From d5cc4dc1ded478e79afa07f94d634fcf3da264e1 Mon Sep 17 00:00:00 2001 From: Katie Mummah Date: Wed, 24 Jul 2024 15:47:56 -0500 Subject: [PATCH] keep_packaging resbuf --- src/reactor.cc | 6 +++--- src/reactor.h | 9 +++------ 2 files changed, 6 insertions(+), 9 deletions(-) diff --git a/src/reactor.cc b/src/reactor.cc index 5059a3d47..0e4dca51c 100644 --- 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 index f94e5a0ea..d6c1cc65d 100644 --- 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 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 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 spent;