Skip to content

Commit

Permalink
Merge branch 'rm-schema' into develop
Browse files Browse the repository at this point in the history
  • Loading branch information
@scopatz
scopatz committed May 28, 2014
2 parents d3ed0f8 + 336262e commit 838c6e3
Show file tree
Hide file tree
Showing 23 changed files with 432 additions and 774 deletions.
72 changes: 30 additions & 42 deletions input/batch_reactor/batch_rxtr_2_cycles.xml
View file
Original file line number Diff line number Diff line change
@@ -1,4 +1,3 @@
<?xml version="1.0"?>
<!-- This input file is used to verify the INPRO reactor agent for two cycles.
The event list is as follows, based on simulation time:
0 - enter simulation, order core, fill core
Expand All @@ -17,37 +16,44 @@
<startyear>2000</startyear>
</control>

<commodity>
<name>enriched_u</name>
</commodity>

<commodity>
<name>waste</name>
</commodity>
<archetypes>
<spec>
<lib>cycamore</lib>
<name>Source</name>
</spec>
<spec>
<lib>cycamore</lib>
<name>BatchReactor</name>
</spec>
<spec>
<lib>cycamore</lib>
<name>Sink</name>
</spec>
<spec>
<lib>agents</lib>
<name>NullRegion</name>
</spec>
<spec>
<lib>agents</lib>
<name>NullInst</name>
</spec>
</archetypes>

<facility>
<name>Source</name>
<module>
<lib>cycamore</lib>
<agent>Source</agent>
</module>
<agent>
<config>
<Source>
<out_commod>enriched_u</out_commod>
<capacity>1.0e10</capacity>
<recipe_name>lwr_fuel_recipe</recipe_name>
</Source>
</agent>
</config>
</facility>

<facility>
<name>LWR_Reactor</name>
<module>
<lib>cycamore</lib>
<agent>BatchReactor</agent>
</module>
<lifetime>26</lifetime>
<agent>
<config>
<BatchReactor>
<fuel>
<incommodity>enriched_u</incommodity>
Expand All @@ -65,44 +71,26 @@
<cost>1000</cost>
</commodity_production>
</BatchReactor>
</agent>
</config>
</facility>

<facility>
<name>Sink</name>
<module>
<lib>cycamore</lib>
<agent>Sink</agent>
</module>
<agent>
<config>
<Sink>
<in_commods>
<val>waste</val>
</in_commods>
<capacity>1.0e10</capacity>
</Sink>
</agent>
</config>
</facility>

<region>
<name>SingleRegion</name>
<module>
<lib>agents</lib>
<agent>NullRegion</agent>
</module>
<allowedfacility>Source</allowedfacility>
<allowedfacility>LWR_Reactor</allowedfacility>
<allowedfacility>Sink</allowedfacility>
<agent><NullRegion/></agent>
<config><NullRegion/></config>
<institution>
<name>SingleInstitution</name>
<module>
<lib>agents</lib>
<agent>NullInst</agent>
</module>
<availableprototype>Source</availableprototype>
<availableprototype>LWR_Reactor</availableprototype>
<availableprototype>Sink</availableprototype>
<initialfacilitylist>
<entry>
<prototype>Source</prototype>
Expand All @@ -117,7 +105,7 @@
<number>1</number>
</entry>
</initialfacilitylist>
<agent><NullInst/></agent>
<config><NullInst/></config>
</institution>
</region>

Expand Down
72 changes: 30 additions & 42 deletions input/batch_reactor/batch_rxtr_lifetime.xml
View file
Original file line number Diff line number Diff line change
@@ -1,4 +1,3 @@
<?xml version="1.0"?>
<!-- This input file is used to verify the INPRO reactor agent behaves
reasonably for its lifetime. -->

Expand All @@ -9,37 +8,44 @@ reasonably for its lifetime. -->
<startyear>2000</startyear>
</control>

<commodity>
<name>enriched_u</name>
</commodity>

<commodity>
<name>waste</name>
</commodity>
<archetypes>
<spec>
<lib>cycamore</lib>
<name>Source</name>
</spec>
<spec>
<lib>cycamore</lib>
<name>BatchReactor</name>
</spec>
<spec>
<lib>agents</lib>
<name>NullRegion</name>
</spec>
<spec>
<lib>agents</lib>
<name>NullInst</name>
</spec>
<spec>
<lib>cycamore</lib>
<name>Sink</name>
</spec>
</archetypes>

<facility>
<name>Source</name>
<module>
<lib>cycamore</lib>
<agent>Source</agent>
</module>
<agent>
<config>
<Source>
<out_commod>enriched_u</out_commod>
<capacity>1.0e10</capacity>
<recipe_name>lwr_fuel_recipe</recipe_name>
</Source>
</agent>
</config>
</facility>

<facility>
<name>LWR_Reactor</name>
<module>
<lib>cycamore</lib>
<agent>BatchReactor</agent>
</module>
<lifetime>480</lifetime>
<agent>
<config>
<BatchReactor>
<fuel>
<incommodity>enriched_u</incommodity>
Expand All @@ -57,44 +63,26 @@ reasonably for its lifetime. -->
<cost>1000</cost>
</commodity_production>
</BatchReactor>
</agent>
</config>
</facility>

<facility>
<name>Sink</name>
<module>
<lib>cycamore</lib>
<agent>Sink</agent>
</module>
<agent>
<config>
<Sink>
<in_commods>
<val>waste</val>
</in_commods>
<capacity>1.0e10</capacity>
</Sink>
</agent>
</config>
</facility>

<region>
<name>SingleRegion</name>
<module>
<lib>agents</lib>
<agent>NullRegion</agent>
</module>
<allowedfacility>Source</allowedfacility>
<allowedfacility>LWR_Reactor</allowedfacility>
<allowedfacility>Sink</allowedfacility>
<agent><NullRegion/></agent>
<config><NullRegion/></config>
<institution>
<name>SingleInstitution</name>
<module>
<lib>agents</lib>
<agent>NullInst</agent>
</module>
<availableprototype>Source</availableprototype>
<availableprototype>LWR_Reactor</availableprototype>
<availableprototype>Sink</availableprototype>
<initialfacilitylist>
<entry>
<prototype>Source</prototype>
Expand All @@ -109,7 +97,7 @@ reasonably for its lifetime. -->
<number>1</number>
</entry>
</initialfacilitylist>
<agent><NullInst/></agent>
<config><NullInst/></config>
</institution>
</region>

Expand Down
80 changes: 30 additions & 50 deletions input/batch_reactor/hwr.xml
View file
Original file line number Diff line number Diff line change
@@ -1,4 +1,3 @@
<?xml version="1.0"?>
<!-- 1 Source Source, 1 Sink Sink -->

<simulation>
Expand All @@ -8,40 +7,43 @@
<startyear>2007</startyear>
</control>

<commodity>
<name>natl_u</name>
</commodity>

<commodity>
<name>enriched_u</name>
</commodity>

<commodity>
<name>waste</name>
</commodity>
<archetypes>
<spec>
<lib>cycamore</lib>
<name>Source</name>
</spec>
<spec>
<lib>cycamore</lib>
<name>BatchReactor</name>
</spec>
<spec>
<lib>cycamore</lib>
<name>Sink</name>
</spec>
<spec>
<lib>agents</lib>
<name>NullRegion</name>
</spec>
<spec>
<lib>agents</lib>
<name>NullInst</name>
</spec>
</archetypes>

<facility>
<name>Source</name>
<module>
<lib>cycamore</lib>
<agent>Source</agent>
</module>
<agent>
<config>
<Source>
<out_commod>enriched_u</out_commod>
<recipe_name>natl_u</recipe_name>
</Source>
</agent>
</config>
</facility>

<facility>
<name>HW_Reactor</name>
<module>
<lib>cycamore</lib>
<agent>BatchReactor</agent>
</module>
<lifetime>480</lifetime>
<agent>
<config>
<BatchReactor>
<fuel>
<incommodity>enriched_u</incommodity>
Expand All @@ -59,47 +61,25 @@
<cost>600</cost>
</commodity_production>
</BatchReactor>
</agent>
</config>
</facility>

<facility>
<name>Sink</name>
<module>
<lib>cycamore</lib>
<agent>Sink</agent>
</module>
<agent>
<config>
<Sink>
<in_commods>
<val>waste</val>
</in_commods>
</Sink>
</agent>
</config>
</facility>

<region>
<name>SingleRegion</name>
<module>
<lib>agents</lib>
<agent>NullRegion</agent>
</module>
<allowedfacility>Source</allowedfacility>
<allowedfacility>Enrichment</allowedfacility>
<allowedfacility>LWR_Reactor</allowedfacility>
<allowedfacility>HW_Reactor</allowedfacility>
<allowedfacility>Sink</allowedfacility>
<agent><NullRegion/></agent>
<config><NullRegion/></config>
<institution>
<name>SingleInstitution</name>
<module>
<lib>agents</lib>
<agent>NullInst</agent>
</module>
<availableprototype>Source</availableprototype>
<availableprototype>Enrichment</availableprototype>
<availableprototype>LWR_Reactor</availableprototype>
<availableprototype>HW_Reactor</availableprototype>
<availableprototype>Sink</availableprototype>
<initialfacilitylist>
<entry>
<prototype>Source</prototype>
Expand All @@ -114,7 +94,7 @@
<number>1</number>
</entry>
</initialfacilitylist>
<agent><NullInst/></agent>
<config><NullInst/></config>
</institution>
</region>

Expand Down
Loading

0 comments on commit 838c6e3

Please sign in to comment.