Merge pull request #587 from nuclearkatie/old_active_dormant_in_storage

Old active dormant parameters hanging around in storage
cyclus · Feb 29, 2024 · b677545 · b677545
2 parents c9b6109 + b097e60
commit b677545
Show file tree

Hide file tree

Showing 2 changed files with 2 additions and 25 deletions.
diff --git a/CHANGELOG.rst b/CHANGELOG.rst
@@ -8,14 +8,14 @@ cycamore Change Log
 * Downstream testing in CI workflows (#573, #580, #582, #583)
 * GitHub workflow for publishing images on release (#573, #582, #583)
 * GitHub workflows for building/testing on a PR and push to `main` (#549, #564, #573, #582, #583)
-* Add functionality for random behavior on the size (#550) and frequency (#565) of a sink (#586)
+* Add functionality for random behavior on the size (#550) and frequency (#565) of a sink
 * GitHub workflow to check that the CHANGELOG has been updated (#562) 
 * Added inventory policies to Storage through the material buy policy (#574)
 
 **Changed:** 
 
 * Updated build procedure to use newer versions of packages in 2023 (#549)
-* Added active/dormant and request size variation from buy policy to Storage (#546, #568)
+* Added active/dormant and request size variation from buy policy to Storage (#546, #568, #586, #587)
 * Update build procedure to force a rebuild when a test file is changed (#584)
 
 v1.5.5

diff --git a/src/storage.h b/src/storage.h
@@ -421,29 +421,6 @@ class Storage
                       "uilabel":"Reorder Quantity"}
   double reorder_quantity;
 
-  #pragma cyclus var {"default": 1,\
-                      "tooltip": "Length of the active buying "\
-                        "period",\
-                      "doc":"During the length of the active buying "\
-                        "period, agent exhibits regular behavior. "\
-                        "If paired with dormant buying period, "\
-                        "alternates between buying and not buying, "\
-                        "regardless if space is available",\
-                      "uilabel":"Active Buying Period"}
-  int active_buying;
-
-  #pragma cyclus var {"default": 0,\
-                      "tooltip": "Length of the dormant buying "\
-                        "period",\
-                      "doc":"During the length of the dormant buying "\
-                        "period, agent will not request any new "\
-                        "material from the DRE. Paired with active "\
-                        "buying period, alternates between buying "\
-                        "and not buying, regardless if space is "\
-                        "available",\
-                      "uilabel":"Dormant (No Buying) Period"}
-  int dormant_buying;
-
   #pragma cyclus var {"tooltip":"Incoming material buffer"}
   cyclus::toolkit::ResBuf<cyclus::Material> inventory;