more implementation changes

Author: dean-krueger

src/mixer.cc

@@ -59,6 +59,11 @@ void Mixer::EnterNotify() {
     in_commods.push_back(streams_[i].second);
   }
 
+  // Optional recipe per stream: size to match streams_, use "" where not set
+  if (in_stream_recipes.size() < streams_.size()) {
+    in_stream_recipes.resize(streams_.size(), "");
+  }
+
   // ratio normalisation
   if (mixing_ratios.size() != in_commods.size()) {
     std::stringstream ss;
@@ -90,6 +95,13 @@ void Mixer::EnterNotify() {
 
   sell_policy.Init(this, &output, "output").Set(out_commod).Start();
 
+  // Register output recipe name at sim start so it exists before first mix.
+  // Placeholder composition is overwritten with the real blend when we push.
+  if (!out_recipe.empty()) {
+    cyclus::CompMap empty;
+    context()->AddRecipe(out_recipe, cyclus::Composition::CreateFromMass(empty));
+  }
+
   InitializeMarginalCost();
   InitializePosition();
 }
@@ -122,6 +134,9 @@ void Mixer::Tick() {
         }
       }
 
+      if (!out_recipe.empty()) {
+        context()->AddRecipe(out_recipe, m->comp());
+      }
       output.Push(m);
     }
   }
@@ -169,7 +184,12 @@ Mixer::GetMatlRequests() {
           new RequestPortfolio<cyclus::Material>());
 
       cyclus::Material::Ptr m;
-      m = cyclus::NewBlankMaterial(streambufs[name].space());
+      if (i < in_stream_recipes.size() && !in_stream_recipes[i].empty()) {
+        cyclus::Composition::Ptr rec = context()->GetRecipe(in_stream_recipes[i]);
+        m = cyclus::Material::CreateUntracked(streambufs[name].space(), rec);
+      } else {
+        m = cyclus::NewBlankMaterial(streambufs[name].space());
+      }
 
       std::vector<cyclus::Request<cyclus::Material>*> reqs;
 

src/mixer.h

@@ -76,12 +76,31 @@ class Mixer
   // state var.
   std::map<std::string, cyclus::toolkit::ResBuf<cyclus::Material> > streambufs;
 
+#pragma cyclus var { \
+    "default": [], \
+    "doc": "Optional recipe name for each input stream (same order as in_streams). " \
+           "If set, requests on that stream use this recipe so suppliers (e.g. Enrichment) " \
+           "can match. Empty string or omitted means no recipe (blank/dummy composition).", \
+    "uilabel": "Input Stream Recipes", \
+    "uitype": ["oneormore", "inrecipe"] \
+  }
+  std::vector<std::string> in_stream_recipes;
 
 #pragma cyclus var {                                                 \
   "doc" : "Commodity on which to offer/supply mixed fuel material.", \
   "uilabel" : "Output Commodity", "uitype" : "outcommodity", }
   std::string out_commod;
 
+#pragma cyclus var { \
+    "default": "", \
+    "doc": "Optional name to register the blended composition under. If set, " \
+           "the mixed material's composition is registered as this recipe name " \
+           "in the context (no transmutation); the blend is kept and just named.", \
+    "uilabel": "Output Recipe", \
+    "uitype": "outrecipe", \
+  }
+  std::string out_recipe;
+
 #pragma cyclus var { \
     "doc" : "Maximum amount of mixed material that can be stored." \
             " If full, the facility halts operation until space becomes" \

src/separations.cc

@@ -334,7 +334,7 @@ std::set<cyclus::BidPortfolio<Material>::Ptr> Separations::GetMatlBids(
         tot_bid += m->quantity();
 
 
-        double marginal_cost = CalcMarginalCost(m->UnitValue());
+        double marginal_cost = 0.0; // Set to zero since this is a waste stream?
 
         // this fix the problem of the cyclus exchange manager which crashes
         // when a bid with a quantity <=0 is offered.