From 1eabfc7cd2ea078522d11c8b9efd66d2c57bb63b Mon Sep 17 00:00:00 2001 From: Paul Romano Date: Mon, 2 Jun 2014 21:12:12 -0400 Subject: [PATCH] Updated test_tally_nuclides to include a tally containing a filter with only one nuclide. --- tests/test_tally_nuclides/results.py | 7 +++---- tests/test_tally_nuclides/results_true.dat | 8 ++++++++ tests/test_tally_nuclides/tallies.xml | 5 +++++ 3 files changed, 16 insertions(+), 4 deletions(-) diff --git a/tests/test_tally_nuclides/results.py b/tests/test_tally_nuclides/results.py index 93371960a..3aa0946a5 100644 --- a/tests/test_tally_nuclides/results.py +++ b/tests/test_tally_nuclides/results.py @@ -15,10 +15,9 @@ else: sp.read_results() # extract tally results and convert to vector -results = sp.tallies[0].results -shape = results.shape -size = (np.product(shape)) -results = np.reshape(results, size) +results0 = sp.tallies[0].results +results1 = sp.tallies[1].results +results = np.concatenate((results0.flatten(), results1.flatten())) # set up output string outstr = '' diff --git a/tests/test_tally_nuclides/results_true.dat b/tests/test_tally_nuclides/results_true.dat index ce7400500..e429381dd 100644 --- a/tests/test_tally_nuclides/results_true.dat +++ b/tests/test_tally_nuclides/results_true.dat @@ -17,3 +17,11 @@ tallies: 5.127366E-01 5.602079E+00 6.310407E+00 +7.251620E+00 +1.056750E+01 +1.649542E+00 +5.462124E-01 +1.598276E+00 +5.127366E-01 +5.602079E+00 +6.310407E+00 diff --git a/tests/test_tally_nuclides/tallies.xml b/tests/test_tally_nuclides/tallies.xml index d8c294de1..cf20668c8 100644 --- a/tests/test_tally_nuclides/tallies.xml +++ b/tests/test_tally_nuclides/tallies.xml @@ -6,4 +6,9 @@ total absorption fission scatter + + Pu-239 + total absorption fission scatter + +