From f35a68a2c7812777e308e4f6ecbc5b969030f39e Mon Sep 17 00:00:00 2001 From: Will Boyd Date: Thu, 15 Oct 2015 11:33:52 -0400 Subject: [PATCH] Removed uncommented code from previous commit --- openmc/mgxs/mgxs.py | 16 ++++------------ 1 file changed, 4 insertions(+), 12 deletions(-) diff --git a/openmc/mgxs/mgxs.py b/openmc/mgxs/mgxs.py index 9939465475..57a8aa0466 100644 --- a/openmc/mgxs/mgxs.py +++ b/openmc/mgxs/mgxs.py @@ -666,10 +666,7 @@ class MGXS(object): # Reverse energies to align with increasing energy groups xs = xs[:, ::-1, :] - # Reshape array to original axes (filters, nuclides, scores) -# new_shape = (num_subdomains * num_groups,) + xs.shape[2:] -# xs = np.reshape(xs, new_shape) - + # Eliminate trivial dimensions xs = np.squeeze(xs) return xs @@ -1791,11 +1788,7 @@ class ScatterMatrixXS(MGXS): # Reverse energies to align with increasing energy groups xs = xs[:, ::-1, ::-1, :] - # Reshape array to original axes (filters, nuclides, scores) - #new_shape = (num_subdomains * num_in_groups * num_out_groups,) - #new_shape += xs.shape[3:] - #xs = np.reshape(xs, new_shape) - + # Eliminate trivial dimensions xs = np.squeeze(xs) return xs @@ -2126,9 +2119,8 @@ class Chi(MGXS): # Reverse energies to align with increasing energy groups xs = xs[:, ::-1, :] - # Reshape array to original axes (filters, nuclides, scores) - new_shape = (num_subdomains * num_groups,) + new_shape[2:] - xs = np.reshape(xs, new_shape) + # Eliminate trivial dimensions + xs = np.squeeze(xs) xs = np.nan_to_num(xs) return xs