Merge branch 'nmchng' of https://github.com/gidden/cycamore into gidd…

…en-nmchng
cyclus · May 26, 2014 · d5a140a · d5a140a
2 parents b6ce975 + ecc302b
commit d5a140a
Show file tree

Hide file tree

Showing 29 changed files with 257 additions and 257 deletions.
diff --git a/input/batch_reactor/batch_rxtr_2_cycles.xml b/input/batch_reactor/batch_rxtr_2_cycles.xml
@@ -29,14 +29,14 @@
     <name>Source</name>
     <module>
       <lib>cycamore</lib>
-      <agent>SourceFacility</agent>
+      <agent>Source</agent>
     </module>
     <agent>
-      <SourceFacility>
+      <Source>
         <out_commod>enriched_u</out_commod>
         <capacity>1.0e10</capacity>
         <recipe_name>lwr_fuel_recipe</recipe_name>
-      </SourceFacility>
+      </Source>
     </agent>
   </facility>
 
@@ -72,15 +72,15 @@
     <name>Sink</name>
     <module>
       <lib>cycamore</lib>
-      <agent>SinkFacility</agent>
+      <agent>Sink</agent>
     </module>
     <agent>
-      <SinkFacility>
+      <Sink>
         <in_commods>
           <val>waste</val>
         </in_commods>
         <capacity>1.0e10</capacity>
-      </SinkFacility>
+      </Sink>
     </agent>
   </facility>
 

diff --git a/input/batch_reactor/batch_rxtr_lifetime.xml b/input/batch_reactor/batch_rxtr_lifetime.xml
@@ -21,14 +21,14 @@ reasonably for its lifetime. -->
     <name>Source</name>
     <module>
       <lib>cycamore</lib>
-      <agent>SourceFacility</agent>
+      <agent>Source</agent>
     </module>
     <agent>
-      <SourceFacility>
+      <Source>
         <out_commod>enriched_u</out_commod>
         <capacity>1.0e10</capacity>
         <recipe_name>lwr_fuel_recipe</recipe_name>
-      </SourceFacility>
+      </Source>
     </agent>
   </facility>
 
@@ -64,15 +64,15 @@ reasonably for its lifetime. -->
     <name>Sink</name>
     <module>
       <lib>cycamore</lib>
-      <agent>SinkFacility</agent>
+      <agent>Sink</agent>
     </module>
     <agent>
-      <SinkFacility>
+      <Sink>
         <in_commods>
           <val>waste</val>
         </in_commods>
         <capacity>1.0e10</capacity>
-      </SinkFacility>
+      </Sink>
     </agent>
   </facility>
 

diff --git a/input/batch_reactor/hwr.xml b/input/batch_reactor/hwr.xml
@@ -1,5 +1,5 @@
 <?xml version="1.0"?>
-<!-- 1 SourceFacility Source, 1 SinkFacility Sink -->
+<!-- 1 Source Source, 1 Sink Sink -->
 
 <simulation>
   <control>
@@ -24,13 +24,13 @@
     <name>Source</name>
     <module>
       <lib>cycamore</lib>
-      <agent>SourceFacility</agent>
+      <agent>Source</agent>
     </module>
     <agent>
-      <SourceFacility>
+      <Source>
         <out_commod>enriched_u</out_commod>
         <recipe_name>natl_u</recipe_name>
-      </SourceFacility>
+      </Source>
     </agent>
   </facility>
 
@@ -66,14 +66,14 @@
     <name>Sink</name>
     <module>
       <lib>cycamore</lib>
-      <agent>SinkFacility</agent>
+      <agent>Sink</agent>
     </module>
     <agent>
-      <SinkFacility>
+      <Sink>
         <in_commods>
           <val>waste</val>
         </in_commods>
-      </SinkFacility>
+      </Sink>
     </agent>
   </facility>
 

diff --git a/input/batch_reactor/lwr.xml b/input/batch_reactor/lwr.xml
@@ -1,5 +1,5 @@
 <?xml version="1.0"?>
-<!-- 1 SourceFacility Source, 1 SinkFacility Sink -->
+<!-- 1 Source Source, 1 Sink Sink -->
 
 <simulation>
   <control>
@@ -24,13 +24,13 @@
     <name>Source</name>
     <module>
       <lib>cycamore</lib>
-      <agent>SourceFacility</agent>
+      <agent>Source</agent>
     </module>
     <agent>
-      <SourceFacility>
+      <Source>
         <out_commod>enriched_u</out_commod>
         <recipe_name>lwr_fuel_recipe</recipe_name>
-      </SourceFacility>
+      </Source>
     </agent>
   </facility>
 
@@ -66,14 +66,14 @@
     <name>Sink</name>
     <module>
       <lib>cycamore</lib>
-      <agent>SinkFacility</agent>
+      <agent>Sink</agent>
     </module>
     <agent>
-      <SinkFacility>
+      <Sink>
         <in_commods>
           <val>waste</val>
         </in_commods>
-      </SinkFacility>
+      </Sink>
     </agent>
   </facility>
 

diff --git a/input/batch_reactor/preferences.xml b/input/batch_reactor/preferences.xml
@@ -24,14 +24,14 @@ commodity. -->
     <name>Source</name>
     <module>
       <lib>cycamore</lib>
-      <agent>SourceFacility</agent>
+      <agent>Source</agent>
     </module>
     <agent>
-      <SourceFacility>
+      <Source>
         <out_commod>used_commodity</out_commod>
         <capacity>1</capacity>
         <recipe_name>commod_recipe</recipe_name>
-      </SourceFacility>
+      </Source>
     </agent>
   </facility>
 
@@ -69,16 +69,16 @@ commodity. -->
     <name>Sink</name>
     <module>
       <lib>cycamore</lib>
-      <agent>SinkFacility</agent>
+      <agent>Sink</agent>
     </module>
     <agent>
-      <SinkFacility>
+      <Sink>
         <in_commods>
           <val>used_commodity</val>
           <val>processed_commodity</val>
         </in_commods>
         <capacity>2</capacity>
-      </SinkFacility>
+      </Sink>
     </agent>
   </facility>
 

diff --git a/input/enrichment/1_src_enr_rxtr_sink.xml b/input/enrichment/1_src_enr_rxtr_sink.xml
@@ -1,5 +1,5 @@
 <?xml version="1.0"?>
-<!-- 1 SourceFacility Source, 1 SinkFacility Sink -->
+<!-- 1 Source Source, 1 Sink Sink -->
 
 <simulation>
   <control>
@@ -24,14 +24,14 @@
     <name>Source</name>
     <module>
       <lib>cycamore</lib>
-      <agent>SourceFacility</agent>
+      <agent>Source</agent>
     </module>
     <agent>
-      <SourceFacility>
+      <Source>
         <out_commod>natl_u</out_commod>
         <capacity>1000</capacity>
         <recipe_name>natl_u</recipe_name>
-      </SourceFacility>
+      </Source>
     </agent>
   </facility>
 
@@ -82,15 +82,15 @@
     <name>Sink</name>
     <module>
       <lib>cycamore</lib>
-      <agent>SinkFacility</agent>
+      <agent>Sink</agent>
     </module>
     <agent>
-      <SinkFacility>
+      <Sink>
         <in_commods>
           <val>waste</val>
         </in_commods>
         <capacity>1</capacity>
-      </SinkFacility>
+      </Sink>
     </agent>
   </facility>
 

diff --git a/input/enrichment/linear_src_enr_rxtr_sink.xml b/input/enrichment/linear_src_enr_rxtr_sink.xml
@@ -1,5 +1,5 @@
 <?xml version="1.0"?>
-<!-- 1 SourceFacility Source, 1 SinkFacility Sink -->
+<!-- 1 Source Source, 1 Sink Sink -->
 
 <simulation>
   <control>
@@ -23,15 +23,15 @@
   <facility>
     <name>Source</name>
     <module>
-      <path>SourceFacility</path>
-      <agent>SourceFacility</agent>
+      <path>Source</path>
+      <agent>Source</agent>
     </module>
     <agent>
-      <SourceFacility>
+      <Source>
         <out_commod>natl_u</out_commod>
         <capacity>1000</capacity>
         <recipe_name>natl_u</recipe_name>
-      </SourceFacility>
+      </Source>
     </agent>
   </facility>
 
@@ -81,16 +81,16 @@
   <facility>
     <name>Sink</name>
     <module>
-      <path>SinkFacility</path>
-      <agent>SinkFacility</agent>
+      <path>Sink</path>
+      <agent>Sink</agent>
     </module>
     <agent>
-      <SinkFacility>
+      <Sink>
         <in_commods>
           <val>waste</val>
         </in_commods>
         <capacity>1000</capacity>
-      </SinkFacility>
+      </Sink>
     </agent>
   </facility>
 

diff --git a/input/enrichment/natu_capacitated.xml b/input/enrichment/natu_capacitated.xml
@@ -1,5 +1,5 @@
 <?xml version="1.0"?>
-<!-- 1 SourceFacility Source, 1 SinkFacility Sink -->
+<!-- 1 Source Source, 1 Sink Sink -->
 
 <simulation>
   <control>
@@ -23,15 +23,15 @@
   <facility>
     <name>Source</name>
     <module>
-      <path>SourceFacility</path>
-      <agent>SourceFacility</agent>
+      <path>Source</path>
+      <agent>Source</agent>
     </module>
     <agent>
-      <SourceFacility>
+      <Source>
         <out_commod>natl_u</out_commod>
         <capacity>1000</capacity>
         <recipe_name>natl_u</recipe_name>
-      </SourceFacility>
+      </Source>
     </agent>
   </facility>
 
@@ -81,16 +81,16 @@
   <facility>
     <name>Sink</name>
     <module>
-      <path>SinkFacility</path>
-      <agent>SinkFacility</agent>
+      <path>Sink</path>
+      <agent>Sink</agent>
     </module>
     <agent>
-      <SinkFacility>
+      <Sink>
         <in_commods>
           <val>waste</val>
         </in_commods>
         <capacity>1000</capacity>
-      </SinkFacility>
+      </Sink>
     </agent>
   </facility>
 

diff --git a/input/enrichment/swu_capacitated.xml b/input/enrichment/swu_capacitated.xml
@@ -1,5 +1,5 @@
 <?xml version="1.0"?>
-<!-- 1 SourceFacility Source, 1 SinkFacility Sink -->
+<!-- 1 Source Source, 1 Sink Sink -->
 
 <simulation>
   <control>
@@ -27,11 +27,11 @@
       <agent>EnrichmentFacility</agent>
     </module>
     <agent>
-      <SourceFacility>
+      <Source>
         <out_commod>natl_u</out_commod>
         <capacity>1000</capacity>
         <recipe_name>natl_u</recipe_name>
-      </SourceFacility>
+      </Source>
     </agent>
   </facility>
 
@@ -82,16 +82,16 @@
   <facility>
     <name>Sink</name>
     <module>
-      <path>SinkFacility</path>
-      <agent>SinkFacility</agent>
+      <path>Sink</path>
+      <agent>Sink</agent>
     </module>
     <agent>
-      <SinkFacility>
+      <Sink>
           <in_commods>
             <val>waste</val>
           </in_commods>
           <capacity>1000</capacity>
-      </SinkFacility>
+      </Sink>
     </agent>
   </facility>