From 02a629cf7680fd5247f9c14555cde6c65070bd4a Mon Sep 17 00:00:00 2001 From: Amelia Trainer Date: Tue, 30 Mar 2021 16:46:53 +0000 Subject: [PATCH] (hopefully) fixed ordering on regression test --- tests/regression_tests/tallies/inputs_true.dat | 7 +++++++ tests/regression_tests/tallies/test.py | 15 +++++++++------ 2 files changed, 16 insertions(+), 6 deletions(-) diff --git a/tests/regression_tests/tallies/inputs_true.dat b/tests/regression_tests/tallies/inputs_true.dat index 9409ca4a71..5e49d6a233 100644 --- a/tests/regression_tests/tallies/inputs_true.dat +++ b/tests/regression_tests/tallies/inputs_true.dat @@ -350,6 +350,9 @@ 1 2 3 4 6 8 + + 1 2 5 3 6 + 10 21 22 23 60 @@ -439,6 +442,10 @@ 12 total + + 15 + scatter + 13 absorption delayed-nu-fission events fission inverse-velocity kappa-fission (n,2n) (n,n1) (n,gamma) nu-fission scatter elastic total prompt-nu-fission fission-q-prompt fission-q-recoverable decay-rate diff --git a/tests/regression_tests/tallies/test.py b/tests/regression_tests/tallies/test.py index 8e1e8b60b9..1f404134f9 100644 --- a/tests/regression_tests/tallies/test.py +++ b/tests/regression_tests/tallies/test.py @@ -121,12 +121,6 @@ def test_tallies(): harmonics_tally3.scores = ['flux', 'total'] harmonics_tally3.estimatir = 'tracklength' - n_collision = (1,2,5,3,6) - collision_filter = CollisionFilter(n_collision) - collision_tally = Tally() - collision_tally .filters = [collision_filter] - collision_tally .scores = ['scatter'] - universe_tally = Tally() universe_tally.filters = [ UniverseFilter((model.geometry.get_all_universes()[1], @@ -175,6 +169,15 @@ def test_tallies(): fusion_tally.scores = ['H1-production', 'H2-production', 'H3-production', 'He3-production', 'He4-production', 'heating', 'damage-energy'] + n_collision = (1,2,5,3,6) + collision_filter = CollisionFilter(n_collision) + collision_tally = Tally() + collision_tally.filters = [collision_filter] + collision_tally.scores = ['scatter'] + + + + model.tallies += [ azimuthal_tally1, azimuthal_tally2, azimuthal_tally3, cellborn_tally, dg_tally, energy_tally, energyout_tally,