Merge pull request #444 from ConnorWelch-OSU/removing-verbosity

Reducing the verbosity of the tutorial

Author: gonuke

source/user/tutorial/add_arche.rst

@@ -124,12 +124,12 @@ The ``archetype`` block is located after the simulation control block and takes
 
     <archetypes>
         <spec>
-          <lib>lib1</lib>
-          <name>arch_1</name>
+          <lib>[string]</lib>
+          <name>[string]</name>
         </spec>
         <spec>
-          <lib>lib2</lib>
-          <name>arch_2</name>
+          <lib>[string]</lib>
+          <name>[string]</name>
         </spec>
         ...
     </archetypes>
@@ -138,79 +138,57 @@ where ``lib`` is the library in which the archetype came from and ``name`` is
 the archetype name. You need one `spec` block in the archetypes section 
 for each archetype you use in your simulation. 
 Let's build the archetypes block in our input file. 
-Using the template below and the table below,
+Using the template above and the table below,
 fill in the template with the variables listed in the table below.
 
-+-------------+------------------+----------------------------+
-| Variable    | Value            | Purpose                    |
-+=============+==================+============================+
-| ``lib1``    | ``cycamore``     | Library of the archetype   |
-+-------------+------------------+----------------------------+
-| ``arch1``   | ``Enrichment``   | Name of archetype          |
-+-------------+------------------+----------------------------+
-| ``lib2``    | ``cycamore``     | Library of the archetype   |
-+-------------+------------------+----------------------------+
-| ``arch2``   | ``Reactor``      | Name of archetype          |
-+-------------+------------------+----------------------------+
-| ``lib3``    | ``cycamore``     | Library of the archetype   |
-+-------------+------------------+----------------------------+
-| ``arch3``   | ``Source``       | Name of archetype          |
-+-------------+------------------+----------------------------+
-| ``lib4``    | ``cycamore``     | Library of the archetype   |
-+-------------+------------------+----------------------------+
-| ``arch4``   | ``Sink``         | Name of archetype          |
-+-------------+------------------+----------------------------+
-
-
-Archetype Block Template
-------------------------
++-------------+-------------+------------------+
+| Archetype # | Variable    | Value            |
++=============+=============+==================+
+| 1           | ``lib``     | ``cycamore``     |
++             +-------------+------------------+
+|             | ``name``    | ``Source``       |
++-------------+-------------+------------------+
+| 2           | ``lib``     | ``cycamore``     |
++             +-------------+------------------+
+|             | ``name``    | ``Enrichment``   |
++-------------+-------------+------------------+
+| 3           | ``lib``     | ``cycamore``     |
++             +-------------+------------------+
+|             | ``name``    | ``Reactor``      |
++-------------+-------------+------------------+
+| 4           | ``lib``     | ``cycamore``     |
++             +-------------+------------------+
+|             | ``name``    | ``Sink``         |
++-------------+-------------+------------------+
+
+The order of the archetypes in this block is of no consequence. Once complete, append the archetypes section under the control section of input file [#f1]_.
+
+Check: Complete Archetypes block
++++++++++++++++++++++++++++++++++++++++
+
+The archetypes section of your input file should now look like:
+
 .. code-block:: XML
 
-      <archetypes>
+    <archetypes>
         <spec>
-          <lib>lib1</lib>
-          <name>arch1</name>
+          <lib>cycamore</lib>
+          <name>Enrichment</name>
         </spec>
         <spec>
-          <lib>lib2</lib>
-          <name>arch2</name>
+          <lib>cycamore</lib>
+          <name>Reactor</name>
         </spec>
         <spec>
-          <lib>lib3</lib>
-          <name>arch3</name>
+          <lib>cycamore</lib>
+          <name>Source</name>
         </spec>
         <spec>
-          <lib>lib4</lib>
-          <name>arch4</name>
+          <lib>cycamore</lib>
+          <name>Sink</name>
         </spec>
-      </archetypes>
-
-
-Once complete, your ``archetypes`` block should look like:
-
-.. code-block:: XML
-
-    <archetypes>
-      <spec>
-        <lib>cycamore</lib>
-        <name>Enrichment</name>
-      </spec>
-      <spec>
-        <lib>cycamore</lib>
-        <name>Reactor</name>
-      </spec>
-      <spec>
-        <lib>cycamore</lib>
-        <name>Source</name>
-      </spec>
-      <spec>
-        <lib>cycamore</lib>
-        <name>Sink</name>
-      </spec>
     </archetypes>
 
-The order of the archetypes in this block is of no consequence. Once complete, append the archetypes section under the control section of input file [#f1]_.
-
 .. 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. 

source/user/tutorial/add_arche_commod_recipe.rst

@@ -12,16 +12,6 @@ We will need two additional archetypes:
 1. Add the ``Cycamore::FuelFab`` archetype
 2. Add the ``Cycamore::Separations`` archetype
 
-Activity: Adding Commodities
------------------------------
-
-We will need 4 additional commodities:
-
-1. fresh_mox
-2. used_mox
-3. Separated_Fissile
-4. Separated_Waste
-
 Activity: Adding Recipes
 --------------------------