From a0d9d46a7b3d446ece6eda1a7a1730c9b7e6ed0a Mon Sep 17 00:00:00 2001 From: Robert Carlsen Date: Tue, 27 May 2014 19:10:28 -0500 Subject: [PATCH 01/18] removed availableprototypes and allowedfacilities from schema --- input/batch_reactor/batch_rxtr_2_cycles.xml | 6 ------ input/batch_reactor/batch_rxtr_lifetime.xml | 6 ------ input/batch_reactor/hwr.xml | 10 ---------- input/batch_reactor/lwr.xml | 10 ---------- input/batch_reactor/preferences.xml | 6 ------ input/enrichment/1_src_enr_rxtr_sink.xml | 8 -------- input/enrichment/linear_src_enr_rxtr_sink.xml | 8 -------- input/enrichment/natu_capacitated.xml | 8 -------- input/enrichment/swu_capacitated.xml | 8 -------- input/growth/source_sink_linear.xml | 3 --- input/minimal-input/source_1_lifetime_sink_1.xml | 4 ---- input/minimal-input/source_1_sink_1.xml | 4 ---- input/minimal-input/source_3_lifetime_sink_1.xml | 4 ---- input/minimal-input/source_3_sink_1.xml | 4 ---- input/physor/1_Enrichment_2_Reactor.xml | 5 ----- input/physor/2_Sources_3_Reactors.xml | 10 ---------- tests/input/dynamic_capacitated.xml | 4 ---- tests/input/growth.xml | 3 --- 18 files changed, 111 deletions(-) diff --git a/input/batch_reactor/batch_rxtr_2_cycles.xml b/input/batch_reactor/batch_rxtr_2_cycles.xml index eded83ba1e..489d29ce98 100644 --- a/input/batch_reactor/batch_rxtr_2_cycles.xml +++ b/input/batch_reactor/batch_rxtr_2_cycles.xml @@ -90,9 +90,6 @@ agents NullRegion - Source - LWR_Reactor - Sink SingleInstitution @@ -100,9 +97,6 @@ agents NullInst - Source - LWR_Reactor - Sink Source diff --git a/input/batch_reactor/batch_rxtr_lifetime.xml b/input/batch_reactor/batch_rxtr_lifetime.xml index 3e7325a5e8..68c84c1672 100644 --- a/input/batch_reactor/batch_rxtr_lifetime.xml +++ b/input/batch_reactor/batch_rxtr_lifetime.xml @@ -82,9 +82,6 @@ reasonably for its lifetime. --> agents NullRegion - Source - LWR_Reactor - Sink SingleInstitution @@ -92,9 +89,6 @@ reasonably for its lifetime. --> agents NullInst - Source - LWR_Reactor - Sink Source diff --git a/input/batch_reactor/hwr.xml b/input/batch_reactor/hwr.xml index 782c8d9003..418c9b609b 100644 --- a/input/batch_reactor/hwr.xml +++ b/input/batch_reactor/hwr.xml @@ -83,11 +83,6 @@ agents NullRegion - Source - Enrichment - LWR_Reactor - HW_Reactor - Sink SingleInstitution @@ -95,11 +90,6 @@ agents NullInst - Source - Enrichment - LWR_Reactor - HW_Reactor - Sink Source diff --git a/input/batch_reactor/lwr.xml b/input/batch_reactor/lwr.xml index c1f9535c2b..8c33509ad2 100644 --- a/input/batch_reactor/lwr.xml +++ b/input/batch_reactor/lwr.xml @@ -83,11 +83,6 @@ agents NullRegion - Source - Enrichment - LW_Reactor - HWR_Reactor - Sink SingleInstitution @@ -95,11 +90,6 @@ agents NullInst - Source - Enrichment - LW_Reactor - HWR_Reactor - Sink Source diff --git a/input/batch_reactor/preferences.xml b/input/batch_reactor/preferences.xml index 229f42a0dd..e6e816cec6 100644 --- a/input/batch_reactor/preferences.xml +++ b/input/batch_reactor/preferences.xml @@ -88,9 +88,6 @@ commodity. --> agents NullRegion - Source - Reactor - Sink SingleInstitution @@ -98,9 +95,6 @@ commodity. --> agents NullInst - Source - Reactor - Sink Source diff --git a/input/enrichment/1_src_enr_rxtr_sink.xml b/input/enrichment/1_src_enr_rxtr_sink.xml index 93ff1b5f7a..b7706dcd26 100644 --- a/input/enrichment/1_src_enr_rxtr_sink.xml +++ b/input/enrichment/1_src_enr_rxtr_sink.xml @@ -100,10 +100,6 @@ agents NullRegion - Source - Enrichment - Reactor - Sink SingleInstitution @@ -111,10 +107,6 @@ agents NullInst - Source - Enrichment - Reactor - Sink Source diff --git a/input/enrichment/linear_src_enr_rxtr_sink.xml b/input/enrichment/linear_src_enr_rxtr_sink.xml index 34f4ba07d9..420c27b2f8 100644 --- a/input/enrichment/linear_src_enr_rxtr_sink.xml +++ b/input/enrichment/linear_src_enr_rxtr_sink.xml @@ -100,10 +100,6 @@ GrowthRegion GrowthRegion - Source - Enrichment - Reactor - Sink @@ -121,10 +117,6 @@ ManagerInst ManagerInst - Source - Enrichment - Reactor - Sink Source diff --git a/input/enrichment/natu_capacitated.xml b/input/enrichment/natu_capacitated.xml index af86ef79fa..9fdb261a89 100644 --- a/input/enrichment/natu_capacitated.xml +++ b/input/enrichment/natu_capacitated.xml @@ -100,10 +100,6 @@ GrowthRegion GrowthRegion - Source - Enrichment - Reactor - Sink @@ -121,10 +117,6 @@ ManagerInst ManagerInst - Source - Enrichment - Reactor - Sink Source diff --git a/input/enrichment/swu_capacitated.xml b/input/enrichment/swu_capacitated.xml index f2ab90761c..40e5c2e9c3 100644 --- a/input/enrichment/swu_capacitated.xml +++ b/input/enrichment/swu_capacitated.xml @@ -101,10 +101,6 @@ GrowthRegion GrowthRegion - Source - Enrichment - Reactor - Sink @@ -122,10 +118,6 @@ ManagerInst ManagerInst - Source - Enrichment - Reactor - Sink Source diff --git a/input/growth/source_sink_linear.xml b/input/growth/source_sink_linear.xml index f458129209..7eee4c8309 100644 --- a/input/growth/source_sink_linear.xml +++ b/input/growth/source_sink_linear.xml @@ -63,9 +63,6 @@ cycamore GrowthRegion - Source1 - Source2 - Sink commodity diff --git a/input/minimal-input/source_1_lifetime_sink_1.xml b/input/minimal-input/source_1_lifetime_sink_1.xml index 6dd2f1f071..f683947d51 100644 --- a/input/minimal-input/source_1_lifetime_sink_1.xml +++ b/input/minimal-input/source_1_lifetime_sink_1.xml @@ -50,8 +50,6 @@ agents NullRegion - Source - Sink SingleInstitution @@ -59,8 +57,6 @@ agents NullInst - Source - Sink Source diff --git a/input/minimal-input/source_1_sink_1.xml b/input/minimal-input/source_1_sink_1.xml index 826a9c07ea..217257ce4f 100644 --- a/input/minimal-input/source_1_sink_1.xml +++ b/input/minimal-input/source_1_sink_1.xml @@ -49,8 +49,6 @@ agents NullRegion - Source - Sink SingleInstitution @@ -58,8 +56,6 @@ agents NullInst - Source - Sink Source diff --git a/input/minimal-input/source_3_lifetime_sink_1.xml b/input/minimal-input/source_3_lifetime_sink_1.xml index 0ecccd0c6b..65a4fcc680 100644 --- a/input/minimal-input/source_3_lifetime_sink_1.xml +++ b/input/minimal-input/source_3_lifetime_sink_1.xml @@ -50,8 +50,6 @@ agents NullRegion - Source - Sink SingleInstitution @@ -59,8 +57,6 @@ agents NullInst - Source - Sink Source diff --git a/input/minimal-input/source_3_sink_1.xml b/input/minimal-input/source_3_sink_1.xml index 8b76fbe632..6bfbb8a185 100644 --- a/input/minimal-input/source_3_sink_1.xml +++ b/input/minimal-input/source_3_sink_1.xml @@ -49,8 +49,6 @@ agents NullRegion - Source - Sink SingleInstitution @@ -58,8 +56,6 @@ agents NullInst - Source - Sink Source diff --git a/input/physor/1_Enrichment_2_Reactor.xml b/input/physor/1_Enrichment_2_Reactor.xml index e47b7ccfb6..1208ad7209 100755 --- a/input/physor/1_Enrichment_2_Reactor.xml +++ b/input/physor/1_Enrichment_2_Reactor.xml @@ -122,8 +122,6 @@ agents NullRegion - Enrichment - LWR_Reactor SingleInstitution @@ -131,9 +129,6 @@ agents NullInst - Enrichment - Reactor1 - Reactor2 Enrichment diff --git a/input/physor/2_Sources_3_Reactors.xml b/input/physor/2_Sources_3_Reactors.xml index ffb0fe1a93..ea8bae3e12 100755 --- a/input/physor/2_Sources_3_Reactors.xml +++ b/input/physor/2_Sources_3_Reactors.xml @@ -185,11 +185,6 @@ agents NullRegion - UOX_Source - MOX_Source - Reactor1 - Reactor2 - Reactor3 @@ -199,11 +194,6 @@ cycamore DeployInst - UOX_Source - MOX_Source - Reactor1 - Reactor2 - Reactor3 diff --git a/tests/input/dynamic_capacitated.xml b/tests/input/dynamic_capacitated.xml index 85fb5e258f..aea82482c3 100644 --- a/tests/input/dynamic_capacitated.xml +++ b/tests/input/dynamic_capacitated.xml @@ -50,8 +50,6 @@ agents NullRegion - Source - Sink @@ -61,8 +59,6 @@ cycamore DeployInst - Source - Sink diff --git a/tests/input/growth.xml b/tests/input/growth.xml index f458129209..7eee4c8309 100644 --- a/tests/input/growth.xml +++ b/tests/input/growth.xml @@ -63,9 +63,6 @@ cycamore GrowthRegion - Source1 - Source2 - Sink commodity From 1aef7e9a6acd3bba8296cdff14ad1dc2490e327b Mon Sep 17 00:00:00 2001 From: Robert Carlsen Date: Tue, 27 May 2014 20:49:41 -0500 Subject: [PATCH 02/18] renamed to --- input/batch_reactor/batch_rxtr_2_cycles.xml | 20 ++++++------- input/batch_reactor/batch_rxtr_lifetime.xml | 20 ++++++------- input/batch_reactor/hwr.xml | 20 ++++++------- input/batch_reactor/lwr.xml | 20 ++++++------- input/batch_reactor/preferences.xml | 20 ++++++------- input/enrichment/1_src_enr_rxtr_sink.xml | 24 ++++++++-------- input/enrichment/linear_src_enr_rxtr_sink.xml | 24 ++++++++-------- input/enrichment/natu_capacitated.xml | 24 ++++++++-------- input/enrichment/swu_capacitated.xml | 24 ++++++++-------- input/growth/source_sink_linear.xml | 20 ++++++------- .../source_1_lifetime_sink_1.xml | 16 +++++------ input/minimal-input/source_1_sink_1.xml | 16 +++++------ .../source_3_lifetime_sink_1.xml | 16 +++++------ input/minimal-input/source_3_sink_1.xml | 16 +++++------ input/physor/1_Enrichment_2_Reactor.xml | 20 ++++++------- input/physor/2_Sources_3_Reactors.xml | 28 +++++++++---------- tests/input/dynamic_capacitated.xml | 16 +++++------ tests/input/growth.xml | 20 ++++++------- 18 files changed, 182 insertions(+), 182 deletions(-) diff --git a/input/batch_reactor/batch_rxtr_2_cycles.xml b/input/batch_reactor/batch_rxtr_2_cycles.xml index 489d29ce98..3f1c44dc81 100644 --- a/input/batch_reactor/batch_rxtr_2_cycles.xml +++ b/input/batch_reactor/batch_rxtr_2_cycles.xml @@ -27,10 +27,10 @@ Source - + cycamore Source - + enriched_u @@ -42,10 +42,10 @@ LWR_Reactor - + cycamore BatchReactor - + 26 @@ -70,10 +70,10 @@ Sink - + cycamore Sink - + @@ -86,17 +86,17 @@ SingleRegion - + agents NullRegion - + SingleInstitution - + agents NullInst - + Source diff --git a/input/batch_reactor/batch_rxtr_lifetime.xml b/input/batch_reactor/batch_rxtr_lifetime.xml index 68c84c1672..35e1d1f964 100644 --- a/input/batch_reactor/batch_rxtr_lifetime.xml +++ b/input/batch_reactor/batch_rxtr_lifetime.xml @@ -19,10 +19,10 @@ reasonably for its lifetime. --> Source - + cycamore Source - + enriched_u @@ -34,10 +34,10 @@ reasonably for its lifetime. --> LWR_Reactor - + cycamore BatchReactor - + 480 @@ -62,10 +62,10 @@ reasonably for its lifetime. --> Sink - + cycamore Sink - + @@ -78,17 +78,17 @@ reasonably for its lifetime. --> SingleRegion - + agents NullRegion - + SingleInstitution - + agents NullInst - + Source diff --git a/input/batch_reactor/hwr.xml b/input/batch_reactor/hwr.xml index 418c9b609b..1cd344d7a4 100644 --- a/input/batch_reactor/hwr.xml +++ b/input/batch_reactor/hwr.xml @@ -22,10 +22,10 @@ Source - + cycamore Source - + enriched_u @@ -36,10 +36,10 @@ HW_Reactor - + cycamore BatchReactor - + 480 @@ -64,10 +64,10 @@ Sink - + cycamore Sink - + @@ -79,17 +79,17 @@ SingleRegion - + agents NullRegion - + SingleInstitution - + agents NullInst - + Source diff --git a/input/batch_reactor/lwr.xml b/input/batch_reactor/lwr.xml index 8c33509ad2..3a0b42d669 100644 --- a/input/batch_reactor/lwr.xml +++ b/input/batch_reactor/lwr.xml @@ -22,10 +22,10 @@ Source - + cycamore Source - + enriched_u @@ -36,10 +36,10 @@ LW_Reactor - + cycamore BatchReactor - + 480 @@ -64,10 +64,10 @@ Sink - + cycamore Sink - + @@ -79,17 +79,17 @@ SingleRegion - + agents NullRegion - + SingleInstitution - + agents NullInst - + Source diff --git a/input/batch_reactor/preferences.xml b/input/batch_reactor/preferences.xml index e6e816cec6..dc1908b37e 100644 --- a/input/batch_reactor/preferences.xml +++ b/input/batch_reactor/preferences.xml @@ -22,10 +22,10 @@ commodity. --> Source - + cycamore Source - + used_commodity @@ -37,10 +37,10 @@ commodity. --> Reactor - + cycamore BatchReactor - + @@ -67,10 +67,10 @@ commodity. --> Sink - + cycamore Sink - + @@ -84,17 +84,17 @@ commodity. --> SingleRegion - + agents NullRegion - + SingleInstitution - + agents NullInst - + Source diff --git a/input/enrichment/1_src_enr_rxtr_sink.xml b/input/enrichment/1_src_enr_rxtr_sink.xml index b7706dcd26..0f61c2f8f2 100644 --- a/input/enrichment/1_src_enr_rxtr_sink.xml +++ b/input/enrichment/1_src_enr_rxtr_sink.xml @@ -22,10 +22,10 @@ Source - + cycamore Source - + natl_u @@ -37,10 +37,10 @@ Enrichment - + cycamore EnrichmentFacility - + natl_u @@ -54,10 +54,10 @@ Reactor - + cycamore BatchReactor - + @@ -80,10 +80,10 @@ Sink - + cycamore Sink - + @@ -96,17 +96,17 @@ SingleRegion - + agents NullRegion - + SingleInstitution - + agents NullInst - + Source diff --git a/input/enrichment/linear_src_enr_rxtr_sink.xml b/input/enrichment/linear_src_enr_rxtr_sink.xml index 420c27b2f8..23b1538599 100644 --- a/input/enrichment/linear_src_enr_rxtr_sink.xml +++ b/input/enrichment/linear_src_enr_rxtr_sink.xml @@ -22,10 +22,10 @@ Source - + Source Source - + natl_u @@ -37,10 +37,10 @@ Enrichment - + EnrichmentFacility EnrichmentFacility - + natl_u @@ -54,10 +54,10 @@ Reactor - + BatchReactor BatchReactor - + @@ -80,10 +80,10 @@ Sink - + Sink Sink - + @@ -96,10 +96,10 @@ SingleRegion - + GrowthRegion GrowthRegion - + @@ -113,10 +113,10 @@ SingleInstitution - + ManagerInst ManagerInst - + Source diff --git a/input/enrichment/natu_capacitated.xml b/input/enrichment/natu_capacitated.xml index 9fdb261a89..f594e49e5b 100644 --- a/input/enrichment/natu_capacitated.xml +++ b/input/enrichment/natu_capacitated.xml @@ -22,10 +22,10 @@ Source - + Source Source - + natl_u @@ -37,10 +37,10 @@ Enrichment - + EnrichmentFacility EnrichmentFacility - + natl_u @@ -54,10 +54,10 @@ Reactor - + BatchReactor BatchReactor - + @@ -80,10 +80,10 @@ Sink - + Sink Sink - + @@ -96,10 +96,10 @@ SingleRegion - + GrowthRegion GrowthRegion - + @@ -113,10 +113,10 @@ SingleInstitution - + ManagerInst ManagerInst - + Source diff --git a/input/enrichment/swu_capacitated.xml b/input/enrichment/swu_capacitated.xml index 40e5c2e9c3..b8d2955b27 100644 --- a/input/enrichment/swu_capacitated.xml +++ b/input/enrichment/swu_capacitated.xml @@ -22,10 +22,10 @@ Source - + EnrichmentFacility EnrichmentFacility - + natl_u @@ -37,10 +37,10 @@ Enrichment - + EnrichmentFacility EnrichmentFacility - + natl_u @@ -55,10 +55,10 @@ Reactor - + BatchReactor BatchReactor - + @@ -81,10 +81,10 @@ Sink - + Sink Sink - + @@ -97,10 +97,10 @@ SingleRegion - + GrowthRegion GrowthRegion - + @@ -114,10 +114,10 @@ SingleInstitution - + ManagerInst ManagerInst - + Source diff --git a/input/growth/source_sink_linear.xml b/input/growth/source_sink_linear.xml index 7eee4c8309..9cb3bce7c9 100644 --- a/input/growth/source_sink_linear.xml +++ b/input/growth/source_sink_linear.xml @@ -14,10 +14,10 @@ Source1 - + cycamore Source - + commodity @@ -29,10 +29,10 @@ Source2 - + cycamore Source - + commodity @@ -44,10 +44,10 @@ Sink - + cycamore Sink - + @@ -59,10 +59,10 @@ SingleRegion - + cycamore GrowthRegion - + commodity @@ -79,10 +79,10 @@ SingleInstitution - + cycamore ManagerInst - + Sink diff --git a/input/minimal-input/source_1_lifetime_sink_1.xml b/input/minimal-input/source_1_lifetime_sink_1.xml index f683947d51..8489a3bbf7 100644 --- a/input/minimal-input/source_1_lifetime_sink_1.xml +++ b/input/minimal-input/source_1_lifetime_sink_1.xml @@ -14,10 +14,10 @@ Source - + cycamore Source - + 5 @@ -30,10 +30,10 @@ Sink - + cycamore Sink - + @@ -46,17 +46,17 @@ SingleRegion - + agents NullRegion - + SingleInstitution - + agents NullInst - + Source diff --git a/input/minimal-input/source_1_sink_1.xml b/input/minimal-input/source_1_sink_1.xml index 217257ce4f..b08ba3d6b6 100644 --- a/input/minimal-input/source_1_sink_1.xml +++ b/input/minimal-input/source_1_sink_1.xml @@ -14,10 +14,10 @@ Source - + cycamore Source - + commodity @@ -29,10 +29,10 @@ Sink - + cycamore Sink - + @@ -45,17 +45,17 @@ SingleRegion - + agents NullRegion - + SingleInstitution - + agents NullInst - + Source diff --git a/input/minimal-input/source_3_lifetime_sink_1.xml b/input/minimal-input/source_3_lifetime_sink_1.xml index 65a4fcc680..19e7ad8480 100644 --- a/input/minimal-input/source_3_lifetime_sink_1.xml +++ b/input/minimal-input/source_3_lifetime_sink_1.xml @@ -14,10 +14,10 @@ Source - + cycamore Source - + 5 @@ -30,10 +30,10 @@ Sink - + cycamore Sink - + @@ -46,17 +46,17 @@ SingleRegion - + agents NullRegion - + SingleInstitution - + agents NullInst - + Source diff --git a/input/minimal-input/source_3_sink_1.xml b/input/minimal-input/source_3_sink_1.xml index 6bfbb8a185..8c2412eacd 100644 --- a/input/minimal-input/source_3_sink_1.xml +++ b/input/minimal-input/source_3_sink_1.xml @@ -14,10 +14,10 @@ Source - + cycamore Source - + commodity @@ -29,10 +29,10 @@ Sink - + cycamore Sink - + @@ -45,17 +45,17 @@ SingleRegion - + agents NullRegion - + SingleInstitution - + agents NullInst - + Source diff --git a/input/physor/1_Enrichment_2_Reactor.xml b/input/physor/1_Enrichment_2_Reactor.xml index 1208ad7209..262c5b09e5 100755 --- a/input/physor/1_Enrichment_2_Reactor.xml +++ b/input/physor/1_Enrichment_2_Reactor.xml @@ -14,10 +14,10 @@ Enrichment - + cycamore EnrichmentFacility - + natl_u @@ -32,10 +32,10 @@ Reactor1 - + cycamore BatchReactor - + @@ -80,10 +80,10 @@ Reactor2 - + cycamore BatchReactor - + @@ -118,17 +118,17 @@ SingleRegion - + agents NullRegion - + SingleInstitution - + agents NullInst - + Enrichment diff --git a/input/physor/2_Sources_3_Reactors.xml b/input/physor/2_Sources_3_Reactors.xml index ea8bae3e12..752d24ea4a 100755 --- a/input/physor/2_Sources_3_Reactors.xml +++ b/input/physor/2_Sources_3_Reactors.xml @@ -14,10 +14,10 @@ UOX_Source - + cycamore Source - + uox @@ -29,10 +29,10 @@ MOX_Source - + cycamore Source - + mox @@ -44,10 +44,10 @@ Reactor1 - + cycamore BatchReactor - + @@ -93,10 +93,10 @@ Reactor2 - + cycamore BatchReactor - + @@ -137,10 +137,10 @@ Reactor3 - + cycamore BatchReactor - + @@ -181,19 +181,19 @@ SingleRegion - + agents NullRegion - + SingleInstitution - + cycamore DeployInst - + diff --git a/tests/input/dynamic_capacitated.xml b/tests/input/dynamic_capacitated.xml index aea82482c3..165f2e4941 100644 --- a/tests/input/dynamic_capacitated.xml +++ b/tests/input/dynamic_capacitated.xml @@ -14,10 +14,10 @@ Source - + agents Source - + commodity @@ -29,10 +29,10 @@ Sink - + agents Sink - + 1 @@ -46,19 +46,19 @@ SingleRegion - + agents NullRegion - + SingleInstitution - + cycamore DeployInst - + diff --git a/tests/input/growth.xml b/tests/input/growth.xml index 7eee4c8309..9cb3bce7c9 100644 --- a/tests/input/growth.xml +++ b/tests/input/growth.xml @@ -14,10 +14,10 @@ Source1 - + cycamore Source - + commodity @@ -29,10 +29,10 @@ Source2 - + cycamore Source - + commodity @@ -44,10 +44,10 @@ Sink - + cycamore Sink - + @@ -59,10 +59,10 @@ SingleRegion - + cycamore GrowthRegion - + commodity @@ -79,10 +79,10 @@ SingleInstitution - + cycamore ManagerInst - + Sink From 559e297e132d1676870607bb27df739f0c8ce764 Mon Sep 17 00:00:00 2001 From: Anthony Scopatz Date: Wed, 28 May 2014 12:13:45 -0500 Subject: [PATCH 03/18] updated to batch rx --- input/batch_reactor/batch_rxtr_2_cycles.xml | 55 ++++++++++----------- input/batch_reactor/batch_rxtr_lifetime.xml | 55 ++++++++++----------- 2 files changed, 54 insertions(+), 56 deletions(-) diff --git a/input/batch_reactor/batch_rxtr_2_cycles.xml b/input/batch_reactor/batch_rxtr_2_cycles.xml index 3f1c44dc81..cda8fc8054 100644 --- a/input/batch_reactor/batch_rxtr_2_cycles.xml +++ b/input/batch_reactor/batch_rxtr_2_cycles.xml @@ -1,4 +1,3 @@ - @@ -9,20 +8,32 @@ reasonably for its lifetime. --> 2000 - - enriched_u - - - - waste - - - - Source + + + cycamore + Source + + + cycamore + BatchReactor + + + agents + NullRegion + + + agents + NullInst + cycamore - Source + Sink + + + + Source + Source enriched_u @@ -34,10 +45,7 @@ reasonably for its lifetime. --> LWR_Reactor - - cycamore - BatchReactor - + BatchReactor 480 @@ -62,10 +70,7 @@ reasonably for its lifetime. --> Sink - - cycamore - Sink - + Sink @@ -78,17 +83,11 @@ reasonably for its lifetime. --> SingleRegion - - agents - NullRegion - + NullRegion SingleInstitution - - agents - NullInst - + NullInst Source From dfce34547ca2767f4ce8420507f31a7fa9d1dce5 Mon Sep 17 00:00:00 2001 From: Anthony Scopatz Date: Wed, 28 May 2014 12:32:56 -0500 Subject: [PATCH 04/18] done --- input/batch_reactor/hwr.xml | 59 +++++++++++++---------------- input/batch_reactor/lwr.xml | 59 +++++++++++++---------------- input/batch_reactor/preferences.xml | 55 +++++++++++++-------------- 3 files changed, 81 insertions(+), 92 deletions(-) diff --git a/input/batch_reactor/hwr.xml b/input/batch_reactor/hwr.xml index 1cd344d7a4..f78cd070a4 100644 --- a/input/batch_reactor/hwr.xml +++ b/input/batch_reactor/hwr.xml @@ -1,4 +1,3 @@ - @@ -8,24 +7,32 @@ 2007 - - natl_u - - - - enriched_u - - - - waste - - - - Source + cycamore - Source + Source + + + cycamore + BatchReactor + + + cycamore + Sink + + + agents + NullRegion + + agents + NullInst + + + + + Source + Source enriched_u @@ -36,10 +43,7 @@ HW_Reactor - - cycamore - BatchReactor - + BatchReactor 480 @@ -64,10 +68,7 @@ Sink - - cycamore - Sink - + Sink @@ -79,17 +80,11 @@ SingleRegion - - agents - NullRegion - + NullRegion SingleInstitution - - agents - NullInst - + NullInst Source diff --git a/input/batch_reactor/lwr.xml b/input/batch_reactor/lwr.xml index 3a0b42d669..d7d17d6426 100644 --- a/input/batch_reactor/lwr.xml +++ b/input/batch_reactor/lwr.xml @@ -1,4 +1,3 @@ - @@ -8,24 +7,32 @@ 2007 - - natl_u - - - - enriched_u - - - - waste - - - - Source + cycamore - Source + Source + + + cycamore + BatchReactor + + + cycamore + Sink + + + agents + NullRegion + + agents + NullInst + + + + + Source + Source enriched_u @@ -36,10 +43,7 @@ LW_Reactor - - cycamore - BatchReactor - + BatchReactor 480 @@ -64,10 +68,7 @@ Sink - - cycamore - Sink - + Sink @@ -79,17 +80,11 @@ SingleRegion - - agents - NullRegion - + NullRegion SingleInstitution - - agents - NullInst - + NullInst Source diff --git a/input/batch_reactor/preferences.xml b/input/batch_reactor/preferences.xml index dc1908b37e..86f5eea9b4 100644 --- a/input/batch_reactor/preferences.xml +++ b/input/batch_reactor/preferences.xml @@ -1,4 +1,3 @@ - 2000 - - used_commodity - - - - processed_commodity - - - - Source + + + cycamore + Source + cycamore - Source + BatchReactor + + + cycamore + Sink + + + agents + NullRegion + + + agents + NullInst + + + + Source + Source used_commodity @@ -37,10 +48,7 @@ commodity. --> Reactor - - cycamore - BatchReactor - + BatchReactor @@ -67,10 +75,7 @@ commodity. --> Sink - - cycamore - Sink - + Sink @@ -84,17 +89,11 @@ commodity. --> SingleRegion - - agents - NullRegion - + NullRegion SingleInstitution - - agents - NullInst - + NullInst Source From 0546a71150b606def9889d1478a9efeef76c3cad Mon Sep 17 00:00:00 2001 From: Robert Carlsen Date: Wed, 28 May 2014 12:35:34 -0500 Subject: [PATCH 05/18] updated enrichment and growth input files --- input/enrichment/1_src_enr_rxtr_sink.xml | 50 ++++++------------- input/enrichment/linear_src_enr_rxtr_sink.xml | 50 ++++++------------- input/enrichment/natu_capacitated.xml | 50 ++++++------------- input/enrichment/swu_capacitated.xml | 50 ++++++------------- input/growth/source_sink_linear.xml | 37 +++++--------- 5 files changed, 68 insertions(+), 169 deletions(-) diff --git a/input/enrichment/1_src_enr_rxtr_sink.xml b/input/enrichment/1_src_enr_rxtr_sink.xml index 0f61c2f8f2..c240cae315 100644 --- a/input/enrichment/1_src_enr_rxtr_sink.xml +++ b/input/enrichment/1_src_enr_rxtr_sink.xml @@ -1,4 +1,3 @@ - @@ -8,24 +7,18 @@ 2000 - - natl_u - - - - enriched_u - - - - waste - + + cycamoreSink + cycamoreSource + cycamoreEnrichmentFacility + cycamoreBatchReactor + agentsNullRegion + agentsNullInst + Source - - cycamore - Source - + Sink natl_u @@ -37,10 +30,7 @@ Enrichment - - cycamore - EnrichmentFacility - + EnrichmentFacility natl_u @@ -54,10 +44,7 @@ Reactor - - cycamore - BatchReactor - + BatchReactor @@ -80,10 +67,7 @@ Sink - - cycamore - Sink - + Sink @@ -96,17 +80,11 @@ SingleRegion - - agents - NullRegion - + NullRegion SingleInstitution - - agents - NullInst - + NullInst Source diff --git a/input/enrichment/linear_src_enr_rxtr_sink.xml b/input/enrichment/linear_src_enr_rxtr_sink.xml index 23b1538599..112044178a 100644 --- a/input/enrichment/linear_src_enr_rxtr_sink.xml +++ b/input/enrichment/linear_src_enr_rxtr_sink.xml @@ -1,4 +1,3 @@ - @@ -8,24 +7,18 @@ 2000 - - natl_u - - - - enriched_u - - - - waste - + + cycamoreSink + cycamoreSource + cycamoreEnrichmentFacility + cycamoreBatchReactor + cycamoreGrowthRegion + cycamoreManagerInst + Source - - Source - Source - + Source natl_u @@ -37,10 +30,7 @@ Enrichment - - EnrichmentFacility - EnrichmentFacility - + EnrichmentFacility natl_u @@ -54,10 +44,7 @@ Reactor - - BatchReactor - BatchReactor - + BatchReactor @@ -80,10 +67,7 @@ Sink - - Sink - Sink - + Sink @@ -96,10 +80,7 @@ SingleRegion - - GrowthRegion - GrowthRegion - + GrowthRegion @@ -113,10 +94,7 @@ SingleInstitution - - ManagerInst - ManagerInst - + ManagerInst Source diff --git a/input/enrichment/natu_capacitated.xml b/input/enrichment/natu_capacitated.xml index f594e49e5b..d9961e0cfc 100644 --- a/input/enrichment/natu_capacitated.xml +++ b/input/enrichment/natu_capacitated.xml @@ -1,4 +1,3 @@ - @@ -8,24 +7,18 @@ 2000 - - natl_u - - - - enriched_u - - - - waste - + + cycamoreSink + cycamoreSource + cycamoreEnrichmentFacility + cycamoreBatchReactor + cycamoreGrowthRegion + cycamoreManagerInst + Source - - Source - Source - + Source natl_u @@ -37,10 +30,7 @@ Enrichment - - EnrichmentFacility - EnrichmentFacility - + EnrichmentFacility natl_u @@ -54,10 +44,7 @@ Reactor - - BatchReactor - BatchReactor - + BatchReactor @@ -80,10 +67,7 @@ Sink - - Sink - Sink - + Sink @@ -96,10 +80,7 @@ SingleRegion - - GrowthRegion - GrowthRegion - + GrowthRegion @@ -113,10 +94,7 @@ SingleInstitution - - ManagerInst - ManagerInst - + ManagerInst Source diff --git a/input/enrichment/swu_capacitated.xml b/input/enrichment/swu_capacitated.xml index b8d2955b27..afe42c0a57 100644 --- a/input/enrichment/swu_capacitated.xml +++ b/input/enrichment/swu_capacitated.xml @@ -1,4 +1,3 @@ - @@ -8,24 +7,18 @@ 2000 - - natl_u - - - - enriched_u - - - - waste - + + cycamoreSink + cycamoreSource + cycamoreEnrichmentFacility + cycamoreBatchReactor + cycamoreGrowthRegion + cycamoreManagerInst + Source - - EnrichmentFacility - EnrichmentFacility - + Source natl_u @@ -37,10 +30,7 @@ Enrichment - - EnrichmentFacility - EnrichmentFacility - + EnrichmentFacility natl_u @@ -55,10 +45,7 @@ Reactor - - BatchReactor - BatchReactor - + BatchReactor @@ -81,10 +68,7 @@ Sink - - Sink - Sink - + Sink @@ -97,10 +81,7 @@ SingleRegion - - GrowthRegion - GrowthRegion - + GrowthRegion @@ -114,10 +95,7 @@ SingleInstitution - - ManagerInst - ManagerInst - + ManagerInst Source diff --git a/input/growth/source_sink_linear.xml b/input/growth/source_sink_linear.xml index 9cb3bce7c9..26331469cd 100644 --- a/input/growth/source_sink_linear.xml +++ b/input/growth/source_sink_linear.xml @@ -1,4 +1,3 @@ - @@ -8,16 +7,16 @@ 2000 - - commodity - + + cycamoreSink + cycamoreSource + cycamoreGrowthRegion + cycamoreManagerInst + Source1 - - cycamore - Source - + Source commodity @@ -29,10 +28,7 @@ Source2 - - cycamore - Source - + Source commodity @@ -44,10 +40,7 @@ Sink - - cycamore - Sink - + Sink @@ -59,10 +52,7 @@ SingleRegion - - cycamore - GrowthRegion - + GrowthRegion commodity @@ -79,10 +69,7 @@ SingleInstitution - - cycamore - ManagerInst - + ManagerInst Sink @@ -108,4 +95,4 @@ 922380000 99.289 - \ No newline at end of file + From b67f04c591589db5b86313b5cbd5c2659eb5232d Mon Sep 17 00:00:00 2001 From: Robert Carlsen Date: Wed, 28 May 2014 12:38:47 -0500 Subject: [PATCH 06/18] 2 more files updated --- .../source_3_lifetime_sink_1.xml | 30 +++++++------------ input/minimal-input/source_3_sink_1.xml | 30 +++++++------------ 2 files changed, 20 insertions(+), 40 deletions(-) diff --git a/input/minimal-input/source_3_lifetime_sink_1.xml b/input/minimal-input/source_3_lifetime_sink_1.xml index 19e7ad8480..f92e6ee69f 100644 --- a/input/minimal-input/source_3_lifetime_sink_1.xml +++ b/input/minimal-input/source_3_lifetime_sink_1.xml @@ -1,4 +1,3 @@ - @@ -8,16 +7,16 @@ 2000 - - commodity - + + cycamoreSink + cycamoreSource + agentsNullRegion + agentsNullInst + Source - - cycamore - Source - + Source 5 @@ -30,10 +29,7 @@ Sink - - cycamore - Sink - + Sink @@ -46,17 +42,11 @@ SingleRegion - - agents - NullRegion - + NullRegion SingleInstitution - - agents - NullInst - + NullInst Source diff --git a/input/minimal-input/source_3_sink_1.xml b/input/minimal-input/source_3_sink_1.xml index 8c2412eacd..4ddf0eaf12 100644 --- a/input/minimal-input/source_3_sink_1.xml +++ b/input/minimal-input/source_3_sink_1.xml @@ -1,4 +1,3 @@ - @@ -8,16 +7,16 @@ 2000 - - commodity - + + cycamoreSink + cycamoreSource + agentsNullRegion + agentsNullInst + Source - - cycamore - Source - + Source commodity @@ -29,10 +28,7 @@ Sink - - cycamore - Sink - + Sink @@ -45,17 +41,11 @@ SingleRegion - - agents - NullRegion - + NullRegion SingleInstitution - - agents - NullInst - + NullInst Source From ae20b33cd8954a3b06b4ebf95da64e9c22153a8e Mon Sep 17 00:00:00 2001 From: Anthony Scopatz Date: Wed, 28 May 2014 12:41:51 -0500 Subject: [PATCH 07/18] more updates --- .../source_1_lifetime_sink_1.xml | 42 +++++++++--------- input/minimal-input/source_1_sink_1.xml | 43 ++++++++++--------- 2 files changed, 44 insertions(+), 41 deletions(-) diff --git a/input/minimal-input/source_1_lifetime_sink_1.xml b/input/minimal-input/source_1_lifetime_sink_1.xml index 8489a3bbf7..71b21af503 100644 --- a/input/minimal-input/source_1_lifetime_sink_1.xml +++ b/input/minimal-input/source_1_lifetime_sink_1.xml @@ -1,4 +1,3 @@ - @@ -8,16 +7,28 @@ 2000 - - commodity - - - - Source + + + cycamore + Source + cycamore - Source + Sink + + agents + NullRegion + + + agents + NullInst + + + + + Source + Source 5 @@ -30,10 +41,7 @@ Sink - - cycamore - Sink - + Sink @@ -46,17 +54,11 @@ SingleRegion - - agents - NullRegion - + NullRegion SingleInstitution - - agents - NullInst - + NullInst Source diff --git a/input/minimal-input/source_1_sink_1.xml b/input/minimal-input/source_1_sink_1.xml index b08ba3d6b6..997e84c883 100644 --- a/input/minimal-input/source_1_sink_1.xml +++ b/input/minimal-input/source_1_sink_1.xml @@ -1,4 +1,3 @@ - @@ -8,16 +7,28 @@ 2000 - - commodity - - - - Source + + + cycamore + Source + cycamore - Source + Sink + + + agents + NullRegion + + + agents + NullInst + + + + Source + Source commodity @@ -29,10 +40,7 @@ Sink - - cycamore - Sink - + Sink @@ -45,17 +53,11 @@ SingleRegion - - agents - NullRegion - + NullRegion SingleInstitution - - agents - NullInst - + NullInst Source @@ -80,4 +82,3 @@ - From 3dc72068c1a8081bab6f94bbebf2a5583d720270 Mon Sep 17 00:00:00 2001 From: Matthew Gidden Date: Wed, 28 May 2014 12:43:10 -0500 Subject: [PATCH 08/18] updated physor --- input/physor/1_Enrichment_2_Reactor.xml | 47 ++++++++++---------- input/physor/2_Sources_3_Reactors.xml | 57 +++++++++++-------------- 2 files changed, 48 insertions(+), 56 deletions(-) diff --git a/input/physor/1_Enrichment_2_Reactor.xml b/input/physor/1_Enrichment_2_Reactor.xml index 262c5b09e5..10a0a74901 100755 --- a/input/physor/1_Enrichment_2_Reactor.xml +++ b/input/physor/1_Enrichment_2_Reactor.xml @@ -1,4 +1,3 @@ - @@ -8,16 +7,28 @@ 2000 - natl_u - enriched_u - waste - - - Enrichment + + + cycamore + EnrichmentFacility + cycamore - EnrichmentFacility + BatchReactor + + + agents + NullRegion + + + agents + NullInst + + + + Enrichment + EnrichmentFacility natl_u @@ -32,10 +43,7 @@ Reactor1 - - cycamore - BatchReactor - + BatchReactor @@ -80,10 +88,7 @@ Reactor2 - - cycamore - BatchReactor - + BatchReactor @@ -118,17 +123,11 @@ SingleRegion - - agents - NullRegion - + NullRegion SingleInstitution - - agents - NullInst - + NullInst Enrichment diff --git a/input/physor/2_Sources_3_Reactors.xml b/input/physor/2_Sources_3_Reactors.xml index 752d24ea4a..97178fd28e 100755 --- a/input/physor/2_Sources_3_Reactors.xml +++ b/input/physor/2_Sources_3_Reactors.xml @@ -1,4 +1,3 @@ - @@ -8,16 +7,28 @@ 2000 - uox - mox - waste - - - UOX_Source + + + cycamore + Source + cycamore - Source + BatchReactor + + agents + NullRegion + + + cycamore + DeployInst + + + + + UOX_Source + Source uox @@ -29,10 +40,7 @@ MOX_Source - - cycamore - Source - + Source mox @@ -44,10 +52,7 @@ Reactor1 - - cycamore - BatchReactor - + BatchReactor @@ -93,10 +98,7 @@ Reactor2 - - cycamore - BatchReactor - + BatchReactor @@ -137,10 +139,7 @@ Reactor3 - - cycamore - BatchReactor - + BatchReactor @@ -181,19 +180,13 @@ SingleRegion - - agents - NullRegion - + NullRegion SingleInstitution - - cycamore - DeployInst - + DeployInst From 20bb0c20726b267a4e72744d18b55a72b725fcc4 Mon Sep 17 00:00:00 2001 From: Robert Carlsen Date: Wed, 28 May 2014 12:47:59 -0500 Subject: [PATCH 09/18] upd dynamic cap --- tests/input/dynamic_capacitated.xml | 30 ++++++++++------------------- 1 file changed, 10 insertions(+), 20 deletions(-) diff --git a/tests/input/dynamic_capacitated.xml b/tests/input/dynamic_capacitated.xml index 165f2e4941..9b626ea2c1 100644 --- a/tests/input/dynamic_capacitated.xml +++ b/tests/input/dynamic_capacitated.xml @@ -1,4 +1,3 @@ - @@ -8,16 +7,16 @@ 2000 - - commodity - + + cycamoreSink + cycamoreSource + agentsNullRegion + cycamoreDeployInst + Source - - agents - Source - + Source commodity @@ -29,10 +28,7 @@ Sink - - agents - Sink - + Sink 1 @@ -46,19 +42,13 @@ SingleRegion - - agents - NullRegion - + NullRegion SingleInstitution - - cycamore - DeployInst - + DeployInst From 68d08171abbf1d9920daa5592ea0033876da4838 Mon Sep 17 00:00:00 2001 From: Matthew Gidden Date: Wed, 28 May 2014 12:48:32 -0500 Subject: [PATCH 10/18] added growth.xml --- tests/input/growth.xml | 47 +++++++++++++++++++++--------------------- 1 file changed, 23 insertions(+), 24 deletions(-) diff --git a/tests/input/growth.xml b/tests/input/growth.xml index 9cb3bce7c9..4439538541 100644 --- a/tests/input/growth.xml +++ b/tests/input/growth.xml @@ -1,4 +1,3 @@ - @@ -8,16 +7,28 @@ 2000 - - commodity - - - - Source1 + + + cycamore + Source + + + cycamore + Sink + + + cycamore + GrowthRegion + cycamore - Source + ManagerInst + + + + Source1 + Source commodity @@ -29,10 +40,7 @@ Source2 - - cycamore - Source - + Source commodity @@ -44,10 +52,7 @@ Sink - - cycamore - Sink - + Sink @@ -59,10 +64,7 @@ SingleRegion - - cycamore - GrowthRegion - + GrowthRegion commodity @@ -79,10 +81,7 @@ SingleInstitution - - cycamore - ManagerInst - + ManagerInst Sink From e75235add081d5a4bd6bb78d0e64b5570212f3a2 Mon Sep 17 00:00:00 2001 From: Robert Carlsen Date: Wed, 28 May 2014 12:52:42 -0500 Subject: [PATCH 11/18] fix dynamic capacitated to use cyclus source/sink --- tests/input/dynamic_capacitated.xml | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/tests/input/dynamic_capacitated.xml b/tests/input/dynamic_capacitated.xml index 9b626ea2c1..456230adb8 100644 --- a/tests/input/dynamic_capacitated.xml +++ b/tests/input/dynamic_capacitated.xml @@ -8,8 +8,8 @@ - cycamoreSink - cycamoreSource + agentsSink + agentsSource agentsNullRegion cycamoreDeployInst From ca24e55912c48b8cb3ebfa9783829819e1c44f89 Mon Sep 17 00:00:00 2001 From: Anthony Scopatz Date: Wed, 28 May 2014 14:28:15 -0500 Subject: [PATCH 12/18] rm'd archs --- input/batch_reactor/batch_rxtr_2_cycles.xml | 5 ----- input/batch_reactor/batch_rxtr_lifetime.xml | 5 ----- input/batch_reactor/hwr.xml | 5 ----- input/batch_reactor/lwr.xml | 4 ---- input/batch_reactor/preferences.xml | 5 ----- input/physor/1_Enrichment_2_Reactor.xml | 5 ----- input/physor/2_Sources_3_Reactors.xml | 5 ----- 7 files changed, 34 deletions(-) diff --git a/input/batch_reactor/batch_rxtr_2_cycles.xml b/input/batch_reactor/batch_rxtr_2_cycles.xml index cda8fc8054..0402b34d8a 100644 --- a/input/batch_reactor/batch_rxtr_2_cycles.xml +++ b/input/batch_reactor/batch_rxtr_2_cycles.xml @@ -41,7 +41,6 @@ Source - Source enriched_u @@ -53,7 +52,6 @@ LWR_Reactor - BatchReactor 26 @@ -78,7 +76,6 @@ Sink - Sink @@ -91,11 +88,9 @@ SingleRegion - NullRegion SingleInstitution - NullInst Source diff --git a/input/batch_reactor/batch_rxtr_lifetime.xml b/input/batch_reactor/batch_rxtr_lifetime.xml index 36375f5be4..783ca1f6a8 100644 --- a/input/batch_reactor/batch_rxtr_lifetime.xml +++ b/input/batch_reactor/batch_rxtr_lifetime.xml @@ -33,7 +33,6 @@ reasonably for its lifetime. --> Source - Source enriched_u @@ -45,7 +44,6 @@ reasonably for its lifetime. --> LWR_Reactor - BatchReactor 480 @@ -70,7 +68,6 @@ reasonably for its lifetime. --> Sink - Sink @@ -83,11 +80,9 @@ reasonably for its lifetime. --> SingleRegion - NullRegion SingleInstitution - NullInst Source diff --git a/input/batch_reactor/hwr.xml b/input/batch_reactor/hwr.xml index f78cd070a4..dd84e97eb9 100644 --- a/input/batch_reactor/hwr.xml +++ b/input/batch_reactor/hwr.xml @@ -32,7 +32,6 @@ Source - Source enriched_u @@ -43,7 +42,6 @@ HW_Reactor - BatchReactor 480 @@ -68,7 +66,6 @@ Sink - Sink @@ -80,11 +77,9 @@ SingleRegion - NullRegion SingleInstitution - NullInst Source diff --git a/input/batch_reactor/lwr.xml b/input/batch_reactor/lwr.xml index d7d17d6426..d1e2d10379 100644 --- a/input/batch_reactor/lwr.xml +++ b/input/batch_reactor/lwr.xml @@ -32,7 +32,6 @@ Source - Source enriched_u @@ -43,7 +42,6 @@ LW_Reactor - BatchReactor 480 @@ -68,7 +66,6 @@ Sink - Sink @@ -80,7 +77,6 @@ SingleRegion - NullRegion SingleInstitution diff --git a/input/batch_reactor/preferences.xml b/input/batch_reactor/preferences.xml index 86f5eea9b4..ea2b603575 100644 --- a/input/batch_reactor/preferences.xml +++ b/input/batch_reactor/preferences.xml @@ -36,7 +36,6 @@ commodity. --> Source - Source used_commodity @@ -48,7 +47,6 @@ commodity. --> Reactor - BatchReactor @@ -75,7 +73,6 @@ commodity. --> Sink - Sink @@ -89,11 +86,9 @@ commodity. --> SingleRegion - NullRegion SingleInstitution - NullInst Source diff --git a/input/physor/1_Enrichment_2_Reactor.xml b/input/physor/1_Enrichment_2_Reactor.xml index 10a0a74901..b9d9bd5bba 100755 --- a/input/physor/1_Enrichment_2_Reactor.xml +++ b/input/physor/1_Enrichment_2_Reactor.xml @@ -28,7 +28,6 @@ Enrichment - EnrichmentFacility natl_u @@ -43,7 +42,6 @@ Reactor1 - BatchReactor @@ -88,7 +86,6 @@ Reactor2 - BatchReactor @@ -123,11 +120,9 @@ SingleRegion - NullRegion SingleInstitution - NullInst Enrichment diff --git a/input/physor/2_Sources_3_Reactors.xml b/input/physor/2_Sources_3_Reactors.xml index 97178fd28e..a9a8d99011 100755 --- a/input/physor/2_Sources_3_Reactors.xml +++ b/input/physor/2_Sources_3_Reactors.xml @@ -40,7 +40,6 @@ MOX_Source - Source mox @@ -52,7 +51,6 @@ Reactor1 - BatchReactor @@ -98,7 +96,6 @@ Reactor2 - BatchReactor @@ -180,13 +177,11 @@ SingleRegion - NullRegion SingleInstitution - DeployInst From a0bd18df857d711b552628b9ea2b9a8dddf37b14 Mon Sep 17 00:00:00 2001 From: Robert Carlsen Date: Wed, 28 May 2014 14:29:43 -0500 Subject: [PATCH 13/18] rm extra archetype tag from prototypes --- input/enrichment/1_src_enr_rxtr_sink.xml | 6 ------ input/enrichment/linear_src_enr_rxtr_sink.xml | 6 ------ input/enrichment/natu_capacitated.xml | 6 ------ input/enrichment/swu_capacitated.xml | 6 ------ input/growth/source_sink_linear.xml | 5 ----- input/minimal-input/source_1_lifetime_sink_1.xml | 4 ---- input/minimal-input/source_1_sink_1.xml | 4 ---- 7 files changed, 37 deletions(-) diff --git a/input/enrichment/1_src_enr_rxtr_sink.xml b/input/enrichment/1_src_enr_rxtr_sink.xml index c240cae315..e9abc59697 100644 --- a/input/enrichment/1_src_enr_rxtr_sink.xml +++ b/input/enrichment/1_src_enr_rxtr_sink.xml @@ -18,7 +18,6 @@ Source - Sink natl_u @@ -30,7 +29,6 @@ Enrichment - EnrichmentFacility natl_u @@ -44,7 +42,6 @@ Reactor - BatchReactor @@ -67,7 +64,6 @@ Sink - Sink @@ -80,11 +76,9 @@ SingleRegion - NullRegion SingleInstitution - NullInst Source diff --git a/input/enrichment/linear_src_enr_rxtr_sink.xml b/input/enrichment/linear_src_enr_rxtr_sink.xml index 112044178a..32d3f237ed 100644 --- a/input/enrichment/linear_src_enr_rxtr_sink.xml +++ b/input/enrichment/linear_src_enr_rxtr_sink.xml @@ -18,7 +18,6 @@ Source - Source natl_u @@ -30,7 +29,6 @@ Enrichment - EnrichmentFacility natl_u @@ -44,7 +42,6 @@ Reactor - BatchReactor @@ -67,7 +64,6 @@ Sink - Sink @@ -80,7 +76,6 @@ SingleRegion - GrowthRegion @@ -94,7 +89,6 @@ SingleInstitution - ManagerInst Source diff --git a/input/enrichment/natu_capacitated.xml b/input/enrichment/natu_capacitated.xml index d9961e0cfc..1398df823d 100644 --- a/input/enrichment/natu_capacitated.xml +++ b/input/enrichment/natu_capacitated.xml @@ -18,7 +18,6 @@ Source - Source natl_u @@ -30,7 +29,6 @@ Enrichment - EnrichmentFacility natl_u @@ -44,7 +42,6 @@ Reactor - BatchReactor @@ -67,7 +64,6 @@ Sink - Sink @@ -80,7 +76,6 @@ SingleRegion - GrowthRegion @@ -94,7 +89,6 @@ SingleInstitution - ManagerInst Source diff --git a/input/enrichment/swu_capacitated.xml b/input/enrichment/swu_capacitated.xml index afe42c0a57..65a30d202a 100644 --- a/input/enrichment/swu_capacitated.xml +++ b/input/enrichment/swu_capacitated.xml @@ -18,7 +18,6 @@ Source - Source natl_u @@ -30,7 +29,6 @@ Enrichment - EnrichmentFacility natl_u @@ -45,7 +43,6 @@ Reactor - BatchReactor @@ -68,7 +65,6 @@ Sink - Sink @@ -81,7 +77,6 @@ SingleRegion - GrowthRegion @@ -95,7 +90,6 @@ SingleInstitution - ManagerInst Source diff --git a/input/growth/source_sink_linear.xml b/input/growth/source_sink_linear.xml index 26331469cd..1c90a5a709 100644 --- a/input/growth/source_sink_linear.xml +++ b/input/growth/source_sink_linear.xml @@ -16,7 +16,6 @@ Source1 - Source commodity @@ -28,7 +27,6 @@ Source2 - Source commodity @@ -40,7 +38,6 @@ Sink - Sink @@ -52,7 +49,6 @@ SingleRegion - GrowthRegion commodity @@ -69,7 +65,6 @@ SingleInstitution - ManagerInst Sink diff --git a/input/minimal-input/source_1_lifetime_sink_1.xml b/input/minimal-input/source_1_lifetime_sink_1.xml index 71b21af503..2d91835c44 100644 --- a/input/minimal-input/source_1_lifetime_sink_1.xml +++ b/input/minimal-input/source_1_lifetime_sink_1.xml @@ -28,7 +28,6 @@ Source - Source 5 @@ -41,7 +40,6 @@ Sink - Sink @@ -54,11 +52,9 @@ SingleRegion - NullRegion SingleInstitution - NullInst Source diff --git a/input/minimal-input/source_1_sink_1.xml b/input/minimal-input/source_1_sink_1.xml index 997e84c883..2ac6669abd 100644 --- a/input/minimal-input/source_1_sink_1.xml +++ b/input/minimal-input/source_1_sink_1.xml @@ -28,7 +28,6 @@ Source - Source commodity @@ -40,7 +39,6 @@ Sink - Sink @@ -53,11 +51,9 @@ SingleRegion - NullRegion SingleInstitution - NullInst Source From bdd8c980093419889feb97cb0ba97761a99dbe3a Mon Sep 17 00:00:00 2001 From: Anthony Scopatz Date: Wed, 28 May 2014 14:31:28 -0500 Subject: [PATCH 14/18] min imp changes --- input/minimal-input/source_3_lifetime_sink_1.xml | 4 ---- input/minimal-input/source_3_sink_1.xml | 4 ---- 2 files changed, 8 deletions(-) diff --git a/input/minimal-input/source_3_lifetime_sink_1.xml b/input/minimal-input/source_3_lifetime_sink_1.xml index f92e6ee69f..21c56b697e 100644 --- a/input/minimal-input/source_3_lifetime_sink_1.xml +++ b/input/minimal-input/source_3_lifetime_sink_1.xml @@ -16,7 +16,6 @@ Source - Source 5 @@ -29,7 +28,6 @@ Sink - Sink @@ -42,11 +40,9 @@ SingleRegion - NullRegion SingleInstitution - NullInst Source diff --git a/input/minimal-input/source_3_sink_1.xml b/input/minimal-input/source_3_sink_1.xml index 4ddf0eaf12..ea16829131 100644 --- a/input/minimal-input/source_3_sink_1.xml +++ b/input/minimal-input/source_3_sink_1.xml @@ -16,7 +16,6 @@ Source - Source commodity @@ -28,7 +27,6 @@ Sink - Sink @@ -41,8 +39,6 @@ SingleRegion - NullRegion - SingleInstitution NullInst From d44d743cf5a3ef1819b4ea6669e82d9f93594627 Mon Sep 17 00:00:00 2001 From: Robert Carlsen Date: Wed, 28 May 2014 14:47:35 -0500 Subject: [PATCH 15/18] agent->config --- input/batch_reactor/batch_rxtr_2_cycles.xml | 16 +++++------ input/batch_reactor/batch_rxtr_lifetime.xml | 16 +++++------ input/batch_reactor/hwr.xml | 16 +++++------ input/batch_reactor/lwr.xml | 16 +++++------ input/batch_reactor/preferences.xml | 16 +++++------ input/enrichment/1_src_enr_rxtr_sink.xml | 20 ++++++------- input/enrichment/linear_src_enr_rxtr_sink.xml | 22 +++++++-------- input/enrichment/natu_capacitated.xml | 22 +++++++-------- input/enrichment/swu_capacitated.xml | 22 +++++++-------- input/growth/source_sink_linear.xml | 20 ++++++------- .../source_1_lifetime_sink_1.xml | 12 ++++---- input/minimal-input/source_1_sink_1.xml | 12 ++++---- .../source_3_lifetime_sink_1.xml | 12 ++++---- input/minimal-input/source_3_sink_1.xml | 10 +++---- input/physor/1_Enrichment_2_Reactor.xml | 16 +++++------ input/physor/2_Sources_3_Reactors.xml | 28 +++++++++---------- src/batch_reactor_tests.cc | 4 +-- src/enrichment_facility_tests.cc | 4 +-- src/sink_tests.cc | 4 +-- tests/input/dynamic_capacitated.xml | 16 +++++------ tests/input/growth.xml | 20 ++++++------- 21 files changed, 162 insertions(+), 162 deletions(-) diff --git a/input/batch_reactor/batch_rxtr_2_cycles.xml b/input/batch_reactor/batch_rxtr_2_cycles.xml index 0402b34d8a..8e894f0444 100644 --- a/input/batch_reactor/batch_rxtr_2_cycles.xml +++ b/input/batch_reactor/batch_rxtr_2_cycles.xml @@ -41,19 +41,19 @@ Source - + enriched_u 1.0e10 lwr_fuel_recipe - + LWR_Reactor 26 - + enriched_u @@ -71,24 +71,24 @@ 1000 - + Sink - + waste 1.0e10 - + SingleRegion - + SingleInstitution @@ -105,7 +105,7 @@ 1 - + diff --git a/input/batch_reactor/batch_rxtr_lifetime.xml b/input/batch_reactor/batch_rxtr_lifetime.xml index 783ca1f6a8..fa2f630581 100644 --- a/input/batch_reactor/batch_rxtr_lifetime.xml +++ b/input/batch_reactor/batch_rxtr_lifetime.xml @@ -33,19 +33,19 @@ reasonably for its lifetime. --> Source - + enriched_u 1.0e10 lwr_fuel_recipe - + LWR_Reactor 480 - + enriched_u @@ -63,24 +63,24 @@ reasonably for its lifetime. --> 1000 - + Sink - + waste 1.0e10 - + SingleRegion - + SingleInstitution @@ -97,7 +97,7 @@ reasonably for its lifetime. --> 1 - + diff --git a/input/batch_reactor/hwr.xml b/input/batch_reactor/hwr.xml index dd84e97eb9..dc121fd283 100644 --- a/input/batch_reactor/hwr.xml +++ b/input/batch_reactor/hwr.xml @@ -32,18 +32,18 @@ Source - + enriched_u natl_u - + HW_Reactor 480 - + enriched_u @@ -61,23 +61,23 @@ 600 - + Sink - + waste - + SingleRegion - + SingleInstitution @@ -94,7 +94,7 @@ 1 - + diff --git a/input/batch_reactor/lwr.xml b/input/batch_reactor/lwr.xml index d1e2d10379..c90c765320 100644 --- a/input/batch_reactor/lwr.xml +++ b/input/batch_reactor/lwr.xml @@ -32,18 +32,18 @@ Source - + enriched_u lwr_fuel_recipe - + LW_Reactor 480 - + enriched_u @@ -61,23 +61,23 @@ 1000 - + Sink - + waste - + SingleRegion - + SingleInstitution NullInst @@ -95,7 +95,7 @@ 1 - + diff --git a/input/batch_reactor/preferences.xml b/input/batch_reactor/preferences.xml index ea2b603575..6da0e1df90 100644 --- a/input/batch_reactor/preferences.xml +++ b/input/batch_reactor/preferences.xml @@ -36,18 +36,18 @@ commodity. --> Source - + used_commodity 1 commod_recipe - + Reactor - + used_commodity @@ -68,12 +68,12 @@ commodity. --> 1.0 - + Sink - + used_commodity @@ -81,12 +81,12 @@ commodity. --> 2 - + SingleRegion - + SingleInstitution @@ -103,7 +103,7 @@ commodity. --> 1 - + diff --git a/input/enrichment/1_src_enr_rxtr_sink.xml b/input/enrichment/1_src_enr_rxtr_sink.xml index e9abc59697..21b868ac61 100644 --- a/input/enrichment/1_src_enr_rxtr_sink.xml +++ b/input/enrichment/1_src_enr_rxtr_sink.xml @@ -18,18 +18,18 @@ Source - + natl_u 1000 natl_u - + Enrichment - + natl_u enriched_u @@ -37,12 +37,12 @@ 0.003 500 - + Reactor - + enriched_u @@ -59,24 +59,24 @@ 10 - + Sink - + waste 1 - + SingleRegion - + SingleInstitution @@ -97,7 +97,7 @@ 1 - + diff --git a/input/enrichment/linear_src_enr_rxtr_sink.xml b/input/enrichment/linear_src_enr_rxtr_sink.xml index 32d3f237ed..2daa68cfaa 100644 --- a/input/enrichment/linear_src_enr_rxtr_sink.xml +++ b/input/enrichment/linear_src_enr_rxtr_sink.xml @@ -18,18 +18,18 @@ Source - + natl_u 1000 natl_u - + Enrichment - + natl_u natl_u @@ -37,12 +37,12 @@ enriched_u 0.003 - + Reactor - + enriched_u @@ -59,24 +59,24 @@ 10 - + Sink - + waste 1000 - + SingleRegion - + power @@ -86,7 +86,7 @@ - + SingleInstitution @@ -103,7 +103,7 @@ 1 - + diff --git a/input/enrichment/natu_capacitated.xml b/input/enrichment/natu_capacitated.xml index 1398df823d..a1f6b299af 100644 --- a/input/enrichment/natu_capacitated.xml +++ b/input/enrichment/natu_capacitated.xml @@ -18,18 +18,18 @@ Source - + natl_u 1000 natl_u - + Enrichment - + natl_u natl_u @@ -37,12 +37,12 @@ enriched_u 0.003 - + Reactor - + enriched_u @@ -59,24 +59,24 @@ 10 - + Sink - + waste 1000 - + SingleRegion - + power @@ -86,7 +86,7 @@ - + SingleInstitution @@ -103,7 +103,7 @@ 1 - + diff --git a/input/enrichment/swu_capacitated.xml b/input/enrichment/swu_capacitated.xml index 65a30d202a..220f5a872a 100644 --- a/input/enrichment/swu_capacitated.xml +++ b/input/enrichment/swu_capacitated.xml @@ -18,18 +18,18 @@ Source - + natl_u 1000 natl_u - + Enrichment - + natl_u natl_u @@ -38,12 +38,12 @@ 0.003 30.0 - + Reactor - + enriched_u @@ -60,24 +60,24 @@ 10 - + Sink - + waste 1000 - + SingleRegion - + power @@ -87,7 +87,7 @@ - + SingleInstitution @@ -104,7 +104,7 @@ 1 - + diff --git a/input/growth/source_sink_linear.xml b/input/growth/source_sink_linear.xml index 1c90a5a709..89a50b3ac8 100644 --- a/input/growth/source_sink_linear.xml +++ b/input/growth/source_sink_linear.xml @@ -16,40 +16,40 @@ Source1 - + commodity commod_recipe 1.1 - + Source2 - + commodity commod_recipe 2 - + Sink - + commodity - + SingleRegion - + commodity @@ -62,7 +62,7 @@ 0 - + SingleInstitution @@ -71,7 +71,7 @@ 1 - + Sink @@ -79,7 +79,7 @@ Source2 - + diff --git a/input/minimal-input/source_1_lifetime_sink_1.xml b/input/minimal-input/source_1_lifetime_sink_1.xml index 2d91835c44..ebeb480e94 100644 --- a/input/minimal-input/source_1_lifetime_sink_1.xml +++ b/input/minimal-input/source_1_lifetime_sink_1.xml @@ -29,30 +29,30 @@ Source 5 - + commodity commod_recipe 1 - + Sink - + commodity 1 - + SingleRegion - + SingleInstitution @@ -65,7 +65,7 @@ 1 - + diff --git a/input/minimal-input/source_1_sink_1.xml b/input/minimal-input/source_1_sink_1.xml index 2ac6669abd..f93e35aa2f 100644 --- a/input/minimal-input/source_1_sink_1.xml +++ b/input/minimal-input/source_1_sink_1.xml @@ -28,30 +28,30 @@ Source - + commodity 1 commod_recipe - + Sink - + commodity 1 - + SingleRegion - + SingleInstitution @@ -64,7 +64,7 @@ 1 - + diff --git a/input/minimal-input/source_3_lifetime_sink_1.xml b/input/minimal-input/source_3_lifetime_sink_1.xml index 21c56b697e..8c125d7893 100644 --- a/input/minimal-input/source_3_lifetime_sink_1.xml +++ b/input/minimal-input/source_3_lifetime_sink_1.xml @@ -17,30 +17,30 @@ Source 5 - + commodity 1 commod_recipe - + Sink - + commodity 3 - + SingleRegion - + SingleInstitution @@ -53,7 +53,7 @@ 1 - + diff --git a/input/minimal-input/source_3_sink_1.xml b/input/minimal-input/source_3_sink_1.xml index ea16829131..f3553e464d 100644 --- a/input/minimal-input/source_3_sink_1.xml +++ b/input/minimal-input/source_3_sink_1.xml @@ -16,25 +16,25 @@ Source - + commodity 1 commod_recipe - + Sink - + commodity 3 - + @@ -52,7 +52,7 @@ 1 - + diff --git a/input/physor/1_Enrichment_2_Reactor.xml b/input/physor/1_Enrichment_2_Reactor.xml index b9d9bd5bba..4123862d83 100755 --- a/input/physor/1_Enrichment_2_Reactor.xml +++ b/input/physor/1_Enrichment_2_Reactor.xml @@ -28,7 +28,7 @@ Enrichment - + natl_u natl_u @@ -37,12 +37,12 @@ 10 1e5 - + Reactor1 - + enriched_u @@ -81,12 +81,12 @@ 1.0 - + Reactor2 - + enriched_u @@ -115,12 +115,12 @@ 0.5 - + SingleRegion - + SingleInstitution @@ -137,7 +137,7 @@ 1 - + diff --git a/input/physor/2_Sources_3_Reactors.xml b/input/physor/2_Sources_3_Reactors.xml index a9a8d99011..ad8c8d5187 100755 --- a/input/physor/2_Sources_3_Reactors.xml +++ b/input/physor/2_Sources_3_Reactors.xml @@ -29,29 +29,29 @@ UOX_Source Source - + uox uox_fuel_recipe 2.5 - + MOX_Source - + mox mox_fuel_recipe 2.5 - + Reactor1 - + uox @@ -91,12 +91,12 @@ - + Reactor2 - + uox @@ -131,13 +131,13 @@ 1.0 - + Reactor3 BatchReactor - + uox @@ -172,17 +172,17 @@ 0.5 - + SingleRegion - + - + SingleInstitution - + UOX_Source @@ -210,7 +210,7 @@ 3 - + diff --git a/src/batch_reactor_tests.cc b/src/batch_reactor_tests.cc index fc1f040b2f..52776980ac 100644 --- a/src/batch_reactor_tests.cc +++ b/src/batch_reactor_tests.cc @@ -208,7 +208,7 @@ TEST_F(BatchReactorTest, DISABLED_XMLInit) { std::stringstream ss; ss << "" << "fooname" - << "" + << "" << "" << " " << " " << in_c1 << "" @@ -275,7 +275,7 @@ TEST_F(BatchReactorTest, DISABLED_XMLInit) { << " " << " " << "" - << "" + << "" << ""; cyclus::XMLParser p; diff --git a/src/enrichment_facility_tests.cc b/src/enrichment_facility_tests.cc index cfeee52d58..2a68551c9c 100644 --- a/src/enrichment_facility_tests.cc +++ b/src/enrichment_facility_tests.cc @@ -118,7 +118,7 @@ TEST_F(EnrichmentFacilityTest, DISABLED_XMLInit) { std::stringstream ss; ss << "" << "fooname" - << "" + << "" << "" << " " << " " << in_commod << "" @@ -134,7 +134,7 @@ TEST_F(EnrichmentFacilityTest, DISABLED_XMLInit) { << " " << reserves << "" << " " << "" - << "" + << "" << ""; cyclus::XMLParser p; diff --git a/src/sink_tests.cc b/src/sink_tests.cc index 6a65a35c26..7121cc10e2 100644 --- a/src/sink_tests.cc +++ b/src/sink_tests.cc @@ -75,7 +75,7 @@ TEST_F(SinkTest, DISABLED_XMLInit) { std::stringstream ss; ss << "" << "fooname" - << "" + << "" << "" << "" << " " @@ -86,7 +86,7 @@ TEST_F(SinkTest, DISABLED_XMLInit) { << " " << inv_ << "" << "" << "" - << "" + << "" << ""; cyclus::XMLParser p; diff --git a/tests/input/dynamic_capacitated.xml b/tests/input/dynamic_capacitated.xml index 456230adb8..a3729c14fe 100644 --- a/tests/input/dynamic_capacitated.xml +++ b/tests/input/dynamic_capacitated.xml @@ -17,39 +17,39 @@ Source Source - + commodity commod_recipe 1.0 - + Sink Sink 1 - + commodity 1.0 - + SingleRegion NullRegion - + - + SingleInstitution DeployInst - + Source @@ -67,7 +67,7 @@ 2 - + diff --git a/tests/input/growth.xml b/tests/input/growth.xml index 4439538541..02ec6dd1e3 100644 --- a/tests/input/growth.xml +++ b/tests/input/growth.xml @@ -29,43 +29,43 @@ Source1 Source - + commodity commod_recipe 1.1 - + Source2 Source - + commodity commod_recipe 2 - + Sink Sink - + commodity - + SingleRegion GrowthRegion - + commodity @@ -78,7 +78,7 @@ 0 - + SingleInstitution ManagerInst @@ -88,7 +88,7 @@ 1 - + Sink @@ -96,7 +96,7 @@ Source2 - + From 28d8abc3abfb2ffd74a2bf078e9aaacd1812aec3 Mon Sep 17 00:00:00 2001 From: Robert Carlsen Date: Wed, 28 May 2014 14:52:52 -0500 Subject: [PATCH 16/18] archetype tag to name --- input/batch_reactor/batch_rxtr_2_cycles.xml | 10 +++++----- input/batch_reactor/batch_rxtr_lifetime.xml | 10 +++++----- input/batch_reactor/hwr.xml | 10 +++++----- input/batch_reactor/lwr.xml | 12 ++++++------ input/batch_reactor/preferences.xml | 10 +++++----- input/enrichment/1_src_enr_rxtr_sink.xml | 12 ++++++------ input/enrichment/linear_src_enr_rxtr_sink.xml | 12 ++++++------ input/enrichment/natu_capacitated.xml | 12 ++++++------ input/enrichment/swu_capacitated.xml | 12 ++++++------ input/growth/source_sink_linear.xml | 8 ++++---- .../minimal-input/source_1_lifetime_sink_1.xml | 8 ++++---- input/minimal-input/source_1_sink_1.xml | 8 ++++---- .../minimal-input/source_3_lifetime_sink_1.xml | 8 ++++---- input/minimal-input/source_3_sink_1.xml | 10 +++++----- input/physor/1_Enrichment_2_Reactor.xml | 8 ++++---- input/physor/2_Sources_3_Reactors.xml | 12 ++++++------ tests/input/dynamic_capacitated.xml | 16 ++++++++-------- tests/input/growth.xml | 18 +++++++++--------- 18 files changed, 98 insertions(+), 98 deletions(-) diff --git a/input/batch_reactor/batch_rxtr_2_cycles.xml b/input/batch_reactor/batch_rxtr_2_cycles.xml index 8e894f0444..c39accc131 100644 --- a/input/batch_reactor/batch_rxtr_2_cycles.xml +++ b/input/batch_reactor/batch_rxtr_2_cycles.xml @@ -19,23 +19,23 @@ cycamore - Source + Source cycamore - BatchReactor + BatchReactor cycamore - Sink + Sink agents - NullRegion + NullRegion agents - NullInst + NullInst diff --git a/input/batch_reactor/batch_rxtr_lifetime.xml b/input/batch_reactor/batch_rxtr_lifetime.xml index fa2f630581..44aeef22d3 100644 --- a/input/batch_reactor/batch_rxtr_lifetime.xml +++ b/input/batch_reactor/batch_rxtr_lifetime.xml @@ -11,23 +11,23 @@ reasonably for its lifetime. --> cycamore - Source + Source cycamore - BatchReactor + BatchReactor agents - NullRegion + NullRegion agents - NullInst + NullInst cycamore - Sink + Sink diff --git a/input/batch_reactor/hwr.xml b/input/batch_reactor/hwr.xml index dc121fd283..0871e80cc8 100644 --- a/input/batch_reactor/hwr.xml +++ b/input/batch_reactor/hwr.xml @@ -10,23 +10,23 @@ cycamore - Source + Source cycamore - BatchReactor + BatchReactor cycamore - Sink + Sink agents - NullRegion + NullRegion agents - NullInst + NullInst diff --git a/input/batch_reactor/lwr.xml b/input/batch_reactor/lwr.xml index c90c765320..9d4b59262b 100644 --- a/input/batch_reactor/lwr.xml +++ b/input/batch_reactor/lwr.xml @@ -10,23 +10,23 @@ cycamore - Source + Source cycamore - BatchReactor + BatchReactor cycamore - Sink + Sink agents - NullRegion + NullRegion agents - NullInst + NullInst @@ -80,7 +80,7 @@ SingleInstitution - NullInst + NullInst Source diff --git a/input/batch_reactor/preferences.xml b/input/batch_reactor/preferences.xml index 6da0e1df90..6b37f66f89 100644 --- a/input/batch_reactor/preferences.xml +++ b/input/batch_reactor/preferences.xml @@ -14,23 +14,23 @@ commodity. --> cycamore - Source + Source cycamore - BatchReactor + BatchReactor cycamore - Sink + Sink agents - NullRegion + NullRegion agents - NullInst + NullInst diff --git a/input/enrichment/1_src_enr_rxtr_sink.xml b/input/enrichment/1_src_enr_rxtr_sink.xml index 21b868ac61..7375b42b86 100644 --- a/input/enrichment/1_src_enr_rxtr_sink.xml +++ b/input/enrichment/1_src_enr_rxtr_sink.xml @@ -8,12 +8,12 @@ - cycamoreSink - cycamoreSource - cycamoreEnrichmentFacility - cycamoreBatchReactor - agentsNullRegion - agentsNullInst + cycamoreSink + cycamoreSource + cycamoreEnrichmentFacility + cycamoreBatchReactor + agentsNullRegion + agentsNullInst diff --git a/input/enrichment/linear_src_enr_rxtr_sink.xml b/input/enrichment/linear_src_enr_rxtr_sink.xml index 2daa68cfaa..20a5f342c0 100644 --- a/input/enrichment/linear_src_enr_rxtr_sink.xml +++ b/input/enrichment/linear_src_enr_rxtr_sink.xml @@ -8,12 +8,12 @@ - cycamoreSink - cycamoreSource - cycamoreEnrichmentFacility - cycamoreBatchReactor - cycamoreGrowthRegion - cycamoreManagerInst + cycamoreSink + cycamoreSource + cycamoreEnrichmentFacility + cycamoreBatchReactor + cycamoreGrowthRegion + cycamoreManagerInst diff --git a/input/enrichment/natu_capacitated.xml b/input/enrichment/natu_capacitated.xml index a1f6b299af..d48de72504 100644 --- a/input/enrichment/natu_capacitated.xml +++ b/input/enrichment/natu_capacitated.xml @@ -8,12 +8,12 @@ - cycamoreSink - cycamoreSource - cycamoreEnrichmentFacility - cycamoreBatchReactor - cycamoreGrowthRegion - cycamoreManagerInst + cycamoreSink + cycamoreSource + cycamoreEnrichmentFacility + cycamoreBatchReactor + cycamoreGrowthRegion + cycamoreManagerInst diff --git a/input/enrichment/swu_capacitated.xml b/input/enrichment/swu_capacitated.xml index 220f5a872a..91f9d99d8a 100644 --- a/input/enrichment/swu_capacitated.xml +++ b/input/enrichment/swu_capacitated.xml @@ -8,12 +8,12 @@ - cycamoreSink - cycamoreSource - cycamoreEnrichmentFacility - cycamoreBatchReactor - cycamoreGrowthRegion - cycamoreManagerInst + cycamoreSink + cycamoreSource + cycamoreEnrichmentFacility + cycamoreBatchReactor + cycamoreGrowthRegion + cycamoreManagerInst diff --git a/input/growth/source_sink_linear.xml b/input/growth/source_sink_linear.xml index 89a50b3ac8..e432f3d0bd 100644 --- a/input/growth/source_sink_linear.xml +++ b/input/growth/source_sink_linear.xml @@ -8,10 +8,10 @@ - cycamoreSink - cycamoreSource - cycamoreGrowthRegion - cycamoreManagerInst + cycamoreSink + cycamoreSource + cycamoreGrowthRegion + cycamoreManagerInst diff --git a/input/minimal-input/source_1_lifetime_sink_1.xml b/input/minimal-input/source_1_lifetime_sink_1.xml index ebeb480e94..7dccb5cb3e 100644 --- a/input/minimal-input/source_1_lifetime_sink_1.xml +++ b/input/minimal-input/source_1_lifetime_sink_1.xml @@ -10,19 +10,19 @@ cycamore - Source + Source cycamore - Sink + Sink agents - NullRegion + NullRegion agents - NullInst + NullInst diff --git a/input/minimal-input/source_1_sink_1.xml b/input/minimal-input/source_1_sink_1.xml index f93e35aa2f..cc501d43c5 100644 --- a/input/minimal-input/source_1_sink_1.xml +++ b/input/minimal-input/source_1_sink_1.xml @@ -10,19 +10,19 @@ cycamore - Source + Source cycamore - Sink + Sink agents - NullRegion + NullRegion agents - NullInst + NullInst diff --git a/input/minimal-input/source_3_lifetime_sink_1.xml b/input/minimal-input/source_3_lifetime_sink_1.xml index 8c125d7893..a606800799 100644 --- a/input/minimal-input/source_3_lifetime_sink_1.xml +++ b/input/minimal-input/source_3_lifetime_sink_1.xml @@ -8,10 +8,10 @@ - cycamoreSink - cycamoreSource - agentsNullRegion - agentsNullInst + cycamoreSink + cycamoreSource + agentsNullRegion + agentsNullInst diff --git a/input/minimal-input/source_3_sink_1.xml b/input/minimal-input/source_3_sink_1.xml index f3553e464d..a724007164 100644 --- a/input/minimal-input/source_3_sink_1.xml +++ b/input/minimal-input/source_3_sink_1.xml @@ -8,10 +8,10 @@ - cycamoreSink - cycamoreSource - agentsNullRegion - agentsNullInst + cycamoreSink + cycamoreSource + agentsNullRegion + agentsNullInst @@ -41,7 +41,7 @@ SingleRegion SingleInstitution - NullInst + NullInst Source diff --git a/input/physor/1_Enrichment_2_Reactor.xml b/input/physor/1_Enrichment_2_Reactor.xml index 4123862d83..3e46f96d1b 100755 --- a/input/physor/1_Enrichment_2_Reactor.xml +++ b/input/physor/1_Enrichment_2_Reactor.xml @@ -10,19 +10,19 @@ cycamore - EnrichmentFacility + EnrichmentFacility cycamore - BatchReactor + BatchReactor agents - NullRegion + NullRegion agents - NullInst + NullInst diff --git a/input/physor/2_Sources_3_Reactors.xml b/input/physor/2_Sources_3_Reactors.xml index ad8c8d5187..7383453005 100755 --- a/input/physor/2_Sources_3_Reactors.xml +++ b/input/physor/2_Sources_3_Reactors.xml @@ -10,25 +10,25 @@ cycamore - Source + Source cycamore - BatchReactor + BatchReactor agents - NullRegion + NullRegion cycamore - DeployInst + DeployInst UOX_Source - Source + Source uox @@ -136,7 +136,7 @@ Reactor3 - BatchReactor + BatchReactor diff --git a/tests/input/dynamic_capacitated.xml b/tests/input/dynamic_capacitated.xml index a3729c14fe..fe020ec384 100644 --- a/tests/input/dynamic_capacitated.xml +++ b/tests/input/dynamic_capacitated.xml @@ -8,15 +8,15 @@ - agentsSink - agentsSource - agentsNullRegion - cycamoreDeployInst + agentsSink + agentsSource + agentsNullRegion + cycamoreDeployInst Source - Source + Source commodity @@ -28,7 +28,7 @@ Sink - Sink + Sink 1 @@ -42,13 +42,13 @@ SingleRegion - NullRegion + NullRegion SingleInstitution - DeployInst + DeployInst diff --git a/tests/input/growth.xml b/tests/input/growth.xml index 02ec6dd1e3..aff8929f0f 100644 --- a/tests/input/growth.xml +++ b/tests/input/growth.xml @@ -10,25 +10,25 @@ cycamore - Source + Source cycamore - Sink + Sink cycamore - GrowthRegion + GrowthRegion cycamore - ManagerInst + ManagerInst Source1 - Source + Source commodity @@ -40,7 +40,7 @@ Source2 - Source + Source commodity @@ -52,7 +52,7 @@ Sink - Sink + Sink @@ -64,7 +64,7 @@ SingleRegion - GrowthRegion + GrowthRegion commodity @@ -81,7 +81,7 @@ SingleInstitution - ManagerInst + ManagerInst Sink From f4a3e935482cd4a68972f8f8b9a80357264e2b29 Mon Sep 17 00:00:00 2001 From: Robert Carlsen Date: Wed, 28 May 2014 14:59:49 -0500 Subject: [PATCH 17/18] fix agent/* calls to config/* --- src/batch_reactor.cc | 2 +- src/deploy_inst.cc | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/src/batch_reactor.cc b/src/batch_reactor.cc index 3471689a04..b85a022cd1 100644 --- a/src/batch_reactor.cc +++ b/src/batch_reactor.cc @@ -263,7 +263,7 @@ void BatchReactor::InitFrom(cyclus::QueryableBackend* b) { // - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - void BatchReactor::InfileToDb(cyclus::InfileTree* qe, cyclus::DbInit di) { cyclus::Facility::InfileToDb(qe, di); - qe = qe->SubTree("agent/*"); + qe = qe->SubTree("config/*"); using cyclus::toolkit::Commodity; using cyclus::toolkit::CommodityProducer; diff --git a/src/deploy_inst.cc b/src/deploy_inst.cc index 38eb9b3d9d..64a21164d1 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/*"); + qe = qe->SubTree("config/*"); int nOrders = qe->NMatches("buildorder"); for (int i = 0; i < nOrders; i++) { From 336262ed5bcadf0093988aa6925267068d9aa4a9 Mon Sep 17 00:00:00 2001 From: Robert Carlsen Date: Wed, 28 May 2014 15:06:02 -0500 Subject: [PATCH 18/18] fix physor input file with old archetype tag renamed to name in sed --- input/physor/2_Sources_3_Reactors.xml | 2 -- 1 file changed, 2 deletions(-) diff --git a/input/physor/2_Sources_3_Reactors.xml b/input/physor/2_Sources_3_Reactors.xml index 7383453005..197d7c4230 100755 --- a/input/physor/2_Sources_3_Reactors.xml +++ b/input/physor/2_Sources_3_Reactors.xml @@ -28,7 +28,6 @@ UOX_Source - Source uox @@ -136,7 +135,6 @@ Reactor3 - BatchReactor