Updated test suite for new tally ordering in MGXS module

openmc/mgxs/mgxs.py

@@ -1286,7 +1286,7 @@ class TotalXS(MGXS):
         """
 
         # Instantiate tallies if they do not exist
-        if self._tallies is None:
+        if super(TotalXS, self).tallies is None:
 
             # Create a list of scores for each Tally to be created
             scores = ['flux', 'total']
@@ -1333,7 +1333,7 @@ class TransportXS(MGXS):
         """
 
         # Instantiate tallies if they do not exist
-        if self._tallies is None:
+        if super(TransportXS, self).tallies is None:
 
             # Create a list of scores for each Tally to be created
             scores = ['flux', 'total', 'scatter-P1']
@@ -1386,7 +1386,7 @@ class AbsorptionXS(MGXS):
         """
 
         # Instantiate tallies if they do not exist
-        if self._tallies is None:
+        if super(AbsorptionXS, self).tallies is None:
 
             # Create a list of scores for each Tally to be created
             scores = ['flux', 'absorption']
@@ -1439,7 +1439,7 @@ class CaptureXS(MGXS):
         """
 
         # Instantiate tallies if they do not exist
-        if self._tallies is None:
+        if super(CaptureXS, self).tallies is None:
 
             # Create a list of scores for each Tally to be created
             scores = ['flux', 'absorption', 'fission']
@@ -1486,7 +1486,7 @@ class FissionXS(MGXS):
         """
 
         # Instantiate tallies if they do not exist
-        if self._tallies is None:
+        if super(FissionXS, self).tallies is None:
 
             # Create a list of scores for each Tally to be created
             scores = ['flux', 'fission']
@@ -1532,7 +1532,7 @@ class NuFissionXS(MGXS):
         """
 
         # Instantiate tallies if they do not exist
-        if self._tallies is None:
+        if super(NuFissionXS, self).tallies is None:
 
             # Create a list of scores for each Tally to be created
             scores = ['flux', 'nu-fission']
@@ -1578,7 +1578,7 @@ class ScatterXS(MGXS):
         """
 
         # Instantiate tallies if they do not exist
-        if self._tallies is None:
+        if super(ScatterXS, self).tallies is None:
 
             # Create a list of scores for each Tally to be created
             scores = ['flux', 'scatter']
@@ -1624,7 +1624,7 @@ class NuScatterXS(MGXS):
         """
 
         # Instantiate tallies if they do not exist
-        if self._tallies is None:
+        if super(NuScatterXS, self).tallies is None:
 
             # Create a list of scores for each Tally to be created
             scores = ['flux', 'nu-scatter']
@@ -1687,7 +1687,7 @@ class ScatterMatrixXS(MGXS):
         """
 
         # Instantiate tallies if they do not exist
-        if self._tallies is None:
+        if super(ScatterMatrixXS, self).tallies is None:
 
             group_edges = self.energy_groups.group_edges
             energy = openmc.Filter('energy', group_edges)
@@ -2006,7 +2006,7 @@ class NuScatterMatrixXS(ScatterMatrixXS):
         """
 
         # Instantiate tallies if they do not exist
-        if self._tallies is None:
+        if super(NuScatterMatrixXS, self).tallies is None:
 
             # Create the non-domain specific Filters for the Tallies
             group_edges = self.energy_groups.group_edges
@@ -2050,7 +2050,7 @@ class Chi(MGXS):
         """
 
         # Instantiate tallies if they do not exist
-        if self._tallies is None:
+        if super(Chi, self).tallies is None:
 
             # Create a list of scores for each Tally to be created
             scores = ['nu-fission', 'nu-fission']

tests/test_mgxs_library_condense/inputs_true.dat

@@ -1 +1 @@
-35f99f1973b3bf3efcec6c2dddf56d6679a15dab8582ab5336e86e4fdf90967ce91036e5c30c345decb994ab9133a906b82dc8fad0cdd3398a612d9aa05c1c77
+7e5c0de6e50c494abeea443d74606db809d74ce8bb2571eb4e1c98b3c9a33885b0aef2a4a82b6f95a1725b078d4a5ff01f68e1cc72addbd2d6bd0fb8251ad2e7

tests/test_mgxs_library_hdf5/inputs_true.dat

@@ -1 +1 @@
-35f99f1973b3bf3efcec6c2dddf56d6679a15dab8582ab5336e86e4fdf90967ce91036e5c30c345decb994ab9133a906b82dc8fad0cdd3398a612d9aa05c1c77
+7e5c0de6e50c494abeea443d74606db809d74ce8bb2571eb4e1c98b3c9a33885b0aef2a4a82b6f95a1725b078d4a5ff01f68e1cc72addbd2d6bd0fb8251ad2e7

tests/test_mgxs_library_hdf5/test_mgxs_library_hdf5.py

@@ -53,7 +53,7 @@ class MGXSTestHarness(PyAPITestHarness):
         self.mgxs_lib.load_from_statepoint(sp)
         
         # Export the MGXS Library to an HDF5 file
-        self.mgxs_lib.build_hdf5_store(filename='mgxs', directory='.')
+        self.mgxs_lib.build_hdf5_store(directory='.')
 
         # Open the MGXS HDF5 file
         f = h5py.File('mgxs.h5', 'r')

tests/test_mgxs_library_no_nuclides/inputs_true.dat

@@ -1 +1 @@
-35f99f1973b3bf3efcec6c2dddf56d6679a15dab8582ab5336e86e4fdf90967ce91036e5c30c345decb994ab9133a906b82dc8fad0cdd3398a612d9aa05c1c77
+7e5c0de6e50c494abeea443d74606db809d74ce8bb2571eb4e1c98b3c9a33885b0aef2a4a82b6f95a1725b078d4a5ff01f68e1cc72addbd2d6bd0fb8251ad2e7

tests/test_mgxs_library_nuclides/inputs_true.dat

@@ -1 +1 @@
-7c1deb8a54fbe1a1ce6ef27cea4a11995210ad3e5ecf32bd83d7c80041edf0793378a7325ffe7ebf9c537e9c278fd4545642fec6c1e46b9c5418118f035d5e95
+04dcfca7d68981d7ec19d428c541acd6345ec2d608c581d56ce21d23548f52977fe713b5cdd7434bebf62067444d6562ef322175736a6a63e3985e5e48718081