From 2ef13c9e435c55afad21ba5a4ba90827bc5f89fa Mon Sep 17 00:00:00 2001 From: Mouginot B Date: Tue, 23 May 2017 17:05:05 -0500 Subject: [PATCH 01/12] update --- README.md | 1 - 1 file changed, 1 deletion(-) diff --git a/README.md b/README.md index d3d3b20..cb313ae 100644 --- a/README.md +++ b/README.md @@ -1,4 +1,3 @@ -===== cycvt ===== From cfaea747855016f5009e674d5f626de620999c72 Mon Sep 17 00:00:00 2001 From: Baptiste Mouginot <15145274+bam241@users.noreply.github.com> Date: Fri, 16 Sep 2022 17:37:17 +0200 Subject: [PATCH 02/12] Update CMakeLists.txt test fix install dir --- src/CMakeLists.txt | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/CMakeLists.txt b/src/CMakeLists.txt index 2f9b457..879794e 100644 --- a/src/CMakeLists.txt +++ b/src/CMakeLists.txt @@ -1,7 +1,7 @@ ### DO NOT DELETE THIS COMMENT: INSERT_ARCHETYPES_HERE ### USE_CYCLUS("cycvt" "special_enrich") -INSTALL_CYCLUS_MODULE("cycvt" "./cycvt") +INSTALL_CYCLUS_MODULE("cycvt" "" "NONE") # install header files FILE(GLOB h_files "${CMAKE_CURRENT_SOURCE_DIR}/*.h") From 2940c27e7147e2c187d5f9187a43bbce75e178bb Mon Sep 17 00:00:00 2001 From: Baptiste Mouginot <15145274+bam241@users.noreply.github.com> Date: Sat, 17 Sep 2022 09:30:52 +0200 Subject: [PATCH 03/12] reshaping u8_eq to avoid crash --- .gitignore | 1 + src/special_enrich.cc | 68 +++++++++++++++++++++---------------------- 2 files changed, 35 insertions(+), 34 deletions(-) diff --git a/.gitignore b/.gitignore index 378eac2..d76b74e 100644 --- a/.gitignore +++ b/.gitignore @@ -1 +1,2 @@ build +.DS_Store diff --git a/src/special_enrich.cc b/src/special_enrich.cc index 7a77abd..6fdd62f 100644 --- a/src/special_enrich.cc +++ b/src/special_enrich.cc @@ -14,42 +14,44 @@ namespace cycvt { std::pair equivalent_u8( cyclus::Material::Ptr mat, std::map ux) { double initial_q = mat->quantity(); - cyclus::Material::Ptr equiv_mat = - cyclus::Material::CreateUntracked(mat->quantity(), mat->comp()); - cyclus::Material::Ptr mat_special_nucs; + std::map initial_mass_compo = mat->comp()->mass(); - cyclus::CompMap to_substract; - double q_to_switch = 0; + std::map eq_mass_compo; + std::map extract_mass_compo; - std::map::iterator it; + double mass_out = 0; - for (it = ux.begin(); it != ux.end(); it++) { - cyclus::toolkit::MatQuery mq(mat); - double nuc_i_mass = mq.mass(it->first); - q_to_switch += nuc_i_mass; - to_substract[it->first] = nuc_i_mass; - } - if (to_substract.size() != 0) { - cyclus::Composition::Ptr c_special_nucs = - cyclus::Composition::CreateFromMass(to_substract); - mat_special_nucs = - cyclus::Material::CreateUntracked(q_to_switch, c_special_nucs); - equiv_mat->ExtractComp(q_to_switch, c_special_nucs); - - cyclus::CompMap to_add; - to_add[922380000] = q_to_switch; - cyclus::Composition::Ptr c_to_add = - cyclus::Composition::CreateFromMass(to_add); - equiv_mat->Absorb(cyclus::Material::CreateUntracked(q_to_switch, c_to_add)); - } else { - return std::pair( - equiv_mat, mat_special_nucs); - } + // Initialise U238 in Eq mat + eq_mass_compo.insert(std::pair(922380000, 0)); - if (equiv_mat->quantity() != mat->quantity()) { - std::cout << "Oupsy !!" << std::endl; + std::map::iterator it; + for (it = initial_mass_compo.begin(); it != initial_mass_compo.end(); it++) { + cyclus::Nuc nuc = it->first; + double qty = it->second; + + std::map::iterator it2 = ux.find(nuc); + if (it2 != ux.end()) { + extract_mass_compo.insert(std::pair(nuc, qty)); + eq_mass_compo[922380000] += qty; + mass_out += qty; + } else { + if (nuc == 922380000) + eq_mass_compo[922380000] += qty; + else + eq_mass_compo.insert(std::pair(nuc, qty)); + } } - + + cyclus::Composition::Ptr equival_compo = + cyclus::Composition::CreateFromMass(eq_mass_compo); + cyclus::Material::Ptr equiv_mat = + cyclus::Material::CreateUntracked(mat->quantity(), equival_compo); + + cyclus::Composition::Ptr extract_compo = + cyclus::Composition::CreateFromMass(extract_mass_compo); + cyclus::Material::Ptr mat_special_nucs = + cyclus::Material::CreateUntracked(mat->quantity(), extract_compo); + // return a pair containing the equivalent material replacing all special // nucs but U-238, and the replaced material containing the special nucs. return std::pair( @@ -438,7 +440,7 @@ cyclus::Material::Ptr SEnrichment::Enrich_(cyclus::Material::Ptr mat, std::pair flip_mat = equivalent_u8(natu_matl, ux); - + cyclus::Material::Ptr equiv_natu_mat = flip_mat.first; cyclus::toolkit::MatQuery mq(equiv_natu_mat); @@ -487,10 +489,8 @@ cyclus::Material::Ptr SEnrichment::Enrich_(cyclus::Material::Ptr mat, cyclus::toolkit::MatQuery mq_flip(flip_mat.first); double u5_flip_enrich = mq_flip.mass_frac(922350000); - std::map::iterator it; for (it = ux.begin(); it != ux.end(); it++) { - double nuc_i_enrich_factor = u5_raw_enrich / u5_flip_enrich * it->second; From 8260fa6bbc833bf4a79ddbedd6668c27653b02b5 Mon Sep 17 00:00:00 2001 From: Baptiste Mouginot <15145274+bam241@users.noreply.github.com> Date: Mon, 19 Sep 2022 14:16:11 +0200 Subject: [PATCH 04/12] udpate --- src/special_enrich.cc | 39 ++++++++++++++++++++++----------------- 1 file changed, 22 insertions(+), 17 deletions(-) diff --git a/src/special_enrich.cc b/src/special_enrich.cc index 6fdd62f..8b687fe 100644 --- a/src/special_enrich.cc +++ b/src/special_enrich.cc @@ -472,6 +472,11 @@ cyclus::Material::Ptr SEnrichment::Enrich_(cyclus::Material::Ptr mat, // "enrich" it, but pull out the composition and quantity we require from the // blob cyclus::Composition::Ptr comp = mat->comp(); + std::map compo = comp->atom(); + std::map::iterator it2; + for (it2 = compo.begin(); it2 != compo.end(); it2++) { + std::cout << it2->first << " " << it2->second << std::endl; + } Material::Ptr response = r->ExtractComp(qty, comp); current_swu_capacity -= swu_req; @@ -480,7 +485,8 @@ cyclus::Material::Ptr SEnrichment::Enrich_(cyclus::Material::Ptr mat, intra_timestep_feed_ += feed_req; RecordSEnrichment_(feed_req, swu_req); - // Re-Add the special nuc inside the product, and fix tails amount accordingly + // Re-Add the special nuc inside the product, and fix tails amount + // accordingly double prod_mass = response->quantity(); @@ -491,16 +497,15 @@ cyclus::Material::Ptr SEnrichment::Enrich_(cyclus::Material::Ptr mat, std::map::iterator it; for (it = ux.begin(); it != ux.end(); it++) { - double nuc_i_enrich_factor = - u5_raw_enrich / u5_flip_enrich * it->second; + double nuc_i_enrich_factor = u5_raw_enrich / u5_flip_enrich * it->second; cyclus::toolkit::MatQuery mq_(natu_matl); double nuc_i_feed_enrich = mq_.mass(it->first) / natu_matl->quantity(); double nuc_i_prod_enrich = nuc_i_feed_enrich * nuc_i_enrich_factor; double nuc_i_prod_mass = nuc_i_prod_enrich * prod_mass; - // Remove come ux from the material pushed in the tails and add in into the - // response, do the otherwise for the U-238 to conserve mass balance. + // Remove come ux from the material pushed in the tails and add in into + // the response, do the otherwise for the U-238 to conserve mass balance. cyclus::CompMap nuc_to_add; nuc_to_add[it->first] = nuc_i_prod_mass; response->Absorb(cyclus::Material::CreateUntracked( @@ -518,21 +523,21 @@ cyclus::Material::Ptr SEnrichment::Enrich_(cyclus::Material::Ptr mat, tails.Push(r); - LOG(cyclus::LEV_INFO5, "EnrFac") << prototype() - << " has performed an enrichment: "; + LOG(cyclus::LEV_INFO5, "EnrFac") + << prototype() << " has performed an enrichment: "; LOG(cyclus::LEV_INFO5, "EnrFac") << " * Feed Qty: " << feed_req; - LOG(cyclus::LEV_INFO5, "EnrFac") << " * Feed Assay: " - << assays.Feed() * 100; + LOG(cyclus::LEV_INFO5, "EnrFac") + << " * Feed Assay: " << assays.Feed() * 100; LOG(cyclus::LEV_INFO5, "EnrFac") << " * Product Qty: " << qty; - LOG(cyclus::LEV_INFO5, "EnrFac") << " * Product Assay: " - << assays.Product() * 100; - LOG(cyclus::LEV_INFO5, "EnrFac") << " * Tails Qty: " - << TailsQty(qty, assays); - LOG(cyclus::LEV_INFO5, "EnrFac") << " * Tails Assay: " - << assays.Tails() * 100; + LOG(cyclus::LEV_INFO5, "EnrFac") + << " * Product Assay: " << assays.Product() * 100; + LOG(cyclus::LEV_INFO5, "EnrFac") + << " * Tails Qty: " << TailsQty(qty, assays); + LOG(cyclus::LEV_INFO5, "EnrFac") + << " * Tails Assay: " << assays.Tails() * 100; LOG(cyclus::LEV_INFO5, "EnrFac") << " * SWU: " << swu_req; - LOG(cyclus::LEV_INFO5, "EnrFac") << " * Current SWU capacity: " - << current_swu_capacity; + LOG(cyclus::LEV_INFO5, "EnrFac") + << " * Current SWU capacity: " << current_swu_capacity; return response; } From 20d21004bbca707bc3d9e88e47bec0fe174c9cfd Mon Sep 17 00:00:00 2001 From: Baptiste Mouginot <15145274+bam241@users.noreply.github.com> Date: Mon, 19 Sep 2022 14:36:55 +0200 Subject: [PATCH 05/12] reimplementing mat correction --- src/special_enrich.cc | 73 +++++++++++++++++++++---------------------- 1 file changed, 35 insertions(+), 38 deletions(-) diff --git a/src/special_enrich.cc b/src/special_enrich.cc index 8b687fe..2a3bb98 100644 --- a/src/special_enrich.cc +++ b/src/special_enrich.cc @@ -472,12 +472,41 @@ cyclus::Material::Ptr SEnrichment::Enrich_(cyclus::Material::Ptr mat, // "enrich" it, but pull out the composition and quantity we require from the // blob cyclus::Composition::Ptr comp = mat->comp(); - std::map compo = comp->atom(); - std::map::iterator it2; - for (it2 = compo.begin(); it2 != compo.end(); it2++) { - std::cout << it2->first << " " << it2->second << std::endl; + std::map compo = comp->mass(); + + using cyclus::toolkit::UraniumAssayMass; + + double prod_assay = UraniumAssayMass(mat); + double feed_assay = 0; + + { + double pop_qty = inventory.quantity(); + cyclus::Material::Ptr fission_matl = + inventory.Pop(pop_qty, cyclus::eps_rsrc()); + inventory.Push(fission_matl); + feed_assay = cyclus::toolkit::UraniumAssayMass( + equivalent_u8(fission_matl, ux).first); } - Material::Ptr response = r->ExtractComp(qty, comp); + double u5_enrich_factor = prod_assay / feed_assay; + + std::map feed_compo = r->comp()->mass(); + + std::map::iterator it; + for (it = ux.begin(); it != ux.end(); it++) { + cyclus::Nuc nuc = it->first; + double factor = it->second; + std::map::iterator it2 = feed_compo.find(nuc); + if (it2 != feed_compo.end()) { + compo.insert( + std::pair(nuc, factor * u5_enrich_factor)); + compo[922380000] -= factor * u5_enrich_factor + } + } + + cyclus::Composition::Ptr corrected_comp = + cyclus::Composition::CreateFromMass(compo); + + Material::Ptr response = r->ExtractComp(qty, corrected_comp); current_swu_capacity -= swu_req; @@ -488,39 +517,7 @@ cyclus::Material::Ptr SEnrichment::Enrich_(cyclus::Material::Ptr mat, // Re-Add the special nuc inside the product, and fix tails amount // accordingly - double prod_mass = response->quantity(); - - cyclus::toolkit::MatQuery mq_resp(response); - double u5_raw_enrich = mq_resp.mass_frac(922350000); - cyclus::toolkit::MatQuery mq_flip(flip_mat.first); - double u5_flip_enrich = mq_flip.mass_frac(922350000); - - std::map::iterator it; - for (it = ux.begin(); it != ux.end(); it++) { - double nuc_i_enrich_factor = u5_raw_enrich / u5_flip_enrich * it->second; - - cyclus::toolkit::MatQuery mq_(natu_matl); - double nuc_i_feed_enrich = mq_.mass(it->first) / natu_matl->quantity(); - double nuc_i_prod_enrich = nuc_i_feed_enrich * nuc_i_enrich_factor; - double nuc_i_prod_mass = nuc_i_prod_enrich * prod_mass; - - // Remove come ux from the material pushed in the tails and add in into - // the response, do the otherwise for the U-238 to conserve mass balance. - cyclus::CompMap nuc_to_add; - nuc_to_add[it->first] = nuc_i_prod_mass; - response->Absorb(cyclus::Material::CreateUntracked( - nuc_i_prod_mass, cyclus::Composition::CreateFromMass(nuc_to_add))); - r->ExtractComp(nuc_i_prod_mass, - cyclus::Composition::CreateFromMass(nuc_to_add)); - - cyclus::CompMap u8_to_remove; - u8_to_remove[922380000] = nuc_i_prod_mass; - r->Absorb(cyclus::Material::CreateUntracked( - nuc_i_prod_mass, cyclus::Composition::CreateFromMass(u8_to_remove))); - response->ExtractComp(nuc_i_prod_mass, - cyclus::Composition::CreateFromMass(u8_to_remove)); - } - + Material::Ptr response = r->ExtractComp(qty, comp); tails.Push(r); LOG(cyclus::LEV_INFO5, "EnrFac") From 7b26a52aa50990511c6d06ae6f67c8d2d08c9196 Mon Sep 17 00:00:00 2001 From: Baptiste Mouginot <15145274+bam241@users.noreply.github.com> Date: Mon, 19 Sep 2022 14:38:28 +0200 Subject: [PATCH 06/12] missing ; --- src/special_enrich.cc | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/special_enrich.cc b/src/special_enrich.cc index 2a3bb98..c1b8e37 100644 --- a/src/special_enrich.cc +++ b/src/special_enrich.cc @@ -499,7 +499,7 @@ cyclus::Material::Ptr SEnrichment::Enrich_(cyclus::Material::Ptr mat, if (it2 != feed_compo.end()) { compo.insert( std::pair(nuc, factor * u5_enrich_factor)); - compo[922380000] -= factor * u5_enrich_factor + compo[922380000] -= factor * u5_enrich_factor; } } From 96ae29aac5bb8d73fe90286a7f5a68e1083d1d04 Mon Sep 17 00:00:00 2001 From: Baptiste Mouginot <15145274+bam241@users.noreply.github.com> Date: Mon, 19 Sep 2022 14:39:22 +0200 Subject: [PATCH 07/12] reimplementing mat correction --- src/special_enrich.cc | 4 +--- 1 file changed, 1 insertion(+), 3 deletions(-) diff --git a/src/special_enrich.cc b/src/special_enrich.cc index c1b8e37..013053d 100644 --- a/src/special_enrich.cc +++ b/src/special_enrich.cc @@ -507,6 +507,7 @@ cyclus::Material::Ptr SEnrichment::Enrich_(cyclus::Material::Ptr mat, cyclus::Composition::CreateFromMass(compo); Material::Ptr response = r->ExtractComp(qty, corrected_comp); + tails.Push(r); current_swu_capacity -= swu_req; @@ -517,9 +518,6 @@ cyclus::Material::Ptr SEnrichment::Enrich_(cyclus::Material::Ptr mat, // Re-Add the special nuc inside the product, and fix tails amount // accordingly - Material::Ptr response = r->ExtractComp(qty, comp); - tails.Push(r); - LOG(cyclus::LEV_INFO5, "EnrFac") << prototype() << " has performed an enrichment: "; LOG(cyclus::LEV_INFO5, "EnrFac") << " * Feed Qty: " << feed_req; From a90582e36e9bf21a19aaa003b4d82bf705929359 Mon Sep 17 00:00:00 2001 From: Baptiste Mouginot <15145274+bam241@users.noreply.github.com> Date: Mon, 19 Sep 2022 14:43:11 +0200 Subject: [PATCH 08/12] forgot the initial fraction --- src/special_enrich.cc | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/src/special_enrich.cc b/src/special_enrich.cc index 013053d..39d2436 100644 --- a/src/special_enrich.cc +++ b/src/special_enrich.cc @@ -497,9 +497,9 @@ cyclus::Material::Ptr SEnrichment::Enrich_(cyclus::Material::Ptr mat, double factor = it->second; std::map::iterator it2 = feed_compo.find(nuc); if (it2 != feed_compo.end()) { - compo.insert( - std::pair(nuc, factor * u5_enrich_factor)); - compo[922380000] -= factor * u5_enrich_factor; + compo.insert(std::pair( + nuc, it2->second * factor * u5_enrich_factor)); + compo[922380000] -= it2->second * factor * u5_enrich_factor; } } From 63a732f590872420b8461e9d585dd2776716368f Mon Sep 17 00:00:00 2001 From: Baptiste Mouginot <15145274+bam241@users.noreply.github.com> Date: Mon, 19 Sep 2022 14:44:57 +0200 Subject: [PATCH 09/12] some prinout --- src/special_enrich.cc | 1 + 1 file changed, 1 insertion(+) diff --git a/src/special_enrich.cc b/src/special_enrich.cc index 39d2436..5a6012c 100644 --- a/src/special_enrich.cc +++ b/src/special_enrich.cc @@ -500,6 +500,7 @@ cyclus::Material::Ptr SEnrichment::Enrich_(cyclus::Material::Ptr mat, compo.insert(std::pair( nuc, it2->second * factor * u5_enrich_factor)); compo[922380000] -= it2->second * factor * u5_enrich_factor; + std::cout << compo[922380000] << std::endl; } } From 56025e5f7fe0564306b44c465f9f4b4e92e51cb5 Mon Sep 17 00:00:00 2001 From: Baptiste Mouginot <15145274+bam241@users.noreply.github.com> Date: Mon, 19 Sep 2022 14:49:18 +0200 Subject: [PATCH 10/12] no print --- src/special_enrich.cc | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/special_enrich.cc b/src/special_enrich.cc index 5a6012c..7bd578e 100644 --- a/src/special_enrich.cc +++ b/src/special_enrich.cc @@ -500,7 +500,7 @@ cyclus::Material::Ptr SEnrichment::Enrich_(cyclus::Material::Ptr mat, compo.insert(std::pair( nuc, it2->second * factor * u5_enrich_factor)); compo[922380000] -= it2->second * factor * u5_enrich_factor; - std::cout << compo[922380000] << std::endl; + // std::cout << compo[922380000] << std::endl; } } From 4b5098fc7b6654e912de87056779d4044b4252b8 Mon Sep 17 00:00:00 2001 From: Baptiste Mouginot <15145274+bam241@users.noreply.github.com> Date: Mon, 19 Sep 2022 14:50:51 +0200 Subject: [PATCH 11/12] some prinout --- src/special_enrich.cc | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/src/special_enrich.cc b/src/special_enrich.cc index 7bd578e..b60ca91 100644 --- a/src/special_enrich.cc +++ b/src/special_enrich.cc @@ -500,7 +500,8 @@ cyclus::Material::Ptr SEnrichment::Enrich_(cyclus::Material::Ptr mat, compo.insert(std::pair( nuc, it2->second * factor * u5_enrich_factor)); compo[922380000] -= it2->second * factor * u5_enrich_factor; - // std::cout << compo[922380000] << std::endl; + std::cout << nuc << " " << it2->second * factor * u5_enrich_factor + << std::endl; } } From d3b8f6ec7373abefed5da1e6299b88b6d14155b0 Mon Sep 17 00:00:00 2001 From: Baptiste Mouginot <15145274+bam241@users.noreply.github.com> Date: Mon, 19 Sep 2022 14:57:49 +0200 Subject: [PATCH 12/12] normalising --- src/special_enrich.cc | 56 +++++++++++++++++++++++-------------------- 1 file changed, 30 insertions(+), 26 deletions(-) diff --git a/src/special_enrich.cc b/src/special_enrich.cc index b60ca91..fe83238 100644 --- a/src/special_enrich.cc +++ b/src/special_enrich.cc @@ -490,6 +490,10 @@ cyclus::Material::Ptr SEnrichment::Enrich_(cyclus::Material::Ptr mat, double u5_enrich_factor = prod_assay / feed_assay; std::map feed_compo = r->comp()->mass(); + std::map::iterator it; + for (it = compo.begin(); it != compo.end(); it++) { + compo[it->first] = it->second / mat->quantity(); + } std::map::iterator it; for (it = ux.begin(); it != ux.end(); it++) { @@ -505,38 +509,38 @@ cyclus::Material::Ptr SEnrichment::Enrich_(cyclus::Material::Ptr mat, } } - cyclus::Composition::Ptr corrected_comp = - cyclus::Composition::CreateFromMass(compo); + cyclus::Composition::Ptr corrected_comp = + cyclus::Composition::CreateFromMass(compo); - Material::Ptr response = r->ExtractComp(qty, corrected_comp); - tails.Push(r); + Material::Ptr response = r->ExtractComp(qty, corrected_comp); + tails.Push(r); - current_swu_capacity -= swu_req; + current_swu_capacity -= swu_req; - intra_timestep_swu_ += swu_req; - intra_timestep_feed_ += feed_req; - RecordSEnrichment_(feed_req, swu_req); + intra_timestep_swu_ += swu_req; + intra_timestep_feed_ += feed_req; + RecordSEnrichment_(feed_req, swu_req); - // Re-Add the special nuc inside the product, and fix tails amount - // accordingly + // Re-Add the special nuc inside the product, and fix tails amount + // accordingly - LOG(cyclus::LEV_INFO5, "EnrFac") - << prototype() << " has performed an enrichment: "; - LOG(cyclus::LEV_INFO5, "EnrFac") << " * Feed Qty: " << feed_req; - LOG(cyclus::LEV_INFO5, "EnrFac") - << " * Feed Assay: " << assays.Feed() * 100; - LOG(cyclus::LEV_INFO5, "EnrFac") << " * Product Qty: " << qty; - LOG(cyclus::LEV_INFO5, "EnrFac") - << " * Product Assay: " << assays.Product() * 100; - LOG(cyclus::LEV_INFO5, "EnrFac") - << " * Tails Qty: " << TailsQty(qty, assays); - LOG(cyclus::LEV_INFO5, "EnrFac") - << " * Tails Assay: " << assays.Tails() * 100; - LOG(cyclus::LEV_INFO5, "EnrFac") << " * SWU: " << swu_req; - LOG(cyclus::LEV_INFO5, "EnrFac") - << " * Current SWU capacity: " << current_swu_capacity; + LOG(cyclus::LEV_INFO5, "EnrFac") + << prototype() << " has performed an enrichment: "; + LOG(cyclus::LEV_INFO5, "EnrFac") << " * Feed Qty: " << feed_req; + LOG(cyclus::LEV_INFO5, "EnrFac") + << " * Feed Assay: " << assays.Feed() * 100; + LOG(cyclus::LEV_INFO5, "EnrFac") << " * Product Qty: " << qty; + LOG(cyclus::LEV_INFO5, "EnrFac") + << " * Product Assay: " << assays.Product() * 100; + LOG(cyclus::LEV_INFO5, "EnrFac") + << " * Tails Qty: " << TailsQty(qty, assays); + LOG(cyclus::LEV_INFO5, "EnrFac") + << " * Tails Assay: " << assays.Tails() * 100; + LOG(cyclus::LEV_INFO5, "EnrFac") << " * SWU: " << swu_req; + LOG(cyclus::LEV_INFO5, "EnrFac") + << " * Current SWU capacity: " << current_swu_capacity; - return response; + return response; } // - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - -