From 7c4ed737afe8b9ece0b35523bd7c7030962548a6 Mon Sep 17 00:00:00 2001
From: Adam Nelson <nelsonag@umich.edu>
Date: Sun, 13 Nov 2016 14:38:57 -0500
Subject: [PATCH] Fixing failing tests

---
 openmc/mgxs/mgxs.py                 |   9 ++++-
 tests/1d_mgxs.h5                    | Bin 128136 -> 134280 bytes
 tests/test_tallies/inputs_true.dat  |   2 +-
 tests/test_tallies/results_true.dat |   2 +-
 tests/test_tallies/test_tallies.py  |  51 ++++++++++------------------
 5 files changed, 28 insertions(+), 36 deletions(-)

diff --git a/openmc/mgxs/mgxs.py b/openmc/mgxs/mgxs.py
index 036feac74a..1337b1fa7f 100644
--- a/openmc/mgxs/mgxs.py
+++ b/openmc/mgxs/mgxs.py
@@ -3784,7 +3784,14 @@ class ScatterMatrixXS(MatrixMGXS):
                 axes = (5, 4, 0)
             else:
                 axes = (4, 3, 0)
-            xs = np.squeeze(xs, axis=axes)
+            # Squeeze will return a ValueError if the axis has a size greater
+            # than 1, so try each axis in axes one at a time, catching the
+            # ValueError as needed.
+            for axis in axes:
+                try:
+                    xs = np.squeeze(xs, axis=axis)
+                except ValueError:
+                    pass
 
         return xs
 
diff --git a/tests/1d_mgxs.h5 b/tests/1d_mgxs.h5
index e3b85c24163fe4020435db5c5d674575f2b65be0..8f28e02cbcfb2d51e94d81bafdd97ba1220313d3 100644
GIT binary patch
delta 1872
zcmeBp$=)%OV}d3V57S2N^&FEQ>6%Udp}}a#>mD2Jt{xlhUzCzs6ua4vGeiZ4-1K|-
zj82;)^o%5MDA@eZZ3$2=9-G0F{Wz^Q2P9mQ!66SZ{6_67aU2T31{6%Yh12qV>!0Z0
za2V9(cRwlOP_TL5e;Z947H`kfWc=fbOA;6+XDo0@%B^I~@($)<@L*tJU|?Wm;A0SB
z;9w|DPAn-&Es8JBNGwPNic2ywG6(=^5M~5o2A~=cfUp^Wx)>Nb{y=yTQefgiQK}lt
z1h$as#xm2!SWsXBgNxdMz)Blq*=S=dJ8g`GBt5E!EhlYU%S9VwxoKl855(Aw2cI);
zyx_-J@9ymH1J2N(oDT%Z86L!sMk$&Z7$CV6QXpWHhh#V0@{oK3m#@dL0FndX3NYj$
zNg201Bu(O$ha@hTd_ATQA;|=$08<_k-?-%=5r<nI5(7|qSu8;e3RVy(;Df}{4PZ=R
H!}*K=*xXlq

delta 457
zcmeB}$<gtWeS#*_7sid+>p3P1aq9E?7p0^Y#YVdWk$Nlx!{i0J7L%_jOHI7Mwz+`Q
zNQHo!$qHHun<Mm$BnYV6tl-`xG5MCRJ}-)Wljp@-L2a8{z$vjgAmNe>epMj*Zq&XK
z$FB-xR>8De1YPxD{UIF!E{FK=?k7b8>NY?4FQtjsRof?MGTw5<t7KaN<0=chDz-bU
IWc2U`08!MZ3jhEB

diff --git a/tests/test_tallies/inputs_true.dat b/tests/test_tallies/inputs_true.dat
index 69472c8d63..a8b40554b4 100644
--- a/tests/test_tallies/inputs_true.dat
+++ b/tests/test_tallies/inputs_true.dat
@@ -1 +1 @@
-b1f616bc0e342e3886b4b27eca22c4d1e55e445979254d5ba5f9ea01048f53d0e9a01c575745ae130eb34108080d2256ab9e4cb926ea0050891a44ae37ecdd88
\ No newline at end of file
+ac118c5796593df0f53491920875bbe77921882253e7f24942e365e5812d726fb3d3bab86da02b3aad93f6f8f20a090125ffa51f9fdf9aef84009702f9cc363d
\ No newline at end of file
diff --git a/tests/test_tallies/results_true.dat b/tests/test_tallies/results_true.dat
index 639e8baf32..1d6f6bfaf7 100644
--- a/tests/test_tallies/results_true.dat
+++ b/tests/test_tallies/results_true.dat
@@ -1 +1 @@
-ceb1420d48e097185dd0798a495676c8e968c37c6e75fd6232137a4df8f6fae33d8232b95c68f6479815a014d20ccfc7611f96b22fcb7da159b42346e00cdf4e
\ No newline at end of file
+a8172f7492fcc69d21f53c20523ffd0ad2882a753a3e1d263d135153cc6b3ee8d8e38f8823a4a2eb3288d730579892875d2d19f85f083dd659f91414988115ea
\ No newline at end of file
diff --git a/tests/test_tallies/test_tallies.py b/tests/test_tallies/test_tallies.py
index 9b48729efd..9e525d2cf2 100644
--- a/tests/test_tallies/test_tallies.py
+++ b/tests/test_tallies/test_tallies.py
@@ -3,6 +3,7 @@
 import os
 import sys
 sys.path.insert(0, os.pardir)
+import numpy as np
 from testing_harness import PyAPITestHarness
 from openmc.filter import *
 from openmc import Mesh, Tally, Tallies
@@ -21,33 +22,27 @@ class TalliesTestHarness(PyAPITestHarness):
         self._input_set.settings.source = Source(space=Box(
             [-160, -160, -183], [160, 160, 183]))
 
-        azimuthal_bins = (-3.1416, -1.8850, -0.6283, 0.6283, 1.8850, 3.1416)
-        azimuthal_filter1 = AzimuthalFilter(azimuthal_bins)
+        azimuthal_bins = (-3.14159, -1.8850, -0.6283, 0.6283, 1.8850, 3.14159)
+        azimuthal_filter = AzimuthalFilter(azimuthal_bins)
         azimuthal_tally1 = Tally()
-        azimuthal_tally1.filters = [azimuthal_filter1]
+        azimuthal_tally1.filters = [azimuthal_filter]
         azimuthal_tally1.scores = ['flux']
         azimuthal_tally1.estimator = 'tracklength'
 
         azimuthal_tally2 = Tally()
-        azimuthal_tally2.filters = [azimuthal_filter1]
+        azimuthal_tally2.filters = [azimuthal_filter]
         azimuthal_tally2.scores = ['flux']
         azimuthal_tally2.estimator = 'analog'
 
-        azimuthal_filter2 = AzimuthalFilter(5)
-        azimuthal_tally3 = Tally()
-        azimuthal_tally3.filters = [azimuthal_filter2]
-        azimuthal_tally3.scores = ['flux']
-        azimuthal_tally3.estimator = 'tracklength'
-
         mesh_2x2 = Mesh(mesh_id=1)
         mesh_2x2.lower_left  = [-182.07, -182.07]
         mesh_2x2.upper_right = [182.07,  182.07]
         mesh_2x2.dimension = [2, 2]
         mesh_filter = MeshFilter(mesh_2x2)
-        azimuthal_tally4 = Tally()
-        azimuthal_tally4.filters = [azimuthal_filter2, mesh_filter]
-        azimuthal_tally4.scores = ['flux']
-        azimuthal_tally4.estimator = 'tracklength'
+        azimuthal_tally3 = Tally()
+        azimuthal_tally3.filters = [azimuthal_filter, mesh_filter]
+        azimuthal_tally3.scores = ['flux']
+        azimuthal_tally3.estimator = 'tracklength'
 
         cellborn_tally = Tally()
         cellborn_tally.filters = [CellbornFilter((10, 21, 22, 23))]
@@ -76,20 +71,17 @@ class TalliesTestHarness(PyAPITestHarness):
         material_tally.filters = [MaterialFilter((1, 2, 3, 4))]
         material_tally.scores = ['total']
 
+        mu_bins = (-1.0, -0.5, 0.0, 0.5, 1.0)
+        mu_filter = MuFilter(mu_bins)
         mu_tally1 = Tally()
-        mu_tally1.filters = [MuFilter((-1.0, -0.5, 0.0, 0.5, 1.0))]
+        mu_tally1.filters = [mu_filter]
         mu_tally1.scores = ['scatter', 'nu-scatter']
 
-        mu_filter = MuFilter(5)
         mu_tally2 = Tally()
-        mu_tally2.filters = [mu_filter]
+        mu_tally2.filters = [mu_filter, mesh_filter]
         mu_tally2.scores = ['scatter', 'nu-scatter']
 
-        mu_tally3 = Tally()
-        mu_tally3.filters = [mu_filter, mesh_filter]
-        mu_tally3.scores = ['scatter', 'nu-scatter']
-
-        polar_bins = (0.0, 0.6283, 1.2566, 1.8850, 2.5132, 3.1416)
+        polar_bins = (0.0, 0.6283, 1.2566, 1.8850, 2.5132, 3.14159)
         polar_filter = PolarFilter(polar_bins)
         polar_tally1 = Tally()
         polar_tally1.filters = [polar_filter]
@@ -101,17 +93,11 @@ class TalliesTestHarness(PyAPITestHarness):
         polar_tally2.scores = ['flux']
         polar_tally2.estimator = 'analog'
 
-        polar_filter2 = PolarFilter((5,))
         polar_tally3 = Tally()
-        polar_tally3.filters = [polar_filter2]
+        polar_tally3.filters = [polar_filter, mesh_filter]
         polar_tally3.scores = ['flux']
         polar_tally3.estimator = 'tracklength'
 
-        polar_tally4 = Tally()
-        polar_tally4.filters = [polar_filter2, mesh_filter]
-        polar_tally4.scores = ['flux']
-        polar_tally4.estimator = 'tracklength'
-
         universe_tally = Tally()
         universe_tally.filters = [UniverseFilter((1, 2, 3, 4, 6, 8))]
         universe_tally.scores = ['total']
@@ -173,10 +159,9 @@ class TalliesTestHarness(PyAPITestHarness):
         self._input_set.tallies = Tallies()
         self._input_set.tallies += (
             [azimuthal_tally1, azimuthal_tally2, azimuthal_tally3,
-             azimuthal_tally4, cellborn_tally, dg_tally, energy_tally,
-             energyout_tally, transfer_tally, material_tally, mu_tally1,
-             mu_tally2, mu_tally3, polar_tally1, polar_tally2, polar_tally3,
-             polar_tally4, universe_tally])
+             cellborn_tally, dg_tally, energy_tally, energyout_tally,
+             transfer_tally, material_tally, mu_tally1, mu_tally2,
+             polar_tally1, polar_tally2, polar_tally3, universe_tally])
         self._input_set.tallies += score_tallies
         self._input_set.tallies += flux_tallies
         self._input_set.tallies += (scatter_tally1, scatter_tally2)