From 67ae0806297d127f5237f31ce39859c8b84615c1 Mon Sep 17 00:00:00 2001
From: Patrick Shriwise <pshriwise@gmail.com>
Date: Wed, 31 Mar 2021 18:26:34 -0500
Subject: [PATCH] Updating test results for new problem.

---
 tests/regression_tests/rotation/geometry.xml  | 11 ------
 .../regression_tests/rotation/inputs_true.dat | 38 +++++++++++++++++++
 tests/regression_tests/rotation/materials.xml | 14 -------
 .../rotation/results_true.dat                 |  4 ++
 tests/regression_tests/rotation/settings.xml  | 15 --------
 tests/regression_tests/rotation/test.py       |  5 ++-
 6 files changed, 46 insertions(+), 41 deletions(-)
 delete mode 100644 tests/regression_tests/rotation/geometry.xml
 create mode 100644 tests/regression_tests/rotation/inputs_true.dat
 delete mode 100644 tests/regression_tests/rotation/materials.xml
 delete mode 100644 tests/regression_tests/rotation/settings.xml

diff --git a/tests/regression_tests/rotation/geometry.xml b/tests/regression_tests/rotation/geometry.xml
deleted file mode 100644
index f324617065..0000000000
--- a/tests/regression_tests/rotation/geometry.xml
+++ /dev/null
@@ -1,11 +0,0 @@
-<?xml version="1.0"?>
-<geometry>
-
-  <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="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/inputs_true.dat b/tests/regression_tests/rotation/inputs_true.dat
new file mode 100644
index 0000000000..24b00199be
--- /dev/null
+++ b/tests/regression_tests/rotation/inputs_true.dat
@@ -0,0 +1,38 @@
+<?xml version='1.0' encoding='utf-8'?>
+<geometry>
+  <cell id="1" material="1" region="-1" universe="1" />
+  <cell id="2" material="2" region="1" universe="1" />
+  <cell fill="1" id="3" region="2 -3 4 -5 6 -8" rotation="10 20 30" universe="2" />
+  <cell fill="1" id="4" region="2 -3 4 -5 8 -7" translation="0 0 15" universe="2" />
+  <surface coeffs="1.0 0.0 0.0 5.0" id="1" type="sphere" />
+  <surface boundary="vacuum" coeffs="-7.5" id="2" name="minimum x" type="x-plane" />
+  <surface boundary="vacuum" coeffs="7.5" id="3" name="maximum x" type="x-plane" />
+  <surface boundary="vacuum" coeffs="-7.5" id="4" name="minimum y" type="y-plane" />
+  <surface boundary="vacuum" coeffs="7.5" id="5" name="maximum y" type="y-plane" />
+  <surface boundary="vacuum" coeffs="-7.5" id="6" type="z-plane" />
+  <surface boundary="vacuum" coeffs="22.5" id="7" type="z-plane" />
+  <surface coeffs="7.5" id="8" type="z-plane" />
+</geometry>
+<?xml version='1.0' encoding='utf-8'?>
+<materials>
+  <material depletable="true" id="1">
+    <density units="g/cc" value="10.0" />
+    <nuclide ao="1.0" name="U235" />
+  </material>
+  <material id="2">
+    <density units="g/cc" value="0.1" />
+    <nuclide ao="0.1" name="H1" />
+  </material>
+</materials>
+<?xml version='1.0' encoding='utf-8'?>
+<settings>
+  <run_mode>eigenvalue</run_mode>
+  <particles>10000</particles>
+  <batches>10</batches>
+  <inactive>5</inactive>
+  <source strength="1.0">
+    <space type="box">
+      <parameters>-4.0 -4.0 -4.0 4.0 4.0 4.0</parameters>
+    </space>
+  </source>
+</settings>
diff --git a/tests/regression_tests/rotation/materials.xml b/tests/regression_tests/rotation/materials.xml
deleted file mode 100644
index 160c9c6789..0000000000
--- a/tests/regression_tests/rotation/materials.xml
+++ /dev/null
@@ -1,14 +0,0 @@
-<?xml version="1.0"?>
-<materials>
-
-  <material id="1">
-    <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 f4a3cfcccb..f0e7868a01 100644
--- a/tests/regression_tests/rotation/results_true.dat
+++ b/tests/regression_tests/rotation/results_true.dat
@@ -1,2 +1,6 @@
 k-combined:
+<<<<<<< HEAD
 4.132181E-01 1.130226E-02
+=======
+4.453328E-01 5.918369E-03
+>>>>>>> Updating test results for new problem.
diff --git a/tests/regression_tests/rotation/settings.xml b/tests/regression_tests/rotation/settings.xml
deleted file mode 100644
index 70b4e802f8..0000000000
--- a/tests/regression_tests/rotation/settings.xml
+++ /dev/null
@@ -1,15 +0,0 @@
-<?xml version="1.0"?>
-<settings>
-
-  <run_mode>eigenvalue</run_mode>
-  <batches>10</batches>
-  <inactive>5</inactive>
-  <particles>1000</particles>
-
-  <source>
-    <space type="box">
-      <parameters>-4 -4 -4  4  4  4</parameters>
-    </space>
-  </source>
-
-</settings>
diff --git a/tests/regression_tests/rotation/test.py b/tests/regression_tests/rotation/test.py
index 4a4526342e..7a59ce2000 100644
--- a/tests/regression_tests/rotation/test.py
+++ b/tests/regression_tests/rotation/test.py
@@ -1,4 +1,7 @@
-from tests.testing_harness import TestHarness
+import pytest
+import openmc
+
+from tests.testing_harness import PyAPITestHarness
 
 
 @pytest.fixture