Skip to content

Commit

Permalink
Merge branch 'travis-merge' of github.com:gidden/cycamore into travis…
Browse files Browse the repository at this point in the history
…-merge
  • Loading branch information
gidden committed Apr 24, 2015
2 parents 3158b7c + 321d900 commit 5e2bade
Show file tree
Hide file tree
Showing 7 changed files with 837 additions and 1 deletion.
3 changes: 2 additions & 1 deletion .gitignore
Original file line number Diff line number Diff line change
Expand Up @@ -8,4 +8,5 @@ suffix.h
*.pyc
rs.cred
*.h5
tests/run_inputs.py
*.dat
tests/run_inputs.py
183 changes: 183 additions & 0 deletions input/recycle.xml
Original file line number Diff line number Diff line change
@@ -0,0 +1,183 @@
<simulation>
<schematype>flat</schematype>
<control>
<duration>600</duration>
<startmonth>1</startmonth>
<startyear>2000</startyear>
</control>

<archetypes>
<spec> <lib>cycamore</lib> <name>Source</name></spec>
<spec> <lib>cycamore</lib> <name>Sink</name></spec>
<spec> <lib>cycamore</lib> <name>Enrichment</name> </spec>
<spec> <lib>cycamore</lib> <name>Reactor</name> </spec>
<spec> <lib>cycamore</lib> <name>FuelFab</name> </spec>
<spec> <lib>cycamore</lib> <name>Separations</name> </spec>
</archetypes>

<prototype>
<name>enrichment</name>
<config>
<Enrichment>
<feed_commod>natl_u</feed_commod>
<feed_recipe>natl_u</feed_recipe>
<product_commod>uox</product_commod>
<tails_assay>0.003</tails_assay>
<tails_commod>waste</tails_commod>
<swu_capacity>1e100</swu_capacity>
<initial_feed>1e100</initial_feed>
</Enrichment>
</config>
</prototype>

<prototype>
<name>separations</name>
<config>
<Separations>
<streams>
<commod>sep_stream</commod>
<info>
<buf_size>1e100</buf_size>
<efficiencies>
<comp>Pu</comp> <eff>.99</eff>
</efficiencies>
</info>
</streams>

<leftover_commod>waste</leftover_commod>
<throughput>30001</throughput>
<feedbuf_size>30001</feedbuf_size>
<feed_commods> <val>spent_uox</val> </feed_commods>
<feed_commod_prefs> <val>2.0</val> </feed_commod_prefs>
</Separations>
</config>
</prototype>

<prototype>
<name>fuelfab</name>
<config>
<FuelFab>
<fill_commod>depleted_u</fill_commod>
<fill_recipe>depleted_u</fill_recipe>
<fill_size>30001</fill_size>

<fiss_commods><val>sep_stream</val></fiss_commods>
<fiss_size>15000</fiss_size>

<spectrum>thermal</spectrum>
<outcommod>mox</outcommod>
<throughput>30001</throughput>
</FuelFab>
</config>
</prototype>

<prototype>
<name>reactor</name>
<config>
<Reactor>
<fuel_inrecipes> <val>fresh_uox</val> <val>fresh_mox</val></fuel_inrecipes>
<fuel_outrecipes> <val>spent_uox</val> <val>spent_mox</val></fuel_outrecipes>
<fuel_incommods> <val>uox</val> <val>mox</val></fuel_incommods>
<fuel_outcommods> <val>spent_uox</val> <val>waste</val></fuel_outcommods>
<fuel_prefs> <val>1.0</val> <val>2.0</val></fuel_prefs>

<cycle_time>17</cycle_time>
<refuel_time>2</refuel_time>
<assem_size>30000</assem_size>
<n_assem_core>3</n_assem_core>
<n_assem_batch>1</n_assem_batch>
</Reactor>
</config>
</prototype>

<prototype>
<name>repo</name>
<config>
<Sink>
<in_commods><val>waste</val></in_commods>
<capacity>1e100</capacity>
</Sink>
</config>
</prototype>

<prototype>
<name>depleted_src</name>
<config>
<Source>
<outcommod>depleted_u</outcommod>
<outrecipe>depleted_u</outrecipe>
</Source>
</config>
</prototype>

<agent> <name>repo1</name> <prototype>repo</prototype> </agent>
<agent> <name>r1</name> <prototype>reactor</prototype> </agent>
<agent> <name>depleted1</name> <prototype>depleted_src</prototype> </agent>
<agent> <name>fab1</name> <prototype>fuelfab</prototype> </agent>
<agent> <name>sep1</name> <prototype>separations</prototype> </agent>
<agent> <name>enrich1</name> <prototype>enrichment</prototype> </agent>

<recipe>
<name>natl_u</name>
<basis>mass</basis>
<nuclide> <id>U235</id> <comp>0.711</comp> </nuclide>
<nuclide> <id>U238</id> <comp>99.289</comp> </nuclide>
</recipe>

<recipe>
<name>fresh_uox</name>
<basis>mass</basis>
<nuclide> <id>U235</id><comp>0.04</comp></nuclide>
<nuclide><id>U238</id><comp>0.96</comp></nuclide>
</recipe>

<recipe>
<name>depleted_u</name>
<basis>mass</basis>
<nuclide> <id>U235</id><comp>0.003</comp></nuclide>
<nuclide><id>U238</id><comp>0.997</comp></nuclide>
</recipe>

<recipe>
<name>fresh_mox</name>
<basis>mass</basis>
<nuclide> <id>U235</id> <comp>0.0027381</comp> </nuclide>
<nuclide> <id>U238</id> <comp>0.9099619</comp> </nuclide>
<nuclide> <id>Pu238</id> <comp>0.001746</comp> </nuclide>
<nuclide> <id>Pu239</id> <comp>0.045396</comp> </nuclide>
<nuclide> <id>Pu240</id> <comp>0.020952</comp> </nuclide>
<nuclide> <id>Pu241</id> <comp>0.013095</comp> </nuclide>
<nuclide> <id>Pu242</id> <comp>0.005238</comp> </nuclide>
</recipe>

<recipe>
<name>spent_mox</name>
<basis>mass</basis>
<nuclide> <id>U235</id> <comp>0.0017381</comp> </nuclide>
<nuclide> <id>U238</id> <comp>0.90</comp> </nuclide>
<nuclide> <id>Pu238</id> <comp>0.001746</comp> </nuclide>
<nuclide> <id>Pu239</id> <comp>0.0134</comp> </nuclide>
<nuclide> <id>Pu240</id> <comp>0.020952</comp> </nuclide>
<nuclide> <id>Pu241</id> <comp>0.013095</comp> </nuclide>
<nuclide> <id>Pu242</id> <comp>0.005238</comp> </nuclide>
</recipe>

<recipe>
<name>spent_uox</name>
<basis>mass</basis>
<nuclide> <id>U235</id> <comp>156.729</comp> </nuclide>
<nuclide> <id>U236</id> <comp>102.103</comp> </nuclide>
<nuclide> <id>U238</id> <comp>18280.324</comp> </nuclide>
<nuclide> <id>Np237</id> <comp>13.656</comp> </nuclide>
<nuclide> <id>Pu238</id> <comp>5.043</comp> </nuclide>
<nuclide> <id>Pu239</id> <comp>106.343</comp> </nuclide>
<nuclide> <id>Pu240</id> <comp>41.357</comp> </nuclide>
<nuclide> <id>Pu241</id> <comp>36.477</comp> </nuclide>
<nuclide> <id>Pu242</id> <comp>15.387</comp> </nuclide>
<nuclide> <id>Am241</id> <comp>1.234</comp> </nuclide>
<nuclide> <id>Am243</id> <comp>3.607</comp> </nuclide>
<nuclide> <id>Cm244</id> <comp>0.431</comp> </nuclide>
<nuclide> <id>Cm245</id> <comp>1.263</comp> </nuclide>
</recipe>

</simulation>
2 changes: 2 additions & 0 deletions src/CMakeLists.txt
Original file line number Diff line number Diff line change
Expand Up @@ -6,6 +6,8 @@ USE_CYCLUS("cycamore" "fuel_fab")

USE_CYCLUS("cycamore" "enrichment_facility")

USE_CYCLUS("cycamore" "separations")

USE_CYCLUS("cycamore" "sink")

USE_CYCLUS("cycamore" "source")
Expand Down
Loading

0 comments on commit 5e2bade

Please sign in to comment.