From 205eaf9760a68c503dfe28729c2822a0ae70e888 Mon Sep 17 00:00:00 2001 From: Sam Shaner Date: Mon, 19 Sep 2016 12:40:53 -0400 Subject: [PATCH] condensed mesh filter tests into one and changed to use the python api --- tests/test_filter_mesh/inputs_true.dat | 1 + tests/test_filter_mesh/results_true.dat | 1 + tests/test_filter_mesh/test_filter_mesh.py | 91 ++++++ tests/test_filter_mesh_1d/geometry.xml | 181 ------------ tests/test_filter_mesh_1d/materials.xml | 272 ------------------ tests/test_filter_mesh_1d/results_true.dat | 174 ----------- tests/test_filter_mesh_1d/settings.xml | 19 -- tests/test_filter_mesh_1d/tallies.xml | 21 -- .../test_filter_mesh_1d.py | 11 - tests/test_filter_mesh_2d/geometry.xml | 181 ------------ tests/test_filter_mesh_2d/materials.xml | 270 ----------------- tests/test_filter_mesh_2d/results_true.dat | 1 - tests/test_filter_mesh_2d/settings.xml | 19 -- tests/test_filter_mesh_2d/tallies.xml | 21 -- .../test_filter_mesh_2d.py | 11 - tests/test_filter_mesh_3d/geometry.xml | 181 ------------ tests/test_filter_mesh_3d/materials.xml | 270 ----------------- tests/test_filter_mesh_3d/results_true.dat | 1 - tests/test_filter_mesh_3d/settings.xml | 19 -- tests/test_filter_mesh_3d/tallies.xml | 21 -- .../test_filter_mesh_3d.py | 11 - tests/testing_harness.py | 7 + 22 files changed, 100 insertions(+), 1684 deletions(-) create mode 100644 tests/test_filter_mesh/inputs_true.dat create mode 100644 tests/test_filter_mesh/results_true.dat create mode 100644 tests/test_filter_mesh/test_filter_mesh.py delete mode 100644 tests/test_filter_mesh_1d/geometry.xml delete mode 100644 tests/test_filter_mesh_1d/materials.xml delete mode 100644 tests/test_filter_mesh_1d/results_true.dat delete mode 100644 tests/test_filter_mesh_1d/settings.xml delete mode 100644 tests/test_filter_mesh_1d/tallies.xml delete mode 100644 tests/test_filter_mesh_1d/test_filter_mesh_1d.py delete mode 100644 tests/test_filter_mesh_2d/geometry.xml delete mode 100644 tests/test_filter_mesh_2d/materials.xml delete mode 100644 tests/test_filter_mesh_2d/results_true.dat delete mode 100644 tests/test_filter_mesh_2d/settings.xml delete mode 100644 tests/test_filter_mesh_2d/tallies.xml delete mode 100644 tests/test_filter_mesh_2d/test_filter_mesh_2d.py delete mode 100644 tests/test_filter_mesh_3d/geometry.xml delete mode 100644 tests/test_filter_mesh_3d/materials.xml delete mode 100644 tests/test_filter_mesh_3d/results_true.dat delete mode 100644 tests/test_filter_mesh_3d/settings.xml delete mode 100644 tests/test_filter_mesh_3d/tallies.xml delete mode 100644 tests/test_filter_mesh_3d/test_filter_mesh_3d.py diff --git a/tests/test_filter_mesh/inputs_true.dat b/tests/test_filter_mesh/inputs_true.dat new file mode 100644 index 0000000000..b683ebaeb0 --- /dev/null +++ b/tests/test_filter_mesh/inputs_true.dat @@ -0,0 +1 @@ +5a9e65b8a8c9d7c575fc48c5d289bbc805739729a33d83aa79985473d83c8cc3a0c7dad8e95221090917c35ac4842667c8c9daecd06dc6b909a92475f5083753 \ No newline at end of file diff --git a/tests/test_filter_mesh/results_true.dat b/tests/test_filter_mesh/results_true.dat new file mode 100644 index 0000000000..2cc3c9532b --- /dev/null +++ b/tests/test_filter_mesh/results_true.dat @@ -0,0 +1 @@ +89387dd9e5b962c773e1782ff829846968dc456d899963f5dd98761fbde73a3f81676717ff3599bc26a1b77247826c38756735a9b2b329b80ad66286a62bd3f9 \ No newline at end of file diff --git a/tests/test_filter_mesh/test_filter_mesh.py b/tests/test_filter_mesh/test_filter_mesh.py new file mode 100644 index 0000000000..ab57f265dc --- /dev/null +++ b/tests/test_filter_mesh/test_filter_mesh.py @@ -0,0 +1,91 @@ +#!/usr/bin/env python + +import os +import sys +import glob +import hashlib +sys.path.insert(0, os.pardir) +from testing_harness import HashedPyAPITestHarness +import openmc + + +class FilterMeshTestHarness(HashedPyAPITestHarness): + def _build_inputs(self): + + # The summary.h5 file needs to be created to read in the tallies + self._input_set.settings.output = {'summary': True} + + # Initialize the tallies file + tallies_file = openmc.Tallies() + + # Initialize Meshes + mesh_1d = openmc.Mesh(mesh_id=1) + mesh_1d.type = 'regular' + mesh_1d.dimension = [17] + mesh_1d.lower_left = [-182.07] + mesh_1d.upper_right = [182.07] + + mesh_2d = openmc.Mesh(mesh_id=2) + mesh_2d.type = 'regular' + mesh_2d.dimension = [17, 17] + mesh_2d.lower_left = [-182.07, -182.07] + mesh_2d.upper_right = [182.07, 182.07] + + mesh_3d = openmc.Mesh(mesh_id=3) + mesh_3d.type = 'regular' + mesh_3d.dimension = [17, 17, 17] + mesh_3d.lower_left = [-182.07, -182.07, -183.00] + mesh_3d.upper_right = [182.07, 182.07, 183.00] + + # Initialize the filters + mesh_1d_filter = openmc.Filter(type='mesh') + mesh_2d_filter = openmc.Filter(type='mesh') + mesh_3d_filter = openmc.Filter(type='mesh') + mesh_1d_filter.mesh = mesh_1d + mesh_2d_filter.mesh = mesh_2d + mesh_3d_filter.mesh = mesh_3d + + # Initialized the tallies + tally = openmc.Tally(name='tally 1') + tally.filters = [mesh_1d_filter] + tally.scores = ['total'] + tallies_file.append(tally) + + tally = openmc.Tally(name='tally 2') + tally.filters = [mesh_1d_filter] + tally.scores = ['current'] + tallies_file.append(tally) + + tally = openmc.Tally(name='tally 3') + tally.filters = [mesh_2d_filter] + tally.scores = ['total'] + tallies_file.append(tally) + + tally = openmc.Tally(name='tally 4') + tally.filters = [mesh_2d_filter] + tally.scores = ['current'] + tallies_file.append(tally) + + tally = openmc.Tally(name='tally 5') + tally.filters = [mesh_3d_filter] + tally.scores = ['total'] + tallies_file.append(tally) + + tally = openmc.Tally(name='tally 6') + tally.filters = [mesh_3d_filter] + tally.scores = ['current'] + tallies_file.append(tally) + + # Export tallies to file + self._input_set.tallies = tallies_file + super(FilterMeshTestHarness, self)._build_inputs() + + def _cleanup(self): + super(FilterMeshTestHarness, self)._cleanup() + f = os.path.join(os.getcwd(), 'tallies.xml') + if os.path.exists(f): os.remove(f) + + +if __name__ == '__main__': + harness = FilterMeshTestHarness('statepoint.10.*', True) + harness.main() diff --git a/tests/test_filter_mesh_1d/geometry.xml b/tests/test_filter_mesh_1d/geometry.xml deleted file mode 100644 index f6f067aadd..0000000000 --- a/tests/test_filter_mesh_1d/geometry.xml +++ /dev/null @@ -1,181 +0,0 @@ - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - 17 17 - -10.71 -10.71 - 1.26 1.26 - - 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 - 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 - 1 1 1 1 1 2 1 1 2 1 1 2 1 1 1 1 1 - 1 1 1 2 1 1 1 1 1 1 1 1 1 2 1 1 1 - 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 - 1 1 2 1 1 2 1 1 2 1 1 2 1 1 2 1 1 - 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 - 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 - 1 1 2 1 1 2 1 1 2 1 1 2 1 1 2 1 1 - 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 - 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 - 1 1 2 1 1 2 1 1 2 1 1 2 1 1 2 1 1 - 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 - 1 1 1 2 1 1 1 1 1 1 1 1 1 2 1 1 1 - 1 1 1 1 1 2 1 1 2 1 1 2 1 1 1 1 1 - 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 - 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 - - - - - - 17 17 - -10.71 -10.71 - 1.26 1.26 - - 3 3 3 3 3 3 3 3 3 3 3 3 3 3 3 3 3 - 3 3 3 3 3 3 3 3 3 3 3 3 3 3 3 3 3 - 3 3 3 3 3 4 3 3 4 3 3 4 3 3 3 3 3 - 3 3 3 4 3 3 3 3 3 3 3 3 3 4 3 3 3 - 3 3 3 3 3 3 3 3 3 3 3 3 3 3 3 3 3 - 3 3 4 3 3 4 3 3 4 3 3 4 3 3 4 3 3 - 3 3 3 3 3 3 3 3 3 3 3 3 3 3 3 3 3 - 3 3 3 3 3 3 3 3 3 3 3 3 3 3 3 3 3 - 3 3 4 3 3 4 3 3 4 3 3 4 3 3 4 3 3 - 3 3 3 3 3 3 3 3 3 3 3 3 3 3 3 3 3 - 3 3 3 3 3 3 3 3 3 3 3 3 3 3 3 3 3 - 3 3 4 3 3 4 3 3 4 3 3 4 3 3 4 3 3 - 3 3 3 3 3 3 3 3 3 3 3 3 3 3 3 3 3 - 3 3 3 4 3 3 3 3 3 3 3 3 3 4 3 3 3 - 3 3 3 3 3 4 3 3 4 3 3 4 3 3 3 3 3 - 3 3 3 3 3 3 3 3 3 3 3 3 3 3 3 3 3 - 3 3 3 3 3 3 3 3 3 3 3 3 3 3 3 3 3 - - - - - - 21 21 - -224.91 -224.91 - 21.42 21.42 - - 5 5 5 5 5 5 5 5 5 5 5 5 5 5 5 5 5 5 5 5 5 - 5 5 5 5 5 5 5 5 5 5 5 5 5 5 5 5 5 5 5 5 5 - 5 5 5 5 5 5 5 6 6 6 6 6 6 6 5 5 5 5 5 5 5 - 5 5 5 5 5 6 6 6 6 6 6 6 6 6 6 6 5 5 5 5 5 - 5 5 5 5 6 6 6 6 6 6 6 6 6 6 6 6 6 5 5 5 5 - 5 5 5 6 6 6 6 6 6 6 6 6 6 6 6 6 6 6 5 5 5 - 5 5 5 6 6 6 6 6 6 6 6 6 6 6 6 6 6 6 5 5 5 - 5 5 6 6 6 6 6 6 6 6 6 6 6 6 6 6 6 6 6 5 5 - 5 5 6 6 6 6 6 6 6 6 6 6 6 6 6 6 6 6 6 5 5 - 5 5 6 6 6 6 6 6 6 6 6 6 6 6 6 6 6 6 6 5 5 - 5 5 6 6 6 6 6 6 6 6 6 6 6 6 6 6 6 6 6 5 5 - 5 5 6 6 6 6 6 6 6 6 6 6 6 6 6 6 6 6 6 5 5 - 5 5 6 6 6 6 6 6 6 6 6 6 6 6 6 6 6 6 6 5 5 - 5 5 6 6 6 6 6 6 6 6 6 6 6 6 6 6 6 6 6 5 5 - 5 5 5 6 6 6 6 6 6 6 6 6 6 6 6 6 6 6 5 5 5 - 5 5 5 6 6 6 6 6 6 6 6 6 6 6 6 6 6 6 5 5 5 - 5 5 5 5 6 6 6 6 6 6 6 6 6 6 6 6 6 5 5 5 5 - 5 5 5 5 5 6 6 6 6 6 6 6 6 6 6 6 5 5 5 5 5 - 5 5 5 5 5 5 5 6 6 6 6 6 6 6 5 5 5 5 5 5 5 - 5 5 5 5 5 5 5 5 5 5 5 5 5 5 5 5 5 5 5 5 5 - 5 5 5 5 5 5 5 5 5 5 5 5 5 5 5 5 5 5 5 5 5 - - - - - - 21 21 - -224.91 -224.91 - 21.42 21.42 - - 7 7 7 7 7 7 7 7 7 7 7 7 7 7 7 7 7 7 7 7 7 - 7 7 7 7 7 7 7 7 7 7 7 7 7 7 7 7 7 7 7 7 7 - 7 7 7 7 7 7 7 8 8 8 8 8 8 8 7 7 7 7 7 7 7 - 7 7 7 7 7 8 8 8 8 8 8 8 8 8 8 8 7 7 7 7 7 - 7 7 7 7 8 8 8 8 8 8 8 8 8 8 8 8 8 7 7 7 7 - 7 7 7 8 8 8 8 8 8 8 8 8 8 8 8 8 8 8 7 7 7 - 7 7 7 8 8 8 8 8 8 8 8 8 8 8 8 8 8 8 7 7 7 - 7 7 8 8 8 8 8 8 8 8 8 8 8 8 8 8 8 8 8 7 7 - 7 7 8 8 8 8 8 8 8 8 8 8 8 8 8 8 8 8 8 7 7 - 7 7 8 8 8 8 8 8 8 8 8 8 8 8 8 8 8 8 8 7 7 - 7 7 8 8 8 8 8 8 8 8 8 8 8 8 8 8 8 8 8 7 7 - 7 7 8 8 8 8 8 8 8 8 8 8 8 8 8 8 8 8 8 7 7 - 7 7 8 8 8 8 8 8 8 8 8 8 8 8 8 8 8 8 8 7 7 - 7 7 8 8 8 8 8 8 8 8 8 8 8 8 8 8 8 8 8 7 7 - 7 7 7 8 8 8 8 8 8 8 8 8 8 8 8 8 8 8 7 7 7 - 7 7 7 8 8 8 8 8 8 8 8 8 8 8 8 8 8 8 7 7 7 - 7 7 7 7 8 8 8 8 8 8 8 8 8 8 8 8 8 7 7 7 7 - 7 7 7 7 7 8 8 8 8 8 8 8 8 8 8 8 7 7 7 7 7 - 7 7 7 7 7 7 7 8 8 8 8 8 8 8 7 7 7 7 7 7 7 - 7 7 7 7 7 7 7 7 7 7 7 7 7 7 7 7 7 7 7 7 7 - 7 7 7 7 7 7 7 7 7 7 7 7 7 7 7 7 7 7 7 7 7 - - - - diff --git a/tests/test_filter_mesh_1d/materials.xml b/tests/test_filter_mesh_1d/materials.xml deleted file mode 100644 index f5a9e61bea..0000000000 --- a/tests/test_filter_mesh_1d/materials.xml +++ /dev/null @@ -1,272 +0,0 @@ - - - - 71c - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - diff --git a/tests/test_filter_mesh_1d/results_true.dat b/tests/test_filter_mesh_1d/results_true.dat deleted file mode 100644 index b1ed402f69..0000000000 --- a/tests/test_filter_mesh_1d/results_true.dat +++ /dev/null @@ -1,174 +0,0 @@ -k-combined: -9.581522E-01 4.261830E-02 -tally 1: -0.000000E+00 -0.000000E+00 -2.478640E-01 -6.143655E-02 -5.333571E+00 -7.576807E+00 -1.835243E+01 -7.767570E+01 -7.645679E+00 -1.417005E+01 -1.089665E+01 -2.529337E+01 -1.039660E+01 -2.336163E+01 -1.058091E+01 -2.339532E+01 -1.533977E+01 -4.881187E+01 -2.336757E+01 -1.136090E+02 -2.005142E+01 -9.280736E+01 -6.391589E+00 -8.560759E+00 -4.529351E-01 -1.762625E-01 -5.583971E-01 -1.790554E-01 -1.642981E+00 -1.466963E+00 -5.214580E-02 -2.719184E-03 -0.000000E+00 -0.000000E+00 -tally 2: -0.000000E+00 -0.000000E+00 -0.000000E+00 -0.000000E+00 -0.000000E+00 -0.000000E+00 -0.000000E+00 -0.000000E+00 -0.000000E+00 -0.000000E+00 -0.000000E+00 -0.000000E+00 -4.000000E-02 -1.600000E-03 -5.000000E-02 -2.500000E-03 -5.000000E-02 -2.500000E-03 -4.000000E-02 -1.600000E-03 -2.500000E-01 -1.790000E-02 -3.300000E-01 -2.630000E-02 -3.300000E-01 -2.630000E-02 -2.500000E-01 -1.790000E-02 -3.000000E-01 -2.140000E-02 -2.400000E-01 -1.340000E-02 -2.400000E-01 -1.340000E-02 -3.000000E-01 -2.140000E-02 -9.000000E-02 -3.300000E-03 -1.100000E-01 -3.300000E-03 -1.100000E-01 -3.300000E-03 -9.000000E-02 -3.300000E-03 -1.600000E-01 -7.400000E-03 -2.200000E-01 -1.240000E-02 -2.200000E-01 -1.240000E-02 -1.600000E-01 -7.400000E-03 -1.000000E-01 -3.000000E-03 -8.000000E-02 -1.400000E-03 -8.000000E-02 -1.400000E-03 -1.000000E-01 -3.000000E-03 -1.900000E-01 -8.700000E-03 -2.800000E-01 -1.820000E-02 -2.800000E-01 -1.820000E-02 -1.900000E-01 -8.700000E-03 -5.600000E-01 -6.740000E-02 -7.100000E-01 -1.083000E-01 -7.100000E-01 -1.083000E-01 -5.600000E-01 -6.740000E-02 -4.500000E-01 -5.550000E-02 -4.100000E-01 -4.150000E-02 -4.100000E-01 -4.150000E-02 -4.500000E-01 -5.550000E-02 -4.100000E-01 -3.550000E-02 -2.900000E-01 -1.970000E-02 -2.900000E-01 -1.970000E-02 -4.100000E-01 -3.550000E-02 -3.000000E-02 -5.000000E-04 -2.000000E-02 -4.000000E-04 -2.000000E-02 -4.000000E-04 -3.000000E-02 -5.000000E-04 -0.000000E+00 -0.000000E+00 -0.000000E+00 -0.000000E+00 -0.000000E+00 -0.000000E+00 -0.000000E+00 -0.000000E+00 -1.000000E-02 -1.000000E-04 -2.000000E-02 -2.000000E-04 -2.000000E-02 -2.000000E-04 -1.000000E-02 -1.000000E-04 -2.000000E-02 -4.000000E-04 -1.000000E-02 -1.000000E-04 -1.000000E-02 -1.000000E-04 -2.000000E-02 -4.000000E-04 -0.000000E+00 -0.000000E+00 -0.000000E+00 -0.000000E+00 -0.000000E+00 -0.000000E+00 -0.000000E+00 -0.000000E+00 -0.000000E+00 -0.000000E+00 -0.000000E+00 -0.000000E+00 diff --git a/tests/test_filter_mesh_1d/settings.xml b/tests/test_filter_mesh_1d/settings.xml deleted file mode 100644 index 517637a59f..0000000000 --- a/tests/test_filter_mesh_1d/settings.xml +++ /dev/null @@ -1,19 +0,0 @@ - - - - - 10 - 5 - 100 - - - - - - -160 -160 -183 - 160 160 183 - - - - - diff --git a/tests/test_filter_mesh_1d/tallies.xml b/tests/test_filter_mesh_1d/tallies.xml deleted file mode 100644 index 488b81e872..0000000000 --- a/tests/test_filter_mesh_1d/tallies.xml +++ /dev/null @@ -1,21 +0,0 @@ - - - - - regular - -182.07 - 182.07 - 17 - - - - - total - - - - - current - - - diff --git a/tests/test_filter_mesh_1d/test_filter_mesh_1d.py b/tests/test_filter_mesh_1d/test_filter_mesh_1d.py deleted file mode 100644 index ed6addec45..0000000000 --- a/tests/test_filter_mesh_1d/test_filter_mesh_1d.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.*', True) - harness.main() diff --git a/tests/test_filter_mesh_2d/geometry.xml b/tests/test_filter_mesh_2d/geometry.xml deleted file mode 100644 index f6f067aadd..0000000000 --- a/tests/test_filter_mesh_2d/geometry.xml +++ /dev/null @@ -1,181 +0,0 @@ - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - 17 17 - -10.71 -10.71 - 1.26 1.26 - - 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 - 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 - 1 1 1 1 1 2 1 1 2 1 1 2 1 1 1 1 1 - 1 1 1 2 1 1 1 1 1 1 1 1 1 2 1 1 1 - 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 - 1 1 2 1 1 2 1 1 2 1 1 2 1 1 2 1 1 - 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 - 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 - 1 1 2 1 1 2 1 1 2 1 1 2 1 1 2 1 1 - 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 - 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 - 1 1 2 1 1 2 1 1 2 1 1 2 1 1 2 1 1 - 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 - 1 1 1 2 1 1 1 1 1 1 1 1 1 2 1 1 1 - 1 1 1 1 1 2 1 1 2 1 1 2 1 1 1 1 1 - 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 - 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 - - - - - - 17 17 - -10.71 -10.71 - 1.26 1.26 - - 3 3 3 3 3 3 3 3 3 3 3 3 3 3 3 3 3 - 3 3 3 3 3 3 3 3 3 3 3 3 3 3 3 3 3 - 3 3 3 3 3 4 3 3 4 3 3 4 3 3 3 3 3 - 3 3 3 4 3 3 3 3 3 3 3 3 3 4 3 3 3 - 3 3 3 3 3 3 3 3 3 3 3 3 3 3 3 3 3 - 3 3 4 3 3 4 3 3 4 3 3 4 3 3 4 3 3 - 3 3 3 3 3 3 3 3 3 3 3 3 3 3 3 3 3 - 3 3 3 3 3 3 3 3 3 3 3 3 3 3 3 3 3 - 3 3 4 3 3 4 3 3 4 3 3 4 3 3 4 3 3 - 3 3 3 3 3 3 3 3 3 3 3 3 3 3 3 3 3 - 3 3 3 3 3 3 3 3 3 3 3 3 3 3 3 3 3 - 3 3 4 3 3 4 3 3 4 3 3 4 3 3 4 3 3 - 3 3 3 3 3 3 3 3 3 3 3 3 3 3 3 3 3 - 3 3 3 4 3 3 3 3 3 3 3 3 3 4 3 3 3 - 3 3 3 3 3 4 3 3 4 3 3 4 3 3 3 3 3 - 3 3 3 3 3 3 3 3 3 3 3 3 3 3 3 3 3 - 3 3 3 3 3 3 3 3 3 3 3 3 3 3 3 3 3 - - - - - - 21 21 - -224.91 -224.91 - 21.42 21.42 - - 5 5 5 5 5 5 5 5 5 5 5 5 5 5 5 5 5 5 5 5 5 - 5 5 5 5 5 5 5 5 5 5 5 5 5 5 5 5 5 5 5 5 5 - 5 5 5 5 5 5 5 6 6 6 6 6 6 6 5 5 5 5 5 5 5 - 5 5 5 5 5 6 6 6 6 6 6 6 6 6 6 6 5 5 5 5 5 - 5 5 5 5 6 6 6 6 6 6 6 6 6 6 6 6 6 5 5 5 5 - 5 5 5 6 6 6 6 6 6 6 6 6 6 6 6 6 6 6 5 5 5 - 5 5 5 6 6 6 6 6 6 6 6 6 6 6 6 6 6 6 5 5 5 - 5 5 6 6 6 6 6 6 6 6 6 6 6 6 6 6 6 6 6 5 5 - 5 5 6 6 6 6 6 6 6 6 6 6 6 6 6 6 6 6 6 5 5 - 5 5 6 6 6 6 6 6 6 6 6 6 6 6 6 6 6 6 6 5 5 - 5 5 6 6 6 6 6 6 6 6 6 6 6 6 6 6 6 6 6 5 5 - 5 5 6 6 6 6 6 6 6 6 6 6 6 6 6 6 6 6 6 5 5 - 5 5 6 6 6 6 6 6 6 6 6 6 6 6 6 6 6 6 6 5 5 - 5 5 6 6 6 6 6 6 6 6 6 6 6 6 6 6 6 6 6 5 5 - 5 5 5 6 6 6 6 6 6 6 6 6 6 6 6 6 6 6 5 5 5 - 5 5 5 6 6 6 6 6 6 6 6 6 6 6 6 6 6 6 5 5 5 - 5 5 5 5 6 6 6 6 6 6 6 6 6 6 6 6 6 5 5 5 5 - 5 5 5 5 5 6 6 6 6 6 6 6 6 6 6 6 5 5 5 5 5 - 5 5 5 5 5 5 5 6 6 6 6 6 6 6 5 5 5 5 5 5 5 - 5 5 5 5 5 5 5 5 5 5 5 5 5 5 5 5 5 5 5 5 5 - 5 5 5 5 5 5 5 5 5 5 5 5 5 5 5 5 5 5 5 5 5 - - - - - - 21 21 - -224.91 -224.91 - 21.42 21.42 - - 7 7 7 7 7 7 7 7 7 7 7 7 7 7 7 7 7 7 7 7 7 - 7 7 7 7 7 7 7 7 7 7 7 7 7 7 7 7 7 7 7 7 7 - 7 7 7 7 7 7 7 8 8 8 8 8 8 8 7 7 7 7 7 7 7 - 7 7 7 7 7 8 8 8 8 8 8 8 8 8 8 8 7 7 7 7 7 - 7 7 7 7 8 8 8 8 8 8 8 8 8 8 8 8 8 7 7 7 7 - 7 7 7 8 8 8 8 8 8 8 8 8 8 8 8 8 8 8 7 7 7 - 7 7 7 8 8 8 8 8 8 8 8 8 8 8 8 8 8 8 7 7 7 - 7 7 8 8 8 8 8 8 8 8 8 8 8 8 8 8 8 8 8 7 7 - 7 7 8 8 8 8 8 8 8 8 8 8 8 8 8 8 8 8 8 7 7 - 7 7 8 8 8 8 8 8 8 8 8 8 8 8 8 8 8 8 8 7 7 - 7 7 8 8 8 8 8 8 8 8 8 8 8 8 8 8 8 8 8 7 7 - 7 7 8 8 8 8 8 8 8 8 8 8 8 8 8 8 8 8 8 7 7 - 7 7 8 8 8 8 8 8 8 8 8 8 8 8 8 8 8 8 8 7 7 - 7 7 8 8 8 8 8 8 8 8 8 8 8 8 8 8 8 8 8 7 7 - 7 7 7 8 8 8 8 8 8 8 8 8 8 8 8 8 8 8 7 7 7 - 7 7 7 8 8 8 8 8 8 8 8 8 8 8 8 8 8 8 7 7 7 - 7 7 7 7 8 8 8 8 8 8 8 8 8 8 8 8 8 7 7 7 7 - 7 7 7 7 7 8 8 8 8 8 8 8 8 8 8 8 7 7 7 7 7 - 7 7 7 7 7 7 7 8 8 8 8 8 8 8 7 7 7 7 7 7 7 - 7 7 7 7 7 7 7 7 7 7 7 7 7 7 7 7 7 7 7 7 7 - 7 7 7 7 7 7 7 7 7 7 7 7 7 7 7 7 7 7 7 7 7 - - - - diff --git a/tests/test_filter_mesh_2d/materials.xml b/tests/test_filter_mesh_2d/materials.xml deleted file mode 100644 index 8021f5f99e..0000000000 --- a/tests/test_filter_mesh_2d/materials.xml +++ /dev/null @@ -1,270 +0,0 @@ - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - diff --git a/tests/test_filter_mesh_2d/results_true.dat b/tests/test_filter_mesh_2d/results_true.dat deleted file mode 100644 index 27afaa45f1..0000000000 --- a/tests/test_filter_mesh_2d/results_true.dat +++ /dev/null @@ -1 +0,0 @@ -7514c8f3843e4b2160017558e9d2f90214abeaad68b1229619f3b109cdffd783f5d69a54f3193972158f20fc017875313ec78b9bb3f7709990733202b653a68a \ No newline at end of file diff --git a/tests/test_filter_mesh_2d/settings.xml b/tests/test_filter_mesh_2d/settings.xml deleted file mode 100644 index 517637a59f..0000000000 --- a/tests/test_filter_mesh_2d/settings.xml +++ /dev/null @@ -1,19 +0,0 @@ - - - - - 10 - 5 - 100 - - - - - - -160 -160 -183 - 160 160 183 - - - - - diff --git a/tests/test_filter_mesh_2d/tallies.xml b/tests/test_filter_mesh_2d/tallies.xml deleted file mode 100644 index 58089c554d..0000000000 --- a/tests/test_filter_mesh_2d/tallies.xml +++ /dev/null @@ -1,21 +0,0 @@ - - - - - regular - -182.07 -182.07 - 182.07 182.07 - 17 17 - - - - - total - - - - - current - - - diff --git a/tests/test_filter_mesh_2d/test_filter_mesh_2d.py b/tests/test_filter_mesh_2d/test_filter_mesh_2d.py deleted file mode 100644 index 99c2981c2a..0000000000 --- a/tests/test_filter_mesh_2d/test_filter_mesh_2d.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 HashedTestHarness - - -if __name__ == '__main__': - harness = HashedTestHarness('statepoint.10.*', True) - harness.main() diff --git a/tests/test_filter_mesh_3d/geometry.xml b/tests/test_filter_mesh_3d/geometry.xml deleted file mode 100644 index f6f067aadd..0000000000 --- a/tests/test_filter_mesh_3d/geometry.xml +++ /dev/null @@ -1,181 +0,0 @@ - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - 17 17 - -10.71 -10.71 - 1.26 1.26 - - 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 - 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 - 1 1 1 1 1 2 1 1 2 1 1 2 1 1 1 1 1 - 1 1 1 2 1 1 1 1 1 1 1 1 1 2 1 1 1 - 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 - 1 1 2 1 1 2 1 1 2 1 1 2 1 1 2 1 1 - 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 - 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 - 1 1 2 1 1 2 1 1 2 1 1 2 1 1 2 1 1 - 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 - 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 - 1 1 2 1 1 2 1 1 2 1 1 2 1 1 2 1 1 - 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 - 1 1 1 2 1 1 1 1 1 1 1 1 1 2 1 1 1 - 1 1 1 1 1 2 1 1 2 1 1 2 1 1 1 1 1 - 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 - 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 - - - - - - 17 17 - -10.71 -10.71 - 1.26 1.26 - - 3 3 3 3 3 3 3 3 3 3 3 3 3 3 3 3 3 - 3 3 3 3 3 3 3 3 3 3 3 3 3 3 3 3 3 - 3 3 3 3 3 4 3 3 4 3 3 4 3 3 3 3 3 - 3 3 3 4 3 3 3 3 3 3 3 3 3 4 3 3 3 - 3 3 3 3 3 3 3 3 3 3 3 3 3 3 3 3 3 - 3 3 4 3 3 4 3 3 4 3 3 4 3 3 4 3 3 - 3 3 3 3 3 3 3 3 3 3 3 3 3 3 3 3 3 - 3 3 3 3 3 3 3 3 3 3 3 3 3 3 3 3 3 - 3 3 4 3 3 4 3 3 4 3 3 4 3 3 4 3 3 - 3 3 3 3 3 3 3 3 3 3 3 3 3 3 3 3 3 - 3 3 3 3 3 3 3 3 3 3 3 3 3 3 3 3 3 - 3 3 4 3 3 4 3 3 4 3 3 4 3 3 4 3 3 - 3 3 3 3 3 3 3 3 3 3 3 3 3 3 3 3 3 - 3 3 3 4 3 3 3 3 3 3 3 3 3 4 3 3 3 - 3 3 3 3 3 4 3 3 4 3 3 4 3 3 3 3 3 - 3 3 3 3 3 3 3 3 3 3 3 3 3 3 3 3 3 - 3 3 3 3 3 3 3 3 3 3 3 3 3 3 3 3 3 - - - - - - 21 21 - -224.91 -224.91 - 21.42 21.42 - - 5 5 5 5 5 5 5 5 5 5 5 5 5 5 5 5 5 5 5 5 5 - 5 5 5 5 5 5 5 5 5 5 5 5 5 5 5 5 5 5 5 5 5 - 5 5 5 5 5 5 5 6 6 6 6 6 6 6 5 5 5 5 5 5 5 - 5 5 5 5 5 6 6 6 6 6 6 6 6 6 6 6 5 5 5 5 5 - 5 5 5 5 6 6 6 6 6 6 6 6 6 6 6 6 6 5 5 5 5 - 5 5 5 6 6 6 6 6 6 6 6 6 6 6 6 6 6 6 5 5 5 - 5 5 5 6 6 6 6 6 6 6 6 6 6 6 6 6 6 6 5 5 5 - 5 5 6 6 6 6 6 6 6 6 6 6 6 6 6 6 6 6 6 5 5 - 5 5 6 6 6 6 6 6 6 6 6 6 6 6 6 6 6 6 6 5 5 - 5 5 6 6 6 6 6 6 6 6 6 6 6 6 6 6 6 6 6 5 5 - 5 5 6 6 6 6 6 6 6 6 6 6 6 6 6 6 6 6 6 5 5 - 5 5 6 6 6 6 6 6 6 6 6 6 6 6 6 6 6 6 6 5 5 - 5 5 6 6 6 6 6 6 6 6 6 6 6 6 6 6 6 6 6 5 5 - 5 5 6 6 6 6 6 6 6 6 6 6 6 6 6 6 6 6 6 5 5 - 5 5 5 6 6 6 6 6 6 6 6 6 6 6 6 6 6 6 5 5 5 - 5 5 5 6 6 6 6 6 6 6 6 6 6 6 6 6 6 6 5 5 5 - 5 5 5 5 6 6 6 6 6 6 6 6 6 6 6 6 6 5 5 5 5 - 5 5 5 5 5 6 6 6 6 6 6 6 6 6 6 6 5 5 5 5 5 - 5 5 5 5 5 5 5 6 6 6 6 6 6 6 5 5 5 5 5 5 5 - 5 5 5 5 5 5 5 5 5 5 5 5 5 5 5 5 5 5 5 5 5 - 5 5 5 5 5 5 5 5 5 5 5 5 5 5 5 5 5 5 5 5 5 - - - - - - 21 21 - -224.91 -224.91 - 21.42 21.42 - - 7 7 7 7 7 7 7 7 7 7 7 7 7 7 7 7 7 7 7 7 7 - 7 7 7 7 7 7 7 7 7 7 7 7 7 7 7 7 7 7 7 7 7 - 7 7 7 7 7 7 7 8 8 8 8 8 8 8 7 7 7 7 7 7 7 - 7 7 7 7 7 8 8 8 8 8 8 8 8 8 8 8 7 7 7 7 7 - 7 7 7 7 8 8 8 8 8 8 8 8 8 8 8 8 8 7 7 7 7 - 7 7 7 8 8 8 8 8 8 8 8 8 8 8 8 8 8 8 7 7 7 - 7 7 7 8 8 8 8 8 8 8 8 8 8 8 8 8 8 8 7 7 7 - 7 7 8 8 8 8 8 8 8 8 8 8 8 8 8 8 8 8 8 7 7 - 7 7 8 8 8 8 8 8 8 8 8 8 8 8 8 8 8 8 8 7 7 - 7 7 8 8 8 8 8 8 8 8 8 8 8 8 8 8 8 8 8 7 7 - 7 7 8 8 8 8 8 8 8 8 8 8 8 8 8 8 8 8 8 7 7 - 7 7 8 8 8 8 8 8 8 8 8 8 8 8 8 8 8 8 8 7 7 - 7 7 8 8 8 8 8 8 8 8 8 8 8 8 8 8 8 8 8 7 7 - 7 7 8 8 8 8 8 8 8 8 8 8 8 8 8 8 8 8 8 7 7 - 7 7 7 8 8 8 8 8 8 8 8 8 8 8 8 8 8 8 7 7 7 - 7 7 7 8 8 8 8 8 8 8 8 8 8 8 8 8 8 8 7 7 7 - 7 7 7 7 8 8 8 8 8 8 8 8 8 8 8 8 8 7 7 7 7 - 7 7 7 7 7 8 8 8 8 8 8 8 8 8 8 8 7 7 7 7 7 - 7 7 7 7 7 7 7 8 8 8 8 8 8 8 7 7 7 7 7 7 7 - 7 7 7 7 7 7 7 7 7 7 7 7 7 7 7 7 7 7 7 7 7 - 7 7 7 7 7 7 7 7 7 7 7 7 7 7 7 7 7 7 7 7 7 - - - - diff --git a/tests/test_filter_mesh_3d/materials.xml b/tests/test_filter_mesh_3d/materials.xml deleted file mode 100644 index 8021f5f99e..0000000000 --- a/tests/test_filter_mesh_3d/materials.xml +++ /dev/null @@ -1,270 +0,0 @@ - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - diff --git a/tests/test_filter_mesh_3d/results_true.dat b/tests/test_filter_mesh_3d/results_true.dat deleted file mode 100644 index 505aa5c4d8..0000000000 --- a/tests/test_filter_mesh_3d/results_true.dat +++ /dev/null @@ -1 +0,0 @@ -9745cbccf9f7ecb9e95e0cd23f84df6ccceb28df02b6b881f80e6b297d1b9503e4226ef26699bb110306637c84ab71545048b84579dbc450db8311a35bb24c64 \ No newline at end of file diff --git a/tests/test_filter_mesh_3d/settings.xml b/tests/test_filter_mesh_3d/settings.xml deleted file mode 100644 index 517637a59f..0000000000 --- a/tests/test_filter_mesh_3d/settings.xml +++ /dev/null @@ -1,19 +0,0 @@ - - - - - 10 - 5 - 100 - - - - - - -160 -160 -183 - 160 160 183 - - - - - diff --git a/tests/test_filter_mesh_3d/tallies.xml b/tests/test_filter_mesh_3d/tallies.xml deleted file mode 100644 index 67ec57d21c..0000000000 --- a/tests/test_filter_mesh_3d/tallies.xml +++ /dev/null @@ -1,21 +0,0 @@ - - - - - regular - -182.07 -182.07 -183.00 - 182.07 182.07 183.00 - 17 17 17 - - - - - total - - - - - current - - - diff --git a/tests/test_filter_mesh_3d/test_filter_mesh_3d.py b/tests/test_filter_mesh_3d/test_filter_mesh_3d.py deleted file mode 100644 index 99c2981c2a..0000000000 --- a/tests/test_filter_mesh_3d/test_filter_mesh_3d.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 HashedTestHarness - - -if __name__ == '__main__': - harness = HashedTestHarness('statepoint.10.*', True) - harness.main() diff --git a/tests/testing_harness.py b/tests/testing_harness.py index 19a7ffb06c..5300131642 100644 --- a/tests/testing_harness.py +++ b/tests/testing_harness.py @@ -344,3 +344,10 @@ class PyAPITestHarness(TestHarness): for f in output: if os.path.exists(f): os.remove(f) + + +class HashedPyAPITestHarness(PyAPITestHarness): + + def _get_results(self): + """Digest info in the statepoint and return as a string.""" + return super(HashedPyAPITestHarness, self)._get_results(True)