From f08f012bc2fe135ca5e35b8a1ea4da3cd5b53574 Mon Sep 17 00:00:00 2001
From: Patrick Shriwise <pshriwise@gmail.com>
Date: Mon, 1 Apr 2019 18:10:35 -0500
Subject: [PATCH] Simplifying model materials and settings. Updating test
 results.

---
 .../lattice_hex_coincident/geometry.xml       | 14 +++----
 .../lattice_hex_coincident/materials.xml      | 41 +++----------------
 .../lattice_hex_coincident/results_true.dat   |  2 +-
 .../lattice_hex_coincident/settings.xml       |  6 +--
 4 files changed, 14 insertions(+), 49 deletions(-)

diff --git a/tests/regression_tests/lattice_hex_coincident/geometry.xml b/tests/regression_tests/lattice_hex_coincident/geometry.xml
index 3c31f091de..aa2d09189a 100644
--- a/tests/regression_tests/lattice_hex_coincident/geometry.xml
+++ b/tests/regression_tests/lattice_hex_coincident/geometry.xml
@@ -1,14 +1,14 @@
 <?xml version='1.0' encoding='utf-8'?>
 <geometry>
   <cell id="1" material="1" region="-1 2 -3" universe="1" />
-  <cell id="2" material="3" region="1" universe="1" />
-  <cell id="3" material="6" name="coolant" region="-4 2 -3" universe="2" />
-  <cell id="4" material="7" name="zirconium_shell" region="4 -5 2 -3" universe="2" />
-  <cell id="5" material="4" name="lead_shell" region="5 -6 2 -3" universe="2" />
-  <cell id="6" material="3" name="matrix coolant surround" region="6 2 -3" universe="2" />
-  <cell id="7" material="3" universe="3" />
+  <cell id="2" material="2" region="1" universe="1" />
+  <cell id="3" material="6" region="-4 2 -3" universe="2" />
+  <cell id="4" material="7" region="4 -5 2 -3" universe="2" />
+  <cell id="5" material="4" region="5 -6 2 -3" universe="2" />
+  <cell id="6" material="2" region="6 2 -3" universe="2" />
+  <cell id="7" material="2" universe="3" />
   <cell fill="4" id="8" name="container cell" region="-7 8 -9 10 11 -12 2 -3" universe="5" />
-  <hex_lattice id="4" n_rings="2" name="regular fuel assembly">
+  <hex_lattice id="4" n_rings="2">
     <pitch>1.4</pitch>
     <outer>3</outer>
     <center>0.0 0.0</center>
diff --git a/tests/regression_tests/lattice_hex_coincident/materials.xml b/tests/regression_tests/lattice_hex_coincident/materials.xml
index ae9743c665..164aa27fe4 100644
--- a/tests/regression_tests/lattice_hex_coincident/materials.xml
+++ b/tests/regression_tests/lattice_hex_coincident/materials.xml
@@ -1,62 +1,31 @@
 <?xml version='1.0' encoding='utf-8'?>
 <materials>
-  <material depletable="true" id="1" name="fuel1">
+  <material depletable="true" id="1">
     <density units="sum" />
     <nuclide ao="0.0049817" name="U235" />
-    <nuclide ao="0.019989" name="U238" />
-    <nuclide ao="0.037372" name="O16" />
-    <nuclide ao="0.0099659" name="C0" />
   </material>
-  <material id="2" name="matrix_pin (no boron)">
+  <material id="2">
     <density units="atom/b-cm" value="0.087742" />
     <nuclide ao="1.0" name="C0" />
     <sab name="c_Graphite" />
   </material>
-  <material id="3" name="matrix (boron)">
-    <density units="atom/b-cm" value="0.087742" />
-    <nuclide ao="0.999985" name="C0" />
-    <nuclide ao="1.5e-05" name="B10" />
-    <sab name="c_Graphite" />
-  </material>
-  <material id="4" name="Lead">
+  <material id="4">
     <density units="g/cm3" value="10.32" />
     <nuclide ao="0.014" name="Pb204" />
     <nuclide ao="0.241" name="Pb206" />
     <nuclide ao="0.221" name="Pb207" />
     <nuclide ao="0.524" name="Pb208" />
   </material>
-  <material id="5" name="intermodule">
-    <density units="atom/b-cm" value="5e-05" />
-    <nuclide ao="1.0" name="N14" />
-  </material>
-  <material id="6" name="coolant">
+  <material id="6">
     <density units="atom/b-cm" value="0.00054464" />
     <nuclide ao="1.0" name="He4" />
   </material>
-  <material id="7" name="Zirc4">
+  <material id="7">
     <density units="sum" />
-    <nuclide ao="8.549e-06" name="Fe54" />
-    <nuclide ao="0.0001294" name="Fe56" />
-    <nuclide ao="2.936e-06" name="Fe57" />
-    <nuclide ao="3.84e-07" name="Fe58" />
-    <nuclide ao="3.431e-06" name="Cr50" />
-    <nuclide ao="6.363e-05" name="Cr52" />
-    <nuclide ao="7.079e-06" name="Cr53" />
-    <nuclide ao="1.73e-06" name="Cr54" />
     <nuclide ao="0.02217" name="Zr90" />
     <nuclide ao="0.004781" name="Zr91" />
     <nuclide ao="0.007228" name="Zr92" />
     <nuclide ao="0.007169" name="Zr94" />
     <nuclide ao="0.001131" name="Zr96" />
-    <nuclide ao="5.129e-06" name="Sn112" />
-    <nuclide ao="3.428e-06" name="Sn114" />
-    <nuclide ao="1.751e-06" name="Sn115" />
-    <nuclide ao="7.423e-05" name="Sn116" />
-    <nuclide ao="3.887e-05" name="Sn117" />
-    <nuclide ao="0.0001215" name="Sn118" />
-    <nuclide ao="4.274e-05" name="Sn119" />
-    <nuclide ao="0.0001608" name="Sn120" />
-    <nuclide ao="2.247e-05" name="Sn122" />
-    <nuclide ao="2.765e-05" name="Sn124" />
   </material>
 </materials>
diff --git a/tests/regression_tests/lattice_hex_coincident/results_true.dat b/tests/regression_tests/lattice_hex_coincident/results_true.dat
index 36e8f2d479..ba047f6740 100644
--- a/tests/regression_tests/lattice_hex_coincident/results_true.dat
+++ b/tests/regression_tests/lattice_hex_coincident/results_true.dat
@@ -1,2 +1,2 @@
 k-combined:
-1.328686E+00 1.538567E-02
+1.741370E+00 1.384609E-03
diff --git a/tests/regression_tests/lattice_hex_coincident/settings.xml b/tests/regression_tests/lattice_hex_coincident/settings.xml
index 02c22e610a..0d72a853b5 100644
--- a/tests/regression_tests/lattice_hex_coincident/settings.xml
+++ b/tests/regression_tests/lattice_hex_coincident/settings.xml
@@ -12,9 +12,5 @@
   <output>
     <summary>false</summary>
   </output>
-  <seed>46</seed>
-  <temperature_method>interpolation</temperature_method>
-  <resonance_scattering>
-    <enable>true</enable>
-  </resonance_scattering>
+  <seed>22</seed>
 </settings>