(hopefully) fixed ordering on regression test

This commit is contained in:
Amelia Trainer 2021-03-30 16:46:53 +00:00
parent 447887645e
commit 02a629cf76
2 changed files with 16 additions and 6 deletions

View file

@ -350,6 +350,9 @@
<filter id="12" type="universe">
<bins>1 2 3 4 6 8</bins>
</filter>
<filter id="15" type="collision">
<bins>1 2 5 3 6</bins>
</filter>
<filter id="13" type="cell">
<bins>10 21 22 23 60</bins>
</filter>
@ -439,6 +442,10 @@
<filters>12</filters>
<scores>total</scores>
</tally>
<tally id="34">
<filters>15</filters>
<scores>scatter</scores>
</tally>
<tally id="20">
<filters>13</filters>
<scores>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</scores>

View file

@ -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,