From 1ed34c3d934d4b5bccb308b8b92a5de3aaf11498 Mon Sep 17 00:00:00 2001 From: Katie Mummah Date: Wed, 25 Sep 2024 14:32:41 -0500 Subject: [PATCH] update call to Package::GetFillMass --- CHANGELOG.rst | 2 +- src/source.cc | 13 +------------ 2 files changed, 2 insertions(+), 13 deletions(-) diff --git a/CHANGELOG.rst b/CHANGELOG.rst index 07d5a32e2..17ba4f254 100644 --- a/CHANGELOG.rst +++ b/CHANGELOG.rst @@ -7,7 +7,7 @@ Since last release **Added:** * Added package parameter to storage (#603, #612, #616) -* Added package parameter to source (#613, #617, #621, #623) +* Added package parameter to source (#613, #617, #621, #623, #630) * Added default keep packaging to reactor (#618, #619) **Changed:** diff --git a/src/source.cc b/src/source.cc index 7d6b0f864..6525d91a4 100644 --- a/src/source.cc +++ b/src/source.cc @@ -107,18 +107,7 @@ std::set::Ptr> Source::GetMatlBids( double qty = std::min(target->quantity(), max_qty); // calculate packaging - std::pair fill = context()->GetPackage(package)->GetFillMass(qty); - double bid_qty = fill.first; - int n_full_bids = fill.second; - Package::ExceedsSplitLimits(n_full_bids); - - std::vector bids; - bids.assign(n_full_bids, bid_qty); - - double remaining_qty = qty - (n_full_bids * bid_qty); - if ((remaining_qty > cyclus::eps()) && (remaining_qty >= context()->GetPackage(package)->fill_min())) { - bids.push_back(remaining_qty); - } + std::vector bids = context()->GetPackage(package)->GetFillMass(qty); // calculate transport units int shippable_pkgs = context()->GetTransportUnit(transport_unit)