diff --git a/input/physor/1_Enrichment_2_Reactor.xml b/input/physor/1_Enrichment_2_Reactor.xml index 617b4ebcf7..df99ee2001 100755 --- a/input/physor/1_Enrichment_2_Reactor.xml +++ b/input/physor/1_Enrichment_2_Reactor.xml @@ -9,20 +9,16 @@ 2 - - natl_u - - - - enriched_u - - - - waste - + natl_u + enriched_u + waste Enrichment + + EnrichmentFacility + EnrichmentFacility + natl_u @@ -37,6 +33,10 @@ Reactor1 + + BatchReactor + BatchReactor + @@ -81,6 +81,10 @@ Reactor2 + + BatchReactor + BatchReactor + @@ -115,13 +119,19 @@ SingleRegion + + NullRegion + NullRegion + Enrichment LWR_Reactor - - - + SingleInstitution + + NullInst + NullInst + Enrichment Reactor1 Reactor2 @@ -139,110 +149,48 @@ 1 - - - + natl_u mass - - 922350000 - 0.711 - - - 922380000 - 99.289 - + 922350000 0.711 + 922380000 99.289 lwr_fuel_recipe mass - - 922350000 - 3.0 - - - 922380000 - 97.0 - + 922350000 3.0 + 922380000 97.0 lwr_fuel_recipe2 mass - - 922350000 - 5.0 - - - 922380000 - 95.0 - + 922350000 5.0 + 922380000 95.0 lwr_used_fuel_recipe mass - - 922350000 - 156.729 - - - 922360000 - 102.103 - - - 922380000 - 18280.324 - - - 932370000 - 13.656 - - - 942380000 - 5.043 - - - 942390000 - 106.343 - - - 942400000 - 41.357 - - - 942410000 - 36.477 - - - 942420000 - 15.387 - - - 952410000 - 1.234 - - - - - - - 952430000 - 3.607 - - - 962440000 - 0.431 - - - 962450000 - 1.263 - + 922350000 156.729 + 922360000 102.103 + 922380000 18280.324 + 932370000 13.656 + 942380000 5.043 + 942390000 106.343 + 942400000 41.357 + 942410000 36.477 + 942420000 15.387 + 952410000 1.234 + + 952430000 3.607 + 962440000 0.431 + 962450000 1.263 diff --git a/input/physor/2_Sources_3_Reactors.xml b/input/physor/2_Sources_3_Reactors.xml index de1492dd72..957bd28242 100755 --- a/input/physor/2_Sources_3_Reactors.xml +++ b/input/physor/2_Sources_3_Reactors.xml @@ -9,20 +9,16 @@ 0 - - uox - - - - mox - - - - waste - + uox + mox + waste UOX_Source + + SourceFacility + SourceFacility + uox @@ -34,6 +30,10 @@ MOX_Source + + SourceFacility + SourceFacility + mox @@ -45,6 +45,10 @@ Reactor1 + + BatchReactor + BatchReactor + @@ -90,6 +94,10 @@ Reactor2 + + BatchReactor + BatchReactor + @@ -130,6 +138,10 @@ Reactor3 + + BatchReactor + BatchReactor + @@ -170,6 +182,10 @@ SingleRegion + + NullRegion + NullRegion + UOX_Source MOX_Source Reactor1 @@ -180,6 +196,10 @@ SingleInstitution + + DeployInst + DeployInst + UOX_Source MOX_Source Reactor1 @@ -220,157 +240,59 @@ natl_u mass - - 922350000 - 0.711 - - - 922380000 - 99.289 - + 922350000 0.711 + 922380000 99.289 uox_fuel_recipe mass - - 922350000 - 4.0 - - - 922380000 - 96.0 - + 922350000 4.0 + 922380000 96.0 uox_used_fuel_recipe mass - - 922350000 - 156.729 - - - 922360000 - 102.103 - - - 922380000 - 18280.324 - - - 932370000 - 13.656 - - - 942380000 - 5.043 - - - 942390000 - 106.343 - - - 942400000 - 41.357 - - - 942410000 - 36.477 - - - 942420000 - 15.387 - - - 952410000 - 1.234 - - - - - - - 952430000 - 3.607 - - - 962440000 - 0.431 - - - 962450000 - 1.263 - + 922350000 156.729 + 922360000 102.103 + 922380000 18280.324 + 932370000 13.656 + 942380000 5.043 + 942390000 106.343 + 942400000 41.357 + 942410000 36.477 + 942420000 15.387 + 952410000 1.234 + + 952430000 3.607 + 962440000 0.431 + 962450000 1.263 mox_fuel_recipe mass - - 922340000 - 0.0002 - - - 922350000 - 0.0018 - - - 922360000 - 0.01 - - - 9223800000.8973 - - - 942380000 - 0.0032 - - - 942390000 - 0.0507 - - - 942400000 - 0.0247 - - - 942410000 - 0.0134 - - - 942420000 - 0.0085 - - - 080160000 - 0.13 - + 922340000 0.0002 + 922350000 0.0018 + 922360000 0.01 + 9223800000.8973 + 942380000 0.0032 + 942390000 0.0507 + 942400000 0.0247 + 942410000 0.0134 + 942420000 0.0085 + 080160000 0.13 mox_used_fuel_recipe mass - - 922350000 - 0.01 - - - 922380000 - 0.94 - - - 922360000 - 0.03 - - - 080160000 - 0.13 - - - 942390000 - 0.02 - + 922350000 0.01 + 922380000 0.94 + 922360000 0.03 + 080160000 0.13 + 942390000 0.02 diff --git a/src/batch_reactor.cc b/src/batch_reactor.cc index 0345a934f3..33203b67c0 100644 --- a/src/batch_reactor.cc +++ b/src/batch_reactor.cc @@ -261,7 +261,7 @@ void BatchReactor::InitFrom(cyc::QueryableBackend* b) { // - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - void BatchReactor::InfileToDb(cyc::InfileTree* qe, cyc::DbInit di) { cyc::Facility::InfileToDb(qe, di); - qe = qe->SubTree("agent/" + agent_impl()); + qe = qe->SubTree("agent/*"); using cyc::Commodity; using cyc::CommodityProducer; diff --git a/src/deploy_inst.cc b/src/deploy_inst.cc index 7353815001..38eb9b3d9d 100644 --- a/src/deploy_inst.cc +++ b/src/deploy_inst.cc @@ -31,7 +31,7 @@ std::string DeployInst::schema() { void DeployInst::InfileToDb(cyclus::InfileTree* qe, cyclus::DbInit di) { cyclus::Institution::InfileToDb(qe, di); - qe = qe->SubTree("agent/" + agent_impl()); + qe = qe->SubTree("agent/*"); int nOrders = qe->NMatches("buildorder"); for (int i = 0; i < nOrders; i++) { diff --git a/tests/Inputs/dynamic_capacitated.xml b/tests/Inputs/dynamic_capacitated.xml index 7e864d9f88..e65128606a 100644 --- a/tests/Inputs/dynamic_capacitated.xml +++ b/tests/Inputs/dynamic_capacitated.xml @@ -15,6 +15,10 @@ Source + + Source + Source + commodity @@ -26,6 +30,10 @@ Sink + + Sink + Sink + 1 @@ -39,6 +47,10 @@ SingleRegion + + NullRegion + NullRegion + Source Sink @@ -46,6 +58,10 @@ SingleInstitution + + DeployInst + DeployInst + Source Sink diff --git a/tests/cycamore_unit_test_driver.cc b/tests/cycamore_unit_test_driver.cc index ca5196ba0c..4753123866 100644 --- a/tests/cycamore_unit_test_driver.cc +++ b/tests/cycamore_unit_test_driver.cc @@ -9,7 +9,6 @@ int main(int argc, char* argv[]) { // tell ENV the path between the cwd and the cyclus executable std::string path = cyclus::Env::PathBase(argv[0]); - cyclus::Env::SetCyclusRelPath(path); cyclus::Logger::ReportLevel() = cyclus::LEV_ERROR; for (int i = 0; i < argc; i++) {