From 2ed0fceb7d4eb919e8b40b870727225c69a02ea4 Mon Sep 17 00:00:00 2001
From: Sterling Harper <smharper@mit.edu>
Date: Mon, 20 Aug 2018 14:31:31 -0400
Subject: [PATCH] Make translation and rotation tests more thorough

---
 tests/regression_tests/rotation/geometry.xml        | 10 +++++-----
 tests/regression_tests/rotation/materials.xml       |  7 ++++++-
 tests/regression_tests/rotation/results_true.dat    |  2 +-
 tests/regression_tests/translation/geometry.xml     | 10 +++++-----
 tests/regression_tests/translation/materials.xml    |  7 ++++++-
 tests/regression_tests/translation/results_true.dat |  2 +-
 6 files changed, 24 insertions(+), 14 deletions(-)

diff --git a/tests/regression_tests/rotation/geometry.xml b/tests/regression_tests/rotation/geometry.xml
index 222617877..f32461706 100644
--- a/tests/regression_tests/rotation/geometry.xml
+++ b/tests/regression_tests/rotation/geometry.xml
@@ -1,11 +1,11 @@
 <?xml version="1.0"?>
 <geometry>
 
-  <surface id="1" type="sphere" coeffs="0 0 0 10" boundary="vacuum"/>
-  <surface id="2" type="z-plane" coeffs="-100" />
-  <surface id="3" type="z-plane" coeffs="100" />
+  <surface id="1" type="sphere" coeffs="0 0 0 10" boundary="vacuum" />
+  <surface id="2" type="sphere" coeffs="1 0 0 5" />
 
-  <cell id="1" fill="2" rotation="45 45 45" region="-1" />
-  <cell id="2" universe="2" material="1" region="2 -3" />
+  <cell id="1" fill="2" rotation="10 20 30" region="-1" />
+  <cell id="2" universe="2" material="1" region="-2" />
+  <cell id="3" universe="2" material="2" region="2" />
 
 </geometry>
diff --git a/tests/regression_tests/rotation/materials.xml b/tests/regression_tests/rotation/materials.xml
index 2472a7471..160c9c678 100644
--- a/tests/regression_tests/rotation/materials.xml
+++ b/tests/regression_tests/rotation/materials.xml
@@ -2,8 +2,13 @@
 <materials>
 
   <material id="1">
-    <density value="4.5" units="g/cc" />
+    <density value="10" units="g/cc" />
     <nuclide name="U235" ao="1.0" />
   </material>
 
+  <material id="2">
+    <density value="0.1" units="g/cc" />
+    <nuclide name="H1" ao="0.1" />
+  </material>
+
 </materials>
diff --git a/tests/regression_tests/rotation/results_true.dat b/tests/regression_tests/rotation/results_true.dat
index 5cb3925a6..7598a4a47 100644
--- a/tests/regression_tests/rotation/results_true.dat
+++ b/tests/regression_tests/rotation/results_true.dat
@@ -1,2 +1,2 @@
 k-combined:
-2.943619E-01 3.309646E-03
+4.240695E-01 8.013236E-03
diff --git a/tests/regression_tests/translation/geometry.xml b/tests/regression_tests/translation/geometry.xml
index e2cdf2391..6c6343865 100644
--- a/tests/regression_tests/translation/geometry.xml
+++ b/tests/regression_tests/translation/geometry.xml
@@ -1,11 +1,11 @@
 <?xml version="1.0"?>
 <geometry>
 
-  <surface id="1" type="sphere" coeffs="0 0 0 10" boundary="vacuum"/>
-  <surface id="2" type="z-plane" coeffs="-100" />
-  <surface id="3" type="z-plane" coeffs="100" />
+  <surface id="1" type="sphere" coeffs="0 0 0 10" boundary="vacuum" />
+  <surface id="2" type="sphere" coeffs="0 0 0 5" />
 
-  <cell id="1" fill="2" translation="2.3 5.0 -10.0" region="-1" />
-  <cell id="2" universe="2" material="1" region="2 -3" />
+  <cell id="1" fill="2" translation="1 2 3" region="-1" />
+  <cell id="2" universe="2" material="1" region="-2" />
+  <cell id="3" universe="2" material="2" region="2" />
 
 </geometry>
diff --git a/tests/regression_tests/translation/materials.xml b/tests/regression_tests/translation/materials.xml
index 2472a7471..160c9c678 100644
--- a/tests/regression_tests/translation/materials.xml
+++ b/tests/regression_tests/translation/materials.xml
@@ -2,8 +2,13 @@
 <materials>
 
   <material id="1">
-    <density value="4.5" units="g/cc" />
+    <density value="10" units="g/cc" />
     <nuclide name="U235" ao="1.0" />
   </material>
 
+  <material id="2">
+    <density value="0.1" units="g/cc" />
+    <nuclide name="H1" ao="0.1" />
+  </material>
+
 </materials>
diff --git a/tests/regression_tests/translation/results_true.dat b/tests/regression_tests/translation/results_true.dat
index 5cb3925a6..a50311034 100644
--- a/tests/regression_tests/translation/results_true.dat
+++ b/tests/regression_tests/translation/results_true.dat
@@ -1,2 +1,2 @@
 k-combined:
-2.943619E-01 3.309646E-03
+4.101355E-01 1.577552E-02