diff --git a/source/user/tutorial/add_commod_recipe.rst b/source/user/tutorial/add_commod_recipe.rst index 9c27a33b..de72ef75 100644 --- a/source/user/tutorial/add_commod_recipe.rst +++ b/source/user/tutorial/add_commod_recipe.rst @@ -48,15 +48,15 @@ and provides two bids accordingly. Activity: Create fuel commodities (optional) +++++++++++++++++++++++++++++++++++++++++++++++++++++ -Let's build ``u-ore``, ``fresh-uox``, ``spent-uox``, and ``tails``, +Let's build ``u_ore``, ``fresh_uox``, ``spent_uox``, and ``tails``, the four commodities available for trade in our simulation. Note that this part is **optional**, and is only needed if the user wants to specify the solution priority of each commodity. -* ``u-ore`` : natural uranium that is mined +* ``u_ore`` : natural uranium that is mined * ``tails`` : waste from the enrichment process -* ``fresh-uox``: fresh 4.0% enriched Uranium Oxide fuel that enters the reactor -* ``spent-uox``: spent uranium oxide fuel that leaves the reactor after depletion +* ``fresh_uox``: fresh 4.0% enriched Uranium Oxide fuel that enters the reactor +* ``spent_uox``: spent uranium oxide fuel that leaves the reactor after depletion When |Cyclus| needs to know the isotopic composition of a material, it looks at the recipe for that @@ -93,7 +93,7 @@ where: * solution priority: number defining the relative priority for resolution in the dynamic resource exchange. - We will model four commodities: u-ore, fresh-uox, spent-uox, and tails. + We will model four commodities: u_ore, fresh_uox, spent_uox, and tails. Activity: Building commodities @@ -105,22 +105,22 @@ template. +-------------+-------------+---------------------+ | Commodity | Name | Solution Priority | +=============+=============+=====================+ -| com1 | u-ore | 1.0 | +| com1 | u_ore | 1.0 | +-------------+-------------+---------------------+ -| com2 | fresh-uox | 1.0 | +| com2 | fresh_uox | 1.0 | +-------------+-------------+---------------------+ -| com3 | spent-uox | 1.0 | +| com3 | spent_uox | 1.0 | +-------------+-------------+---------------------+ | com4 | tails | 1.0 | +-------------+-------------+---------------------+ -1. Let's start with ``u-ore``. In the ```` line replace ``com1`` with ``u-ore`` +1. Let's start with ``u_ore``. In the ```` line replace ``com1`` with ``u_ore`` inside a ``commodity`` block. .. code-block:: XML - u-ore + u_ore 2. In the ```` section replace ``val1`` with ``1.0``. @@ -129,7 +129,7 @@ inside a ``commodity`` block. - u-ore + u_ore 1.0 @@ -140,11 +140,11 @@ inside a ``commodity`` block. .. code-block:: XML - u-ore + u_ore 1.0 - fresh-uox + fresh_uox 1.0 @@ -152,7 +152,7 @@ inside a ``commodity`` block. 1.0 - spent-uox + spent_uox 1.0 @@ -167,14 +167,14 @@ Concept: Recipes Most commodities are materials, which have a quantity and an isotopic composition. Recipes are the isotopic composition of a certain material. For -example, u-ore has an isotropic composition of 0.711% :math:`^{235}`\ U and +example, u_ore has an isotropic composition of 0.711% :math:`^{235}`\ U and 99.284% :math:`^{238}`\ U. The recipe section of a |Cyclus| input file is typically located at the end of the input and is of the form: .. code-block:: XML - nat-u + nat_u mass 92235 @@ -252,7 +252,7 @@ block to signify that this is a recipe and tab in and place the fill .. code-block:: XML - nat-u + nat_u 2. To signify that the composition of this recipe is in terms of Mass, fill the @@ -261,7 +261,7 @@ block to signify that this is a recipe and tab in and place the fill .. code-block:: XML - nat-u + nat_u mass @@ -271,7 +271,7 @@ block to signify that this is a recipe and tab in and place the fill .. code-block:: XML - nat-u + nat_u mass id1 @@ -285,7 +285,7 @@ fill the composition tag with its mass composition, ``0.00711``. .. code-block:: XML - nat-u + nat_u mass 92235 @@ -298,7 +298,7 @@ fill the composition tag with its mass composition, ``0.00711``. .. code-block:: XML - nat-u + nat_u mass 92235 @@ -316,7 +316,7 @@ The recipe section of this tutorial is placed below. .. code-block:: XML - nat-u + nat_u mass 92235 @@ -329,7 +329,7 @@ The recipe section of this tutorial is placed below. - fresh-uox + fresh_uox mass 92235 @@ -342,7 +342,7 @@ The recipe section of this tutorial is placed below. - spent-uox + spent_uox mass 92235 @@ -365,13 +365,14 @@ The recipe section of this tutorial is placed below. Once complete, append this facility under the commodity section of your input file [#f1]_. -Let's take a look at the ``fresh-uox`` fuel recipe: +Let's take a look at the ``fresh_uox`` fuel recipe (note that ``-`` is an illegal character for +names in cyclus and ``_`` should be used instead): .. image:: fuel_com.png :align: center - :alt: Fuel recipe for fresh-uox -The recipe name ``fresh-uox`` is specified, as are the isotope nuclide IDs and the -corresponding mass fraction of each nuclide. The ``fresh-uox`` is composed of 4% U-235 and 96% U-238. + :alt: Fuel recipe for fresh_uox +The recipe name ``fresh_uox`` is specified, as are the isotope nuclide IDs and the +corresponding mass fraction of each nuclide. The ``fresh_uox`` is composed of 4% U-235 and 96% U-238. .. rubric:: Footnotes .. [#f1] The exact order of the sections in a |Cyclus| input file are of minor consequence. The ``control`` sequence must go first, but the other sequences can go in any order that makes sense to the user. The traditional organization of an input file is: control, archetypes, commodities, facilities, regions/institutions, and recipes. diff --git a/source/user/tutorial/add_deploy.rst b/source/user/tutorial/add_deploy.rst index 1c0c24b4..b24f9de5 100644 --- a/source/user/tutorial/add_deploy.rst +++ b/source/user/tutorial/add_deploy.rst @@ -83,9 +83,9 @@ template. +-------------+-------------+---------------------+ | FuelFab | 1 | 1 | +-------------+-------------+---------------------+ -| 1178MWe BRAIDWOOD-1 | 2 | 1 | +| 1178MWe BRAIDWOOD_1 | 2 | 1 | +-------------+-------------+---------------------+ -| 1000MWe Lightwater-1 | 3 | 1 | +| 1000MWe LIGHTWATER_1 | 3 | 1 | +-------------+-------------+---------------------+ Using the prototype facilities already created, the new institution should @@ -100,8 +100,8 @@ look like the following: UraniumMine FuelFab - 1178MWe BRAIDWOOD-1 - 1000We Lightwater-1 + 1178MWe BRAIDWOOD_1 + 1000We LIGHTWATER_1 @@ -122,8 +122,8 @@ look like the following: The above institution will create 1 ``UraniumMine`` and 1 ``FuelFab`` facility on -time step 1. The next time step will deploy the ``1178MWe BRAIDWOOD-1`` reactor -prototype. And finally, at time step 3, the ``1000We Lightwater-1`` will be deployed. +time step 1. The next time step will deploy the ``1178MWe BRAIDWOOD_1`` reactor +prototype. And finally, at time step 3, the ``1000We LIGHTWATER_1`` will be deployed. This institution block goes inside the Region block, with the previously created insitutions blocks. diff --git a/source/user/tutorial/add_fab.rst b/source/user/tutorial/add_fab.rst index e24a363f..4775a696 100644 --- a/source/user/tutorial/add_fab.rst +++ b/source/user/tutorial/add_fab.rst @@ -39,12 +39,12 @@ The following configuration will be for a MOX fuel fabrication plant that mixes separated plutonium and natural uranium into MOX fuel: -* Filler stream commodity: ``u-ore`` -* Filler stream recipe: ``nat-u`` +* Filler stream commodity: ``u_ore`` +* Filler stream recipe: ``nat_u`` * Filler stream inventory capacity: 1000 tonnes -* Fissile stream commodity: Separated-Fissile +* Fissile stream commodity: Separated_Fissile * Fissile stream inventory capacity: 5 tonnes -* Output Commodity: Fresh-MOX-Fuel +* Output Commodity: Fresh_MOX_Fuel * Maximum Throughput: 2 tonnes/timestep * Specturm type: "thermal" @@ -56,13 +56,13 @@ Filling in the template, the input block looks like: FuelFab - U-ore - Nat-U + u_ore + nat_u 1000000 - Separated-Fissile + Separated_Fissile 5000 thermal - Fresh-MOX-Fuel + Fresh_MOX_Fuel 2000 diff --git a/source/user/tutorial/add_proto.rst b/source/user/tutorial/add_proto.rst index e7069ede..6ad8b97c 100644 --- a/source/user/tutorial/add_proto.rst +++ b/source/user/tutorial/add_proto.rst @@ -93,7 +93,7 @@ Archetype and the table below, create the UraniumMine prototype. +-----------------------+---------------------------+ | ``Archetype`` | ``Source`` | +-----------------------+---------------------------+ -| ``out_commod`` | ``u-ore`` | +| ``out_commod`` | ``u_ore`` | +-----------------------+---------------------------+ 1. The template for the Source archetype is of the form: @@ -110,7 +110,7 @@ Archetype and the table below, create the UraniumMine prototype. 2. Filling in the variables ``name``, ``Archetype``, and ``out_commod`` as -``UraniumMine``, ``Source``, and ``fresh-uox`` leads to: +``UraniumMine``, ``Source``, and ``fresh_uox`` leads to: .. code-block:: XML @@ -118,7 +118,7 @@ Archetype and the table below, create the UraniumMine prototype. UraniumMine - u-ore + u_ore @@ -154,7 +154,7 @@ max_feed_inventory: default = 1e+299, range: [0.0, 1e+299] .. code-block:: XML - 10000001000000 tails_assay: default=0.003, range: [0.0, 0.003] Tails assay from the enrichment process @@ -193,8 +193,8 @@ swu_capacity: default = 1e+299, range: [0.0, 1e+299] Activity: Creating the Enrichment Prototype +++++++++++++++++++++++++++++++++++++++++++ -The enrichment facility, ``EnrichmentPlant`` will intake the natural ``u-ore`` -from ``UraniumMine`` and create ``fresh-uox`` and ``tails`` as its products. +The enrichment facility, ``EnrichmentPlant`` will intake the natural ``u_ore`` +from ``UraniumMine`` and create ``fresh_uox`` and ``tails`` as its products. The template for the Enrichment archetype is of the form: .. code-block:: XML @@ -221,11 +221,11 @@ Using the template above and the table below, generate the input enrichment faci +-------------------------+---------------------------+ | ``Archetype`` | ``Enrichment`` | +-------------------------+---------------------------+ -| ``feed_commod`` | ``u-ore`` | +| ``feed_commod`` | ``u_ore`` | +-------------------------+---------------------------+ -| ``feed_recipe`` | ``nat-u`` | +| ``feed_recipe`` | ``nat_u`` | +-------------------------+---------------------------+ -| ``product_commod`` | ``fresh-uox`` | +| ``product_commod`` | ``fresh_uox`` | +-------------------------+---------------------------+ | ``tails_commod`` | ``tails`` | +-------------------------+---------------------------+ @@ -241,9 +241,9 @@ After filling in these variables, your enrichment facility prototype will look l EnrichmentPlant - u-ore - nat-u - fresh-uox + u_ore + nat_u + fresh_uox tails 1000000 @@ -354,17 +354,17 @@ Using the template above and the table below, create the Reactor prototype. +-----------------------+---------------------------+ | Variable | Value | +=======================+===========================+ -| ``name`` | ``1178MWe BRAIDWOOD-1`` | +| ``name`` | ``1178MWe BRAIDWOOD_1`` | +-----------------------+---------------------------+ | ``Archetype`` | ``Reactor`` | +-----------------------+---------------------------+ -| ``fuel_incommods`` | ``fresh-uox`` | +| ``fuel_incommods`` | ``fresh_uox`` | +-----------------------+---------------------------+ -| ``fuel_inrecipes`` | ``fresh-uox`` | +| ``fuel_inrecipes`` | ``fresh_uox`` | +-----------------------+---------------------------+ -| ``fuel_outcommods`` | ``spent-uox`` | +| ``fuel_outcommods`` | ``spent_uox`` | +-----------------------+---------------------------+ -| ``fuel_outrecipes`` | ``spent-uox`` | +| ``fuel_outrecipes`` | ``spent_uox`` | +-----------------------+---------------------------+ | ``cycle_time`` | ``18`` | +-----------------------+---------------------------+ @@ -384,13 +384,13 @@ Once completed, your prototype should look like: .. code-block:: XML - 1178MWe BRAIDWOOD-1 + 1178MWe BRAIDWOOD_1 - fresh-uox - fresh-uox - spent-uox - spent-uox + fresh_uox + fresh_uox + spent_uox + spent_uox 18 1 33000 @@ -444,7 +444,7 @@ recipe_name: default=”” .. code-block:: XML - [inrecipe][inrecipe] max_inv_size: default=1e+299, range: [0.0, 1e+299] @@ -463,7 +463,7 @@ capacity: default = 1e+299, range: [0.0, 1e+299] Activity: Creating the Sink Prototype +++++++++++++++++++++++++++++++++++++ -Our sink, ``NuclearRepository``, will store the ``spent-uox`` and ``tails`` after +Our sink, ``NuclearRepository``, will store the ``spent_uox`` and ``tails`` after their use in the fuel cycle. Using the Sink Archetype template and the table below, create the UraniumMine prototype. @@ -474,7 +474,7 @@ create the UraniumMine prototype. +-------------------------+---------------------------+ | ``Archetype`` | ``Sink`` | +-------------------------+---------------------------+ -| ``val`` | ``spent-uox`` | +| ``val`` | ``spent_uox`` | +-------------------------+---------------------------+ | ``val`` | ``tails`` | +-------------------------+---------------------------+ @@ -504,7 +504,7 @@ After filling in these variables, your sink facility prototype will look like: - spent-uox + spent_uox tails @@ -524,7 +524,7 @@ The facility section of your input file should be of the form: UraniumMine - u-ore + u_ore @@ -533,9 +533,9 @@ The facility section of your input file should be of the form: EnrichmentPlant - u-ore - nat-u - fresh-uox + u_ore + nat_u + fresh_uox tails 1000000 @@ -543,13 +543,13 @@ The facility section of your input file should be of the form: - 1178MWe BRAIDWOOD-1 + 1178MWe BRAIDWOOD_1 - fresh-uox - fresh-uox - spent-uox - spent-uox + fresh_uox + fresh_uox + spent_uox + spent_uox 18 1 33000 @@ -565,7 +565,7 @@ The facility section of your input file should be of the form: - spent-uox + spent_uox tails diff --git a/source/user/tutorial/add_reg_inst.rst b/source/user/tutorial/add_reg_inst.rst index ebf9dc73..b6ecb870 100644 --- a/source/user/tutorial/add_reg_inst.rst +++ b/source/user/tutorial/add_reg_inst.rst @@ -326,14 +326,14 @@ Activity: Add an extra insitution into the Region ------------------------------------------------- Having multiple insitutions help organize facilities and their affiliation. Let's create region, ``USA``, that contains two institutions, ``Exelon`` and ``United States Nuclear``. -``Exelon`` is the institution that holds the ``1178MWe BRAIDWOOD-1`` reactor and ``United States Nuclear`` holds the ``UraniumMine``, ``EnrichmentPlant``, and ``NuclearRepository``. +``Exelon`` is the institution that holds the ``1178MWe BRAIDWOOD_1`` reactor and ``United States Nuclear`` holds the ``UraniumMine``, ``EnrichmentPlant``, and ``NuclearRepository``. .. image:: RIF_tutorial.png Using the template above and the table below, let's build the region. 1. Since there are two institutions, ``Exelon`` and ``United States Nuclear``, we will split the region into two parts. -Let's first build the ``Exelon`` institution. This institution has one ``1178MWe BRAIDWOOD-1`` prototype. Using this information we can write this institution as: +Let's first build the ``Exelon`` institution. This institution has one ``1178MWe BRAIDWOOD_1`` prototype. Using this information we can write this institution as: .. code-block:: XML @@ -345,7 +345,7 @@ Let's first build the ``Exelon`` institution. This institution has one ``1178MWe - 1178MWe BRAIDWOOD-1 + 1178MWe BRAIDWOOD_1 1 @@ -392,7 +392,7 @@ Let's first build the ``Exelon`` institution. This institution has one ``1178MWe - 1178MWe BRAIDWOOD-1 + 1178MWe BRAIDWOOD_1 1 diff --git a/source/user/tutorial/add_second_reactor.rst b/source/user/tutorial/add_second_reactor.rst index 5bca34df..2e0f08cf 100644 --- a/source/user/tutorial/add_second_reactor.rst +++ b/source/user/tutorial/add_second_reactor.rst @@ -2,7 +2,7 @@ Adding a second reactor ======================= Simple simulations can easily be expanded into more complex problems. To demonstrate this, -we will now add a second reactor, ``1000We Lightwater-1``, to our +we will now add a second reactor, ``1000We Lightwater_1``, to our simulation. This reactor will have a lifetime of 360 months (30 years), cycle time of 12 months, assembly size of 30160 kg, and power capacity 1000 MWe. Using this information, let's construct the facility input section @@ -17,19 +17,19 @@ prototype. +-----------------------+---------------------------+ | Variable | Value | +=======================+===========================+ -| ``name`` | ``1000We Lightwater-1`` | +| ``name`` | ``1000We Lightwater_1`` | +-----------------------+---------------------------+ | ``lifetime`` | ``360`` | +-----------------------+---------------------------+ | ``Archetype`` | ``Reactor`` | +-----------------------+---------------------------+ -| ``fuel_incommods`` | ``fresh-uox`` | +| ``fuel_incommods`` | ``fresh_uox`` | +-----------------------+---------------------------+ -| ``fuel_inrecipes`` | ``fresh-uox`` | +| ``fuel_inrecipes`` | ``fresh_uox`` | +-----------------------+---------------------------+ -| ``fuel_outcommods`` | ``spent-uox`` | +| ``fuel_outcommods`` | ``spent_uox`` | +-----------------------+---------------------------+ -| ``fuel_outrecipes`` | ``spent-uox`` | +| ``fuel_outrecipes`` | ``spent_uox`` | +-----------------------+---------------------------+ | ``cycle_time`` | ``12`` | +-----------------------+---------------------------+ @@ -49,14 +49,14 @@ Once complete, your reactor prototype should look like: .. code-block:: xml - 1000We Lightwater-1 + 1000We Lightwater_1 360 - fresh-uox - fresh-uox - spent-uox - spent-uox + fresh_uox + fresh_uox + spent_uox + spent_uox 12 1 30160 @@ -67,7 +67,7 @@ Once complete, your reactor prototype should look like: -Append this prototype right after the ``1178MWe BRAIDWOOD-1`` prototype. +Append this prototype right after the ``1178MWe BRAIDWOOD_1`` prototype. Activity: Second reactor Institution ++++++++++++++++++++++++++++++++++++ @@ -80,11 +80,11 @@ and add .. code-block:: xml - 1000We Lightwater-1 + 1000We Lightwater_1 1 -below the ``1178MWe BRAIDWOOD-1`` entry block. The Reactor section +below the ``1178MWe BRAIDWOOD_1`` entry block. The Reactor section of the region block should now look like, .. code-block:: xml @@ -97,11 +97,11 @@ of the region block should now look like, - 1178MWe BRAIDWOOD-1 + 1178MWe BRAIDWOOD_1 1 - 1000We Lightwater-1 + 1000We Lightwater_1 1 diff --git a/source/user/tutorial/add_sep.rst b/source/user/tutorial/add_sep.rst index f21c494d..466751b3 100644 --- a/source/user/tutorial/add_sep.rst +++ b/source/user/tutorial/add_sep.rst @@ -48,10 +48,10 @@ The following is the input template for ``Cycamore::Separations`` archetype: * The maximum feed inventory is the most feed material that we'll have on hand: 1000 tonnes. * The maximum separations throughout is the size of our plant: 80 tonnes/timestep -* This simple scenario will have a single output stream: Separated-Fissile +* This simple scenario will have a single output stream: Separated_Fissile * we will hold no more than 5 tonnes of separated material on hand at any time * 99% of all Pu (94000) will go into that stream -* all other material will go to Separated-Waste +* all other material will go to Separated_Waste Filling in the template, the input block looks like: @@ -62,8 +62,8 @@ Filling in the template, the input block looks like: - spent-uox - used-mox + spent_uox + used_mox 1.0 @@ -71,11 +71,11 @@ Filling in the template, the input block looks like: 1000E+3_ 80e+3 - Separated-Waste + Separated_Waste 1000e+3 - Separated-Fissile + Separated_Fissile 5e+3 diff --git a/source/user/tutorial/cyclus_tutorial_recap.rst b/source/user/tutorial/cyclus_tutorial_recap.rst index 3f03fff5..92e61fd5 100644 --- a/source/user/tutorial/cyclus_tutorial_recap.rst +++ b/source/user/tutorial/cyclus_tutorial_recap.rst @@ -43,11 +43,11 @@ Basic Tutorial Input - u-ore + u_ore 1.0 - fresh-uox + fresh_uox 1.0 @@ -55,7 +55,7 @@ Basic Tutorial Input 1.0 - spent-uox + spent_uox 1.0 @@ -63,7 +63,7 @@ Basic Tutorial Input UraniumMine - u-ore + u_ore @@ -72,9 +72,9 @@ Basic Tutorial Input EnrichmentPlant - u-ore - nat-u - fresh-uox + u_ore + nat_u + fresh_uox tails 1000000 @@ -82,13 +82,13 @@ Basic Tutorial Input - 1178MWe BRAIDWOOD-1 + 1178MWe BRAIDWOOD_1 - fresh-uox - fresh-uox - spent-uox - spent-uox + fresh_uox + fresh_uox + spent_uox + spent_uox 18 1 33000 @@ -104,7 +104,7 @@ Basic Tutorial Input - spent-uox + spent_uox tails @@ -119,7 +119,7 @@ Basic Tutorial Input - 1178MWe BRAIDWOOD-1 + 1178MWe BRAIDWOOD_1 1 @@ -153,7 +153,7 @@ Basic Tutorial Input - nat-u + nat_u mass 92235 @@ -166,7 +166,7 @@ Basic Tutorial Input - fresh-uox + fresh_uox mass 92235 @@ -179,7 +179,7 @@ Basic Tutorial Input - spent-uox + spent_uox mass 92235 @@ -242,11 +242,11 @@ Add a Second Reactor Input - u-ore + u_ore 1.0 - fresh-uox + fresh_uox 1.0 @@ -254,7 +254,7 @@ Add a Second Reactor Input 1.0 - spent-uox + spent_uox 1.0 @@ -262,7 +262,7 @@ Add a Second Reactor Input UraniumMine - u-ore + u_ore @@ -271,9 +271,9 @@ Add a Second Reactor Input EnrichmentPlant - u-ore - nat-u - fresh-uox + u_ore + nat_u + fresh_uox tails 1000000 @@ -281,13 +281,13 @@ Add a Second Reactor Input - 1178MWe BRAIDWOOD-1 + 1178MWe BRAIDWOOD_1 - fresh-uox - fresh-uox - spent-uox - spent-uox + fresh_uox + fresh_uox + spent_uox + spent_uox 18 1 33000 @@ -299,14 +299,14 @@ Add a Second Reactor Input - 1000We Lightwater-1 + 1000We LIGHTWATER_1 360 - fresh-uox - fresh-uox - spent-uox - spent-uox + fresh_uox + fresh_uox + spent_uox + spent_uox 12 1 30160 @@ -322,7 +322,7 @@ Add a Second Reactor Input - spent-uox + spent_uox tails @@ -337,11 +337,11 @@ Add a Second Reactor Input - 1178MWe BRAIDWOOD-1 + 1178MWe BRAIDWOOD_1 1 - 1000We Lightwater-1 + 1000We LIGHTWATER_1 1 @@ -375,7 +375,7 @@ Add a Second Reactor Input - nat-u + nat_u mass 92235 @@ -388,7 +388,7 @@ Add a Second Reactor Input - fresh-uox + fresh_uox mass 92235 @@ -401,7 +401,7 @@ Add a Second Reactor Input - spent-uox + spent_uox mass 92235 @@ -471,11 +471,11 @@ Recycle Input - u-ore + u_ore 1.0 - fresh-uox + fresh_uox 1.0 @@ -483,23 +483,23 @@ Recycle Input 1.0 - spent-uox + spent_uox 1.0 - used-mox-fuel + used_mox_fuel 1.0 - fresh-mox + fresh_mox 1.0 - separated-fissile + separated_fissile 1.0 - separated-waste + separated_waste 1.0 @@ -507,7 +507,7 @@ Recycle Input UraniumMine - u-ore + u_ore @@ -516,9 +516,9 @@ Recycle Input EnrichmentPlant - u-ore - nat-u - fresh-uox + u_ore + nat_u + fresh_uox tails 1000000 @@ -526,13 +526,13 @@ Recycle Input - 1178MWe BRAIDWOOD-1 + 1178MWe BRAIDWOOD_1 - fresh-uox - fresh-uox - spent-uox - spent-uox + fresh_uox + fresh_uox + spent_uox + spent_uox 18 1 33000 @@ -544,14 +544,14 @@ Recycle Input - 1000MWe Lightwater-1 + 1000MWe LIGHTWATER_1 360 - fresh-uox - fresh-uox - spent-uox - spent-uox + fresh_uox + fresh_uox + spent_uox + spent_uox 12 1 33000 @@ -563,12 +563,12 @@ Recycle Input - uox-mox-reprocessing + uox_mox_reprocessing - used-mox-fuel - spent-uox + used_mox_fuel + spent_uox 1.0 @@ -576,10 +576,10 @@ Recycle Input 1000e+3 80e+3 - separated-waste + separated_waste - separated-fissile + separated_fissile 5e+4 @@ -598,49 +598,49 @@ Recycle Input - u-ore + u_ore - nat-u + nat_u 1000e+3 1 - separated-fissile + separated_fissile 5e+4 - fresh-mox + fresh_mox thermal 2e+3 - uox-mox-fuel-fab + uox_mox_fuel_fab - 1000MWe ALWR-1 + 1000MWe ALWR_1 360 - fresh-uox - fresh-mox + fresh_uox + fresh_mox - fresh-uox - fresh-uox + fresh_uox + fresh_uox 1.0 2.0 - spent-uox - used-mox-fuel + spent_uox + used_mox_fuel - spent-uox - used-mox + spent_uox + used_mox 18 1 @@ -658,9 +658,9 @@ Recycle Input - spent-uox + spent_uox tails - separated-waste + separated_waste @@ -675,15 +675,15 @@ Recycle Input - 1178MWe BRAIDWOOD-1 + 1178MWe BRAIDWOOD_1 1 - 1000MWe Lightwater-1 + 1000MWe LIGHTWATER_1 1 - 1000MWe ALWR-1 + 1000MWe ALWR_1 1 @@ -708,11 +708,11 @@ Recycle Input 1 - uox-mox-reprocessing + uox_mox_reprocessing 1 - uox-mox-fuel-fab + uox_mox_fuel_fab 1 @@ -725,7 +725,7 @@ Recycle Input - nat-u + nat_u mass 92235 @@ -738,7 +738,7 @@ Recycle Input - fresh-uox + fresh_uox mass 92235 @@ -750,7 +750,7 @@ Recycle Input - used-mox + used_mox mass 92235 @@ -774,7 +774,7 @@ Recycle Input - spent-uox + spent_uox mass 92235 @@ -850,11 +850,11 @@ DeployInst Input - u-ore + u_ore 1.0 - fresh-uox + fresh_uox 1.0 @@ -862,23 +862,23 @@ DeployInst Input 1.0 - spent-uox + spent_uox 1.0 - used-mox-fuel + used_mox_fuel 1.0 - fresh-mox + fresh_mox 1.0 - separated-fissile + separated_fissile 1.0 - separated-waste + separated_waste 1.0 @@ -886,7 +886,7 @@ DeployInst Input UraniumMine - u-ore + u_ore @@ -895,9 +895,9 @@ DeployInst Input EnrichmentPlant - u-ore - nat-u - fresh-uox + u_ore + nat_u + fresh_uox tails 1000000 @@ -905,13 +905,13 @@ DeployInst Input - 1178MWe BRAIDWOOD-1 + 1178MWe BRAIDWOOD_1 - fresh-uox - fresh-uox - spent-uox - spent-uox + fresh_uox + fresh_uox + spent_uox + spent_uox 18 1 33000 @@ -923,14 +923,14 @@ DeployInst Input - 1000MWe Lightwater-1 + 1000MWe LIGHTWATER_1 360 - fresh-uox - fresh-uox - spent-uox - spent-uox + fresh_uox + fresh_uox + spent_uox + spent_uox 12 1 33000 @@ -942,12 +942,12 @@ DeployInst Input - uox-mox-reprocessing + uox_mox_reprocessing - used-mox-fuel - spent-uox + used_mox_fuel + spent_uox 1.0 @@ -955,10 +955,10 @@ DeployInst Input 1000e+3 80e+3 - separated-waste + separated_waste - separated-fissile + separated_fissile 5e+4 @@ -977,49 +977,49 @@ DeployInst Input - u-ore + u_ore - nat-u + nat_u 1000e+3 1 - separated-fissile + separated_fissile 5e+4 - fresh-mox + fresh_mox thermal 2e+3 - uox-mox-fuel-fab + uox_mox_fuel_fab - 1000MWe ALWR-1 + 1000MWe ALWR_1 360 - fresh-uox - fresh-mox + fresh_uox + fresh_mox - fresh-uox - fresh-uox + fresh_uox + fresh_uox 1.0 2.0 - spent-uox - used-mox-fuel + spent_uox + used_mox_fuel - spent-uox - used-mox + spent_uox + used_mox 18 1 @@ -1037,9 +1037,9 @@ DeployInst Input - spent-uox + spent_uox tails - separated-waste + separated_waste @@ -1054,15 +1054,15 @@ DeployInst Input - 1178MWe BRAIDWOOD-1 + 1178MWe BRAIDWOOD_1 1 - 1000MWe Lightwater-1 + 1000MWe LIGHTWATER_1 1 - 1000MWe ALWR-1 + 1000MWe ALWR_1 1 @@ -1087,11 +1087,11 @@ DeployInst Input 1 - uox-mox-reprocessing + uox_mox_reprocessing 1 - uox-mox-fuel-fab + uox_mox_fuel_fab 1 @@ -1107,8 +1107,8 @@ DeployInst Input UraniumMine FuelFab - 1178MWe BRAIDWOOD-1 - 1000MWe Lightwater-1 + 1178MWe BRAIDWOOD_1 + 1000MWe LIGHTWATER_1 1 @@ -1129,7 +1129,7 @@ DeployInst Input - nat-u + nat_u mass 92235 @@ -1142,7 +1142,7 @@ DeployInst Input - fresh-uox + fresh_uox mass 92235 @@ -1154,7 +1154,7 @@ DeployInst Input - used-mox + used_mox mass 92235 @@ -1178,7 +1178,7 @@ DeployInst Input - spent-uox + spent_uox mass 92235 diff --git a/source/user/tutorial/full_input_1.rst b/source/user/tutorial/full_input_1.rst index f5a12392..919079e4 100644 --- a/source/user/tutorial/full_input_1.rst +++ b/source/user/tutorial/full_input_1.rst @@ -39,11 +39,11 @@ - u-ore + u_ore 1.0 - fresh-uox + fresh_uox 1.0 @@ -51,12 +51,12 @@ 1.0 - spent-uox + spent_uox 1.0 - nat-u + nat_u mass 92235 @@ -69,7 +69,7 @@ - fresh-uox + fresh_uox mass 92235 @@ -82,7 +82,7 @@ - spent-uox + spent_uox mass 92235 @@ -107,7 +107,7 @@ UraniumMine - u-ore + u_ore @@ -116,9 +116,9 @@ EnrichmentPlant - u-ore - nat-u - fresh-uox + u_ore + nat_u + fresh_uox tails 1000000 @@ -126,13 +126,13 @@ - 1178MWe BRAIDWOOD-1 + 1178MWe BRAIDWOOD_1 - fresh-uox - fresh-uox - spent-uox - spent-uox + fresh_uox + fresh_uox + spent_uox + spent_uox 18 1 33000 @@ -148,7 +148,7 @@ - spent-uox + spent_uox tails @@ -164,7 +164,7 @@ - 1178MWe BRAIDWOOD-1 + 1178MWe BRAIDWOOD_1 1