Merge remote-tracking branch 'scopatz/s' into v1.3.0-release

Updating Separations with additional levels of nesting, interleaving, and
aliasing.

.gitignore

@@ -10,3 +10,4 @@ rs.cred
 *.h5
 *.dat
 tests/run_inputs.py
+cyclus.sqlite

input/recycle.xml

@@ -36,13 +36,15 @@
     <config>
       <Separations>
           <streams>
-              <commod>sep_stream</commod>
-              <info>
-                  <buf_size>1e100</buf_size>
-                  <efficiencies>
-                      <comp>Pu</comp> <eff>.99</eff>
-                  </efficiencies>
-              </info>
+              <item>
+                  <commod>sep_stream</commod>
+                  <info>
+                      <buf_size>1e100</buf_size>
+                      <efficiencies>
+                         <item><comp>Pu</comp> <eff>.99</eff></item>
+                      </efficiencies>
+                  </info>
+              </item>
           </streams>
 
           <leftover_commod>waste</leftover_commod>

src/separations_tests.cc

@@ -44,16 +44,18 @@ TEST(SeparationsTests, SepMaterial) {
 }
 
 TEST(SeparationsTests, SepMixElemAndNuclide) {
-  std::string config = 
+  std::string config =
       "<streams>"
-      "    <commod>stream1</commod>"
-      "    <info>"
-      "        <buf_size>-1</buf_size>"
-      "        <efficiencies>"
-      "            <comp>U</comp> <eff>0.6</eff>"
-      "            <comp>Pu239</comp> <eff>.7</eff>"
-      "        </efficiencies>"
-      "    </info>"
+      "    <item>"
+      "        <commod>stream1</commod>"
+      "        <info>"
+      "            <buf_size>-1</buf_size>"
+      "            <efficiencies>"
+      "                <item><comp>U</comp> <eff>0.6</eff></item>"
+      "                <item><comp>Pu239</comp> <eff>.7</eff></item>"
+      "            </efficiencies>"
+      "        </info>"
+      "    </item>"
       "</streams>"
       ""
       "<leftover_commod>waste</leftover_commod>"