From d2df222c525c760fcd9db062a965fa9773889a9d Mon Sep 17 00:00:00 2001
From: Paul Romano <paul.k.romano@gmail.com>
Date: Tue, 19 Jan 2016 13:18:12 -0600
Subject: [PATCH] Combine two S(a,b) tests into one

---
 tests/test_salphabeta/geometry.xml            |   8 +-
 tests/test_salphabeta/materials.xml           |  15 ++
 tests/test_salphabeta/results_true.dat        |   2 +-
 tests/test_salphabeta_multiple/geometry.xml   |  96 -------------
 tests/test_salphabeta_multiple/materials.xml  | 130 ------------------
 .../test_salphabeta_multiple/results_true.dat |   2 -
 tests/test_salphabeta_multiple/settings.xml   |  20 ---
 .../test_salphabeta_multiple.py               |  11 --
 8 files changed, 21 insertions(+), 263 deletions(-)
 delete mode 100644 tests/test_salphabeta_multiple/geometry.xml
 delete mode 100644 tests/test_salphabeta_multiple/materials.xml
 delete mode 100644 tests/test_salphabeta_multiple/results_true.dat
 delete mode 100644 tests/test_salphabeta_multiple/settings.xml
 delete mode 100644 tests/test_salphabeta_multiple/test_salphabeta_multiple.py

diff --git a/tests/test_salphabeta/geometry.xml b/tests/test_salphabeta/geometry.xml
index f9caa6c883..2b978b9148 100644
--- a/tests/test_salphabeta/geometry.xml
+++ b/tests/test_salphabeta/geometry.xml
@@ -3,11 +3,13 @@
 
   <surface id="1" type="x-plane" coeffs="-10" boundary="vacuum"/>
   <surface id="2" type="x-plane" coeffs="-5" />
-  <surface id="3" type="x-plane" coeffs="5" />
-  <surface id="4" type="x-plane" coeffs="10" boundary="vacuum"/>
+  <surface id="3" type="x-plane" coeffs="0" />
+  <surface id="4" type="x-plane" coeffs="5" />
+  <surface id="5" type="x-plane" coeffs="10" boundary="vacuum"/>
 
   <cell id="1" material="1" region="1 -2" />
   <cell id="2" material="2" region="2 -3" />
   <cell id="3" material="3" region="3 -4" />
-    
+  <cell id="4" material="4" region="4 -5" />
+
 </geometry>
diff --git a/tests/test_salphabeta/materials.xml b/tests/test_salphabeta/materials.xml
index 9646e11159..b51395f184 100644
--- a/tests/test_salphabeta/materials.xml
+++ b/tests/test_salphabeta/materials.xml
@@ -23,6 +23,21 @@
     <nuclide name="Be-9" ao="1.0" />
     <nuclide name="O-16" ao="1.0" />
     <sab name="BeBeO" xs="71t" />
+    <sab name="OBeO" xs="71t" />
+  </material>
+
+  <material id="4">
+    <density value="5.90168" units="g/cm3" />
+    <nuclide name="H-1"    ao="0.3" />
+    <nuclide name="Zr-90"  ao="0.15" />
+    <nuclide name="Zr-91"  ao="0.1" />
+    <nuclide name="Zr-92"  ao="0.1" />
+    <nuclide name="Zr-94"  ao="0.05" />
+    <nuclide name="Zr-96"  ao="0.05" />
+    <nuclide name="U-235"  ao="0.1" />
+    <nuclide name="U-238"  ao="0.15" />
+    <sab name="ZrZrH" xs="71t" />
+    <sab name="HZrH" xs="71t" />
   </material>
 
 </materials>
diff --git a/tests/test_salphabeta/results_true.dat b/tests/test_salphabeta/results_true.dat
index a04ee8fc89..926af89bca 100644
--- a/tests/test_salphabeta/results_true.dat
+++ b/tests/test_salphabeta/results_true.dat
@@ -1,2 +1,2 @@
 k-combined:
-8.538165E-01 6.355606E-03
+8.350634E-01 6.010639E-02
diff --git a/tests/test_salphabeta_multiple/geometry.xml b/tests/test_salphabeta_multiple/geometry.xml
deleted file mode 100644
index 13eb601660..0000000000
--- a/tests/test_salphabeta_multiple/geometry.xml
+++ /dev/null
@@ -1,96 +0,0 @@
-<?xml version="1.0"?>
-<geometry>
-
-  <!-- pu-met-fast-021 case 2 -->
-
-  <surface id="1"  type="z-plane" coeffs="-17.51" boundary="vacuum" />
-  <surface id="2"  type="z-plane" coeffs="-2.57" />
-  <!-- Bottom Plutonium Core -->
-  <surface id="3"  type="z-plane" coeffs="-2.55" />
-  <surface id="4"  type="z-plane" coeffs="-2.37" />
-  <surface id="5"  type="z-plane" coeffs="-2.1" />
-  <surface id="6"  type="z-plane" coeffs="-2.06" />
-  <surface id="7"  type="z-plane" coeffs="-1.61" />
-  <surface id="8"  type="z-plane" coeffs="-1.57" />
-  <surface id="9"  type="z-plane" coeffs="-1.12" />
-  <surface id="10" type="z-plane" coeffs="-1.08" />
-  <surface id="11" type="z-plane" coeffs="-0.63" />
-  <surface id="12" type="z-plane" coeffs="-0.59" />
-  <surface id="13" type="z-plane" coeffs="-0.14" />
-  <!-- Middle Gap -->
-  <surface id="14" type="z-plane" coeffs="-0.12" />
-  <surface id="15" type="z-plane" coeffs="0.12" />
-  <!-- Top Plutonium Core -->
-  <surface id="16" type="z-plane" coeffs="0.14" />
-  <surface id="17" type="z-plane" coeffs="0.59" />
-  <surface id="18" type="z-plane" coeffs="0.63" />
-  <surface id="19" type="z-plane" coeffs="1.08" />
-  <surface id="20" type="z-plane" coeffs="1.12" />
-  <surface id="21" type="z-plane" coeffs="1.57" />
-  <surface id="22" type="z-plane" coeffs="1.61" />
-  <surface id="23" type="z-plane" coeffs="2.06" />
-  <surface id="24" type="z-plane" coeffs="2.1" />
-  <surface id="25" type="z-plane" coeffs="2.37" />
-  <surface id="26" type="z-plane" coeffs="2.55" />
-  <surface id="27" type="z-plane" coeffs="2.57" />
-  <!-- Top Beryllium Reflector -->
-  <surface id="28" type="z-plane" coeffs="2.59" />
-  <surface id="29" type="z-plane" coeffs="17.51" boundary="vacuum" />
-
-  <!-- Cylinders -->
-  <surface id="30" type="z-cylinder" coeffs="0 0 9.995" boundary="vacuum" />
-  <surface id="31" type="z-cylinder" coeffs="0 0 6.263" />
-  <surface id="32" type="z-cylinder" coeffs="0 0 6.063" />
-  <surface id="33" type="z-cylinder" coeffs="0 0 5.995" />
-
-
-  <!-- Bottom Beryllium Reflector -->
-  <cell id="1"  material="2" region=" 1  -2 -30" />
-
-  <!-- Top ZrH Reflector -->
-  <cell id="2"  material="7" region="28 -29 -30" />
-
-  <!-- Duralumin base and top -->
-  <cell id="3"  material="4" region=" 2  -4 -30  31" />
-  <cell id="4"  material="4" region="25 -28 -30  31" />
-
-  <!-- Duralumin top cylindrical shell -->
-  <cell id="6"  material="5" region="15 -28 -31  32" />
-
-  <!-- Duralumin bottom cylindrical shell -->
-  <cell id="7"  material="6" region=" 2 -14 -31  32" />
-
-  <!-- Steel Cover -->
-  <cell id="8"  material="3" region=" 2  -3 -33" />
-  <cell id="9"  material="3" region=" 5  -6 -33" />
-  <cell id="10" material="3" region=" 7  -8 -33" />
-  <cell id="11" material="3" region=" 9 -10 -33" />
-  <cell id="12" material="3" region="11 -12 -33" />
-  <cell id="13" material="3" region="13 -14 -33" />
-  <cell id="14" material="3" region="15 -16 -33" />
-  <cell id="15" material="3" region="17 -18 -33" />
-  <cell id="16" material="3" region="19 -20 -33" />
-  <cell id="17" material="3" region="21 -22 -33" />
-  <cell id="18" material="3" region="23 -24 -33" />
-  <cell id="19" material="3" region="26 -27 -33" />
-  <cell id="20" material="3" region=" 2 -14  33 -32" />
-  <cell id="21" material="3" region="15 -27  33 -32" />
-
-  <!-- Plutonium -->
-  <cell id="22" material="1" region=" 3  -5 -33" />
-  <cell id="23" material="1" region=" 6  -7 -33" />
-  <cell id="24" material="1" region=" 8  -9 -33" />
-  <cell id="25" material="1" region="10 -11 -33" />
-  <cell id="26" material="1" region="12 -13 -33" />
-  <cell id="27" material="1" region="16 -17 -33" />
-  <cell id="28" material="1" region="18 -19 -33" />
-  <cell id="29" material="1" region="20 -21 -33" />
-  <cell id="30" material="1" region="22 -23 -33" />
-  <cell id="31" material="1" region="24 -26 -33" />
-
-  <!-- Void -->
-  <cell id="32" material="void" region="14 -15 -31" />
-  <cell id="33" material="void" region=" 4 -25  31 -30" />
-  <cell id="34" material="void" region="27 -28 -30" />
-
-</geometry>
diff --git a/tests/test_salphabeta_multiple/materials.xml b/tests/test_salphabeta_multiple/materials.xml
deleted file mode 100644
index f1a0d6f393..0000000000
--- a/tests/test_salphabeta_multiple/materials.xml
+++ /dev/null
@@ -1,130 +0,0 @@
-<?xml version="1.0"?>
-<materials>
-
-  <!-- pu-met-fast-021 case 2, modified to include Zr-H to exercise
-       the capability to assign a single S(a,b) table to multiple nuclides -->
-
-  <default_xs>71c</default_xs>
-
-  <!-- Plutonium -->
-  <material id="1">
-    <density value="18.5345" units="g/cm3" />
-    <nuclide name="Pu-239" ao="4.4422e-02" />
-    <nuclide name="Pu-240" ao="2.1326e-03" />
-    <nuclide name="Pu-241" ao="9.2538e-05" />
-    <!-- C at 1.9515e-4 atom/b-cm -->
-    <nuclide name="C-Nat"  ao="1.9515e-04" />
-    <!-- Fe at 8.1943e-5 atom/b-cm -->
-    <nuclide name="Fe-54"  ao="4.7896e-06" />
-    <nuclide name="Fe-56"  ao="7.5186e-05" />
-    <nuclide name="Fe-57"  ao="1.7364e-06" />
-    <nuclide name="Fe-58"  ao="2.3108e-07" />
-  </material>
-
-  <!-- Berylium-oxide Reflector -->
-  <material id="2">
-    <density value="2.86750" units="g/cm3" />
-    <nuclide name="Be-9" ao="6.9041e-02" />
-    <!-- O at 6.9041e-2 -->
-    <nuclide name="O-16" ao="6.9015e-02" />
-    <nuclide name="O-17" ao="2.6236e-05" />
-    <sab name="BeBeO" xs="71t" />
-    <sab name="OBeO" xs="71t" />
-  </material>
-
-  <!-- Steel Cover -->
-  <material id="3">
-    <density value="6.9323" units="g/cm3" />
-    <!-- Fe at 5.1280e-2 atom/b-cm -->
-    <nuclide name="Fe-54" ao="2.9973e-03" />
-    <nuclide name="Fe-56" ao="4.7051e-02" />
-    <nuclide name="Fe-57" ao="1.0866e-03" />
-    <nuclide name="Fe-58" ao="1.4461e-04" />
-    <!-- C at 3.4757e-4 atom/b-cm -->
-    <nuclide name="C-Nat" ao="3.4757e-04" />
-    <!-- Si at 8.9185e-4 atom/b-cm -->
-    <nuclide name="Si-28" ao="8.2255e-04" />
-    <nuclide name="Si-29" ao="4.1767e-05" />
-    <nuclide name="Si-30" ao="2.7533e-05" />
-    <!-- Ti at 6.1034e-4 atom/b-cm -->
-    <nuclide name="Ti-46" ao="5.0353e-05" />
-    <nuclide name="Ti-47" ao="4.5409e-05" />
-    <nuclide name="Ti-48" ao="4.4994e-04" />
-    <nuclide name="Ti-49" ao="3.3019e-05" />
-    <nuclide name="Ti-50" ao="3.1616e-05" />
-    <!-- Cr at 1.4452e-2 atom/b-cm -->
-    <nuclide name="Cr-50" ao="6.2794e-04" />
-    <nuclide name="Cr-52" ao="1.2109e-02" />
-    <nuclide name="Cr-53" ao="1.3731e-03" />
-    <nuclide name="Cr-54" ao="3.4179e-04" />
-    <!-- Mn at 1.5198e-3 atom/b-cm -->
-    <nuclide name="Mn-55" ao="1.5198e-03" />
-    <!-- Ni at 7.1131e-3 atom/b-cm -->
-    <nuclide name="Ni-58" ao="4.8424e-03" />
-    <nuclide name="Ni-60" ao="1.8653e-03" />
-    <nuclide name="Ni-61" ao="8.1082e-05" />
-    <nuclide name="Ni-62" ao="2.5853e-04" />
-    <nuclide name="Ni-64" ao="6.5839e-05" />
-  </material>
-
-  <!-- Duralumin base and top -->
-  <material id="4">
-    <density value="2.78" units="g/cm3" />
-    <nuclide name="Al-27" ao="5.8077e-02" />
-    <!-- Mg at 1.0332e-3 atom/b-cm -->
-    <nuclide name="Mg-24" ao="8.1612e-04" />
-    <nuclide name="Mg-25" ao="1.0332e-04" />
-    <nuclide name="Mg-26" ao="1.1376e-04" />
-    <!-- Mn at 1.8284e-4 atom/b-cm -->
-    <nuclide name="Mn-55" ao="1.8284e-04" />
-    <!-- Cu at 1.1329e-3 atom/b-cm -->
-    <nuclide name="Cu-63" ao="7.8363e-04" />
-    <nuclide name="Cu-65" ao="3.4927e-04" />
-  </material>
-
-  <!-- Duralumin top cylindrical shell -->
-  <material id="5">
-    <density value="0.417" units="g/cm3" />
-    <nuclide name="Al-27" ao="8.7115e-03" />
-    <!-- Mg at 1.5498e-4 atom/b-cm -->
-    <nuclide name="Mg-24" ao="1.2242e-04" />
-    <nuclide name="Mg-25" ao="1.5498e-05" />
-    <nuclide name="Mg-26" ao="1.7063e-05" />
-    <!-- Mn at 2.7426e-5 atom/b-cm -->
-    <nuclide name="Mn-55" ao="2.7426e-05" />
-    <!-- Cu at 1.6993e-4 atom/b-cm -->
-    <nuclide name="Cu-63" ao="1.1754e-04" />
-    <nuclide name="Cu-65" ao="5.2389e-05" />
-  </material>
-
-  <!-- Duralumin bottom cylindrical shell -->
-  <material id="6">
-    <density value="1.8155" units="g/cm3" />
-    <nuclide name="Al-27" ao="3.7928e-2" />
-    <!-- Mg at 6.7475e-4 atom/b-cm -->
-    <nuclide name="Mg-24" ao="5.3299e-04" />
-    <nuclide name="Mg-25" ao="6.7475e-05" />
-    <nuclide name="Mg-26" ao="7.4290e-05" />
-    <!-- Mn at 1.1941e-4 atom/b-cm -->
-    <nuclide name="Mn-55" ao="1.1941e-04" />
-    <!-- Cu 7.3982e-4 atom/b-cm -->
-    <nuclide name="Cu-63" ao="5.1173e-04" />
-    <nuclide name="Cu-65" ao="2.2809e-04" />
-  </material>
-
-  <!-- Additional ZrH to replace one of the BeO reflectors -->
-  <material id="7">
-    <density value="5.90168" units="g/cm3" />
-    <nuclide name="H-1"    ao="0.3" />
-    <nuclide name="Zr-90"  ao="0.15" />
-    <nuclide name="Zr-91"  ao="0.1" />
-    <nuclide name="Zr-92"  ao="0.1" />
-    <nuclide name="Zr-94"  ao="0.05" />
-    <nuclide name="Zr-96"  ao="0.05" />
-    <nuclide name="U-235"  ao="0.1" />
-    <nuclide name="U-238"  ao="0.15" />
-    <sab name="ZrZrH" xs="71t" />
-    <sab name="HZrH" xs="71t" />
-  </material>
-
-</materials>
diff --git a/tests/test_salphabeta_multiple/results_true.dat b/tests/test_salphabeta_multiple/results_true.dat
deleted file mode 100644
index 593c5adc74..0000000000
--- a/tests/test_salphabeta_multiple/results_true.dat
+++ /dev/null
@@ -1,2 +0,0 @@
-k-combined:
-9.141547E-01 2.728809E-02
diff --git a/tests/test_salphabeta_multiple/settings.xml b/tests/test_salphabeta_multiple/settings.xml
deleted file mode 100644
index 4df1f124a6..0000000000
--- a/tests/test_salphabeta_multiple/settings.xml
+++ /dev/null
@@ -1,20 +0,0 @@
-<?xml version="1.0"?>
-<settings>
-
-  <!-- pu-met-fast-021 case 2 -->
-
-  <eigenvalue>
-    <batches>10</batches>
-    <inactive>5</inactive>
-    <particles>400</particles>
-  </eigenvalue>
-
-  <source>
-    <space>
-      <type>box</type>
-      <parameters>0 0 0 1 1 1</parameters>
-    </space>
-  </source>
-
-</settings>
-
diff --git a/tests/test_salphabeta_multiple/test_salphabeta_multiple.py b/tests/test_salphabeta_multiple/test_salphabeta_multiple.py
deleted file mode 100644
index 2a595f3e66..0000000000
--- a/tests/test_salphabeta_multiple/test_salphabeta_multiple.py
+++ /dev/null
@@ -1,11 +0,0 @@
-#!/usr/bin/env python
-
-import os
-import sys
-sys.path.insert(0, os.pardir)
-from testing_harness import TestHarness
-
-
-if __name__ == '__main__':
-    harness = TestHarness('statepoint.10.*')
-    harness.main()