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

Jump to bottom

Deprecate ResourceBuff #604

Merged
merged 3 commits into from
May 18, 2024
Merged

Deprecate ResourceBuff #604

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
0be715c
remove reference to Manifest
bennibbelink May 17, 2024
cfbaba1
Update CHANGELOG.rst
bennibbelink May 17, 2024
72ccbab
clean up using cyclus:: statements
bennibbelink May 17, 2024
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Jump to
Jump to file
Failed to load files.
Diff view
Diff view
4 changes: 3 additions & 1 deletion CHANGELOG.rst
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -9,12 +9,14 @@ Since last release

**Changed:**

* Rely on `python3` in environment instead of `python` (#602)
* Rely on ``python3`` in environment instead of ``python`` (#602)
gonuke marked this conversation as resolved.
Show resolved Hide resolved

**Fixed:**

**Removed:**

* Removed references to deprecated ``ResourceBuff`` class (#604)


v1.6.0
====================
Expand Down
10 changes: 1 addition & 9 deletions src/storage.cc
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -41,8 +41,7 @@ void Storage::InitFrom(Storage* m) {
void Storage::InitFrom(cyclus::QueryableBackend* b) {
#pragma cyclus impl initfromdb cycamore::Storage

using cyclus::toolkit::Commodity;
Commodity commod = Commodity(out_commods.front());
cyclus::toolkit::Commodity commod = cyclus::toolkit::Commodity(out_commods.front());
cyclus::toolkit::CommodityProducer::Add(commod);
cyclus::toolkit::CommodityProducer::SetCapacity(commod, throughput);
}
Expand Down Expand Up @@ -241,7 +240,6 @@ void Storage::Tick() {

//- - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - -
void Storage::Tock() {
using cyclus::toolkit::RecordTimeSeries;
LOG(cyclus::LEV_INFO3, "ComCnv") << prototype() << " is tocking {";

BeginProcessing_(); // place unprocessed inventory into processing
Expand Down Expand Up @@ -315,11 +313,6 @@ void Storage::BeginProcessing_() {

//- - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - -
void Storage::ProcessMat_(double cap) {
using cyclus::Material;
using cyclus::ResCast;
using cyclus::toolkit::ResBuf;
using cyclus::toolkit::Manifest;
Copy link
Member

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

While we're here... I don't see any reason for any of these using statements to be here...?

Copy link
Contributor Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Great point. I went through storage.cc and cleaned up some other using statements. A quick search of the cycamore archetypes shows there are a lot of using statements throughout the repo. I will make an issue to go through and clean up where it is necessary


if (!ready.empty()) {
try {
double max_pop = std::min(cap, ready.quantity());
Expand Down Expand Up @@ -351,7 +344,6 @@ void Storage::ProcessMat_(double cap) {

//- - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - -
void Storage::ReadyMatl_(int time) {
using cyclus::toolkit::ResBuf;
LOG(cyclus::LEV_INFO5, "ComCnv") << "Placing material into ready";

int to_ready = 0;
Expand Down