Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

update call to Package::GetFillMass #630

Merged
merged 1 commit into from
Sep 30, 2024
Merged

update call to Package::GetFillMass #630

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 1 addition & 1 deletion CHANGELOG.rst
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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:**
Expand Down
13 changes: 1 addition & 12 deletions src/source.cc
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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)
Expand Down
Loading