Merge pull request #630 from nuclearkatie/src_pkg

cyclus · Sep 30, 2024 · a4ea59d · a4ea59d
2 parents 6dc5ecb + 1ed34c3
commit a4ea59d
Show file tree

Hide file tree

Showing 2 changed files with 2 additions and 13 deletions.
diff --git 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
@@ -107,18 +107,7 @@ std::set<cyclus::BidPortfolio<cyclus::Material>::Ptr> Source::GetMatlBids(
     double qty = std::min(target->quantity(), max_qty);
 
     // calculate packaging
-    std::pair<double, int> fill = context()->GetPackage(package)->GetFillMass(qty);
-    double bid_qty = fill.first;
-    int n_full_bids = fill.second;
-    Package::ExceedsSplitLimits(n_full_bids);
-
-    std::vector<double> 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<double> bids = context()->GetPackage(package)->GetFillMass(qty);
 
     // calculate transport units
     int shippable_pkgs = context()->GetTransportUnit(transport_unit)