Merge branch 'develop' into fix-nndc-xs

2026-07-27 21:55:41 -04:00 · 2014-09-02 22:12:39 -04:00 · 2014-09-02 22:12:39 -04:00 · 2d1d39fad2
commit 2d1d39fad2
parent ed5480173a 14fe961f99
99 changed files with 166916 additions and 166723 deletions
--- a/data/get_nndc_data.py
+++ b/data/get_nndc_data.py
@ -129,14 +129,14 @@ if not response or response.lower().startswith('y'):

    # loop around ace directories
    for d in ace_dirs:
-        print('Coverting {0}...'.format(d))
+        print('Converting {0}...'.format(d))

        # get a list of files to convert
        ace_files = glob.glob(os.path.join(d, '*.ace*'))

        # convert files
        for f in ace_files:
-            print('    Coverting {0}...'.format(os.path.split(f)[1]))
+            print('    Converting {0}...'.format(os.path.split(f)[1]))
            ascii_to_binary(f, f)

    # Change cross_sections.xml file
--- a/src/CMakeLists.txt
+++ b/src/CMakeLists.txt
@ -345,8 +345,10 @@ foreach(test ${TESTS})
          set(RESTART_FILE statepoint.07.h5)
        elseif(${test} MATCHES "test_sourcepoint_restart")
          set(RESTART_FILE statepoint.07.h5 source.07.h5)
-        elseif(${test} MATCHES "test_particle_restart")
-          set(RESTART_FILE particle_12_885.h5)
+        elseif(${test} MATCHES "test_particle_restart_eigval")
+          set(RESTART_FILE particle_12_842.h5)
+        elseif(${test} MATCHES "test_particle_restart_fixed")
+          set(RESTART_FILE particle_7_6144.h5)
        else(${test} MATCHES "test_statepoint_restart")
          message(FATAL_ERROR "Restart test ${test} not recognized")
        endif(${test} MATCHES "test_statepoint_restart")
@ -358,8 +360,10 @@ foreach(test ${TESTS})
          set(RESTART_FILE statepoint.07.binary)
        elseif(${test} MATCHES "test_sourcepoint_restart")
          set(RESTART_FILE statepoint.07.binary source.07.binary)
-        elseif(${test} MATCHES "test_particle_restart")
-          set(RESTART_FILE particle_12_885.binary)
+        elseif(${test} MATCHES "test_particle_restart_eigval")
+          set(RESTART_FILE particle_12_842.binary)
+        elseif(${test} MATCHES "test_particle_restart_fixed")
+          set(RESTART_FILE particle_7_6144.binary)
        else(${test} MATCHES "test_statepoint_restart")
          message(FATAL_ERROR "Restart test ${test} not recognized")
        endif(${test} MATCHES "test_statepoint_restart")
--- a/src/constants.F90
+++ b/src/constants.F90
@ -322,6 +322,14 @@ module constants
       K_TRACKLENGTH = 3, &
       LEAKAGE       = 4

+  ! ============================================================================
+  ! RANDOM NUMBER STREAM CONSTANTS
+
+  integer, parameter :: N_STREAMS = 3
+  integer, parameter :: STREAM_TRACKING = 1
+  integer, parameter :: STREAM_TALLIES  = 2
+  integer, parameter :: STREAM_SOURCE   = 3
+
  ! ============================================================================
  ! EXTERNAL SOURCE PARAMETERS

--- a/src/fixed_source.F90
+++ b/src/fixed_source.F90
@ -11,9 +11,6 @@ module fixed_source
  use tally,           only: synchronize_tallies, setup_active_usertallies
  use tracking,        only: transport

-  type(Bank), pointer :: source_site => null()
-!$omp threadprivate(source_site)
-
 contains

  subroutine run_fixedsource()
--- a/src/global.F90
+++ b/src/global.F90
@ -256,6 +256,10 @@ module global
  ! Mode to run in (fixed source, eigenvalue, plotting, etc)
  integer :: run_mode = NONE

+  ! Fixed source particle bank
+  type(Bank), pointer :: source_site => null()
+!$omp threadprivate(source_site)
+
  ! Restart run
  logical :: restart_run = .false.
  integer :: restart_batch
--- a/src/particle_restart.F90
+++ b/src/particle_restart.F90
@ -28,6 +28,7 @@ contains
  subroutine run_particle_restart()

    integer(8) :: particle_seed
+    integer :: previous_run_mode
    type(Particle) :: p

    ! Set verbosity high
@ -37,14 +38,20 @@ contains
    call p % initialize()

    ! Read in the restart information
-    call read_particle_restart(p)
+    call read_particle_restart(p, previous_run_mode)

    ! Set all tallies to 0 for now (just tracking errors)
    n_tallies = 0

    ! Compute random number seed
-    particle_seed = ((current_batch - 1)*gen_per_batch + &
-         current_gen - 1)*n_particles + p % id
+    select case (previous_run_mode)
+    case (MODE_EIGENVALUE)
+      particle_seed = ((current_batch - 1)*gen_per_batch + &
+           current_gen - 1)*n_particles + p % id
+    case (MODE_FIXEDSOURCE)
+      particle_seed = p % id
+    end select
+
    call set_particle_seed(particle_seed)

    ! Transport neutron
@ -59,9 +66,10 @@ contains
 ! READ_PARTICLE_RESTART reads the particle restart file
 !===============================================================================

-  subroutine read_particle_restart(p)
+  subroutine read_particle_restart(p, previous_run_mode)

    integer :: int_scalar
+    integer, intent(inout) :: previous_run_mode
    type(Particle), intent(inout) :: p

    ! Write meessage
@ -79,6 +87,7 @@ contains
    call pr % read_data(gen_per_batch, 'gen_per_batch')
    call pr % read_data(current_gen, 'current_gen')
    call pr % read_data(n_particles, 'n_particles')
+    call pr % read_data(previous_run_mode, 'run_mode')
    call pr % read_data(p % id, 'id')
    call pr % read_data(p % wgt, 'weight')
    call pr % read_data(p % E, 'energy')
--- a/src/particle_restart_write.F90
+++ b/src/particle_restart_write.F90
@ -43,7 +43,12 @@ contains
    call pr % file_create(filename)

    ! Get information about source particle
-    src => source_bank(current_work)
+    select case (run_mode)
+    case (MODE_EIGENVALUE)
+      src => source_bank(current_work)
+    case (MODE_FIXEDSOURCE)
+      src => source_site
+    end select

    ! Write data to file
    call pr % write_data(FILETYPE_PARTICLE_RESTART, 'filetype')
@ -52,6 +57,7 @@ contains
    call pr % write_data(gen_per_batch, 'gen_per_batch')
    call pr % write_data(current_gen, 'current_gen')
    call pr % write_data(n_particles, 'n_particles')
+    call pr % write_data(run_mode, 'run_mode')
    call pr % write_data(p % id, 'id')
    call pr % write_data(src % wgt, 'weight')
    call pr % write_data(src % E, 'energy')
--- a/src/random_lcg.F90
+++ b/src/random_lcg.F90
@ -1,15 +1,12 @@
 module random_lcg

+  use constants
+
  implicit none

  private
  save

-  ! Random number streams
-  integer, parameter :: N_STREAMS = 2
-  integer, parameter :: STREAM_TRACKING = 1
-  integer, parameter :: STREAM_TALLIES  = 2
-
  integer(8) :: prn_seed0  ! original seed
  integer(8) :: prn_seed(N_STREAMS) ! current seed
  integer(8) :: prn_mult   ! multiplication factor, g
@ -21,7 +18,7 @@ module random_lcg
  real(8)    :: prn_norm   ! 2^(-M)
  integer    :: stream     ! current RNG stream

-!$omp threadprivate(prn_seed)
+!$omp threadprivate(prn_seed, stream)

  public :: prn
  public :: initialize_prng
@ -63,11 +60,13 @@ contains

    integer :: i

-    stream     = STREAM_TRACKING
    prn_seed0  = seed
+!$omp parallel
    do i = 1, N_STREAMS
      prn_seed(i) = prn_seed0 + i - 1
    end do
+    stream     = STREAM_TRACKING
+!$omp end parallel
    prn_mult   = 2806196910506780709_8
    prn_add    = 1_8
    prn_bits   = 63
--- a/src/source.F90
+++ b/src/source.F90
@ -10,7 +10,7 @@ module source
  use output,           only: write_message
  use output_interface, only: BinaryOutput
  use particle_header,  only: Particle
-  use random_lcg,       only: prn, set_particle_seed
+  use random_lcg,       only: prn, set_particle_seed, prn_set_stream
  use string,           only: to_str

 #ifdef MPI
@ -101,6 +101,9 @@ contains
    ! Set weight to one by default
    site % wgt = ONE

+    ! Set the random number generator to the source stream.
+    call prn_set_stream(STREAM_SOURCE)
+
    ! Sample position
    select case (external_source % type_space)
    case (SRC_SPACE_BOX)
@ -189,6 +192,9 @@ contains
      call fatal_error()
    end select

+    ! Set the random number generator back to the tracking stream.
+    call prn_set_stream(STREAM_TRACKING)
+
  end subroutine sample_external_source

 !===============================================================================
--- a/src/utils/particle_restart.py
+++ b/src/utils/particle_restart.py
@ -30,6 +30,7 @@ class Particle(object):
        self.gen_per_batch = self._get_int(path='gen_per_batch')[0]
        self.current_gen = self._get_int(path='current_gen')[0]
        self.n_particles = self._get_long(path='n_particles')[0]
+        self.run_mode = self._get_int(path='run_mode')[0]

        # Read particle properties
        self.id = self._get_long(path='id')[0]
--- a/tests/test_basic/results_true.dat
+++ b/tests/test_basic/results_true.dat
@ -1,2 +1,2 @@
 k-combined:
-3.037840E-01 4.395585E-03
+3.011726E-01 1.841644E-03
--- a/tests/test_cmfd_feed/results_true.dat
+++ b/tests/test_cmfd_feed/results_true.dat
@ -1,128 +1,128 @@
 k-combined:
-1.166352E+00 1.167615E-02
+1.177396E+00 4.883437E-03
 tally 1:
-1.181633E+01
-1.411075E+01
-2.225993E+01
-4.989263E+01
-3.022366E+01
-9.163058E+01
-3.521719E+01
-1.243119E+02
-3.683278E+01
-1.359014E+02
-3.644881E+01
-1.330874E+02
-3.368020E+01
-1.137856E+02
-2.800504E+01
-7.862785E+01
-2.099989E+01
-4.427213E+01
-1.109715E+01
-1.242693E+01
+1.107335E+01
+1.235221E+01
+2.002676E+01
+4.017045E+01
+2.844184E+01
+8.111731E+01
+3.428492E+01
+1.177848E+02
+3.735839E+01
+1.397523E+02
+3.894180E+01
+1.517824E+02
+3.528006E+01
+1.246309E+02
+2.863448E+01
+8.222321E+01
+2.125384E+01
+4.535192E+01
+1.112124E+01
+1.241089E+01
 tally 2:
-2.375435E+01
-2.844812E+01
-1.663749E+01
-1.396549E+01
-2.263679E+00
-2.636946E-01
-4.382531E+01
-9.669964E+01
-3.095313E+01
-4.829350E+01
-4.053211E+00
-8.354098E-01
-5.911795E+01
-1.754446E+02
-4.206165E+01
-8.884145E+01
-5.555905E+00
-1.564759E+00
-6.868764E+01
-2.367084E+02
-4.888499E+01
-1.199267E+02
-6.294307E+00
-2.009790E+00
-7.235623E+01
-2.628007E+02
-5.139839E+01
-1.326712E+02
-6.686118E+00
-2.268764E+00
-7.135408E+01
-2.557589E+02
-5.083886E+01
-1.298291E+02
-6.771083E+00
-2.317293E+00
-6.696601E+01
-2.250860E+02
-4.748258E+01
-1.132403E+02
-6.327041E+00
-2.026095E+00
-5.564372E+01
-1.553574E+02
-3.953729E+01
-7.844444E+01
-5.289683E+00
-1.415775E+00
-4.092756E+01
-8.408073E+01
-2.889867E+01
-4.193356E+01
-3.727944E+00
-7.053359E-01
-2.263358E+01
-2.604194E+01
-1.584561E+01
-1.273998E+01
-2.024017E+00
-2.141218E-01
+2.243113E+01
+2.535057E+01
+1.557550E+01
+1.222813E+01
+2.164704E+00
+2.389690E-01
+4.049814E+01
+8.218116E+01
+2.854669E+01
+4.085264E+01
+3.934452E+00
+7.833208E-01
+5.706024E+01
+1.633739E+02
+4.049737E+01
+8.234850E+01
+5.231368E+00
+1.386110E+00
+6.798682E+01
+2.320807E+02
+4.819178E+01
+1.166820E+02
+6.247056E+00
+1.968990E+00
+7.449317E+01
+2.782374E+02
+5.315156E+01
+1.417287E+02
+6.667584E+00
+2.250879E+00
+7.530107E+01
+2.849330E+02
+5.378916E+01
+1.454619E+02
+7.071012E+00
+2.522919E+00
+6.820303E+01
+2.335083E+02
+4.850330E+01
+1.181013E+02
+6.241747E+00
+1.973368E+00
+5.831373E+01
+1.704779E+02
+4.149124E+01
+8.633656E+01
+5.385636E+00
+1.468642E+00
+4.184350E+01
+8.792430E+01
+2.971699E+01
+4.435896E+01
+3.784806E+00
+7.343249E-01
+2.202673E+01
+2.444732E+01
+1.531988E+01
+1.183160E+01
+2.073873E+00
+2.272561E-01
 tally 3:
-1.602499E+01
-1.295630E+01
-1.060542E+00
-5.920587E-02
-2.980673E+01
-4.480492E+01
-1.936250E+00
-1.905077E-01
-4.051926E+01
-8.246657E+01
-2.606639E+00
-3.437220E-01
-4.705779E+01
-1.111431E+02
-3.028454E+00
-4.619883E-01
-4.957304E+01
-1.234274E+02
-3.176475E+00
-5.108616E-01
-4.897053E+01
-1.204739E+02
-3.080782E+00
-4.792314E-01
-4.569001E+01
-1.048762E+02
-2.913485E+00
-4.283033E-01
-3.800244E+01
-7.248583E+01
-2.465881E+00
-3.073302E-01
-2.784859E+01
-3.895822E+01
-1.770793E+00
-1.579009E-01
-1.528645E+01
-1.186641E+01
-1.015624E+00
-5.285299E-02
+1.500439E+01
+1.135466E+01
+9.942586E-01
+5.051831E-02
+2.744453E+01
+3.776958E+01
+1.781992E+00
+1.612021E-01
+3.901013E+01
+7.642401E+01
+2.472924E+00
+3.077607E-01
+4.642527E+01
+1.082730E+02
+2.924369E+00
+4.335819E-01
+5.109083E+01
+1.309660E+02
+3.325865E+00
+5.592642E-01
+5.182512E+01
+1.350762E+02
+3.259912E+00
+5.350517E-01
+4.672480E+01
+1.095974E+02
+3.097309E+00
+4.854729E-01
+3.997405E+01
+8.014326E+01
+2.589176E+00
+3.374615E-01
+2.861624E+01
+4.114210E+01
+1.806237E+00
+1.656944E-01
+1.474531E+01
+1.096355E+01
+9.807860E-01
+4.934364E-02
 tally 4:
 0.000000E+00
 0.000000E+00
@ -160,8 +160,8 @@ tally 4:
 0.000000E+00
 0.000000E+00
 0.000000E+00
-3.198289E+00
-5.148488E-01
+3.050887E+00
+4.698799E-01
 0.000000E+00
 0.000000E+00
 0.000000E+00
@ -208,10 +208,10 @@ tally 4:
 0.000000E+00
 0.000000E+00
 0.000000E+00
-5.696337E+00
-1.628487E+00
-2.860206E+00
-4.137254E-01
+5.388951E+00
+1.456464E+00
+2.664528E+00
+3.577345E-01
 0.000000E+00
 0.000000E+00
 0.000000E+00
@ -256,10 +256,10 @@ tally 4:
 0.000000E+00
 0.000000E+00
 0.000000E+00
-7.588948E+00
-2.895325E+00
-5.292314E+00
-1.413583E+00
+7.165280E+00
+2.573230E+00
+4.930263E+00
+1.218988E+00
 0.000000E+00
 0.000000E+00
 0.000000E+00
@ -304,10 +304,10 @@ tally 4:
 0.000000E+00
 0.000000E+00
 0.000000E+00
-8.876155E+00
-3.953353E+00
-7.255925E+00
-2.639713E+00
+8.550278E+00
+3.668687E+00
+6.985934E+00
+2.450395E+00
 0.000000E+00
 0.000000E+00
 0.000000E+00
@ -352,10 +352,10 @@ tally 4:
 0.000000E+00
 0.000000E+00
 0.000000E+00
-9.354049E+00
-4.393658E+00
-8.482819E+00
-3.610891E+00
+9.236725E+00
+4.281659E+00
+8.429932E+00
+3.565265E+00
 0.000000E+00
 0.000000E+00
 0.000000E+00
@ -400,10 +400,10 @@ tally 4:
 0.000000E+00
 0.000000E+00
 0.000000E+00
-8.943279E+00
-4.014844E+00
-8.979641E+00
-4.049912E+00
+9.396613E+00
+4.431004E+00
+9.307625E+00
+4.351276E+00
 0.000000E+00
 0.000000E+00
 0.000000E+00
@ -448,10 +448,10 @@ tally 4:
 0.000000E+00
 0.000000E+00
 0.000000E+00
-8.300834E+00
-3.459191E+00
-9.090369E+00
-4.158129E+00
+8.721885E+00
+3.821463E+00
+9.438995E+00
+4.479948E+00
 0.000000E+00
 0.000000E+00
 0.000000E+00
@ -496,10 +496,10 @@ tally 4:
 0.000000E+00
 0.000000E+00
 0.000000E+00
-6.804280E+00
-2.322582E+00
-8.354155E+00
-3.514646E+00
+7.096946E+00
+2.525113E+00
+8.605114E+00
+3.710134E+00
 0.000000E+00
 0.000000E+00
 0.000000E+00
@ -544,10 +544,10 @@ tally 4:
 0.000000E+00
 0.000000E+00
 0.000000E+00
-5.046905E+00
-1.278109E+00
-7.174660E+00
-2.586803E+00
+5.222832E+00
+1.373166E+00
+7.480684E+00
+2.804650E+00
 0.000000E+00
 0.000000E+00
 0.000000E+00
@ -592,10 +592,10 @@ tally 4:
 0.000000E+00
 0.000000E+00
 0.000000E+00
-2.662185E+00
-3.600983E-01
-5.306922E+00
-1.415937E+00
+2.726690E+00
+3.773397E-01
+5.470375E+00
+1.504111E+00
 0.000000E+00
 0.000000E+00
 0.000000E+00
@ -642,8 +642,8 @@ tally 4:
 0.000000E+00
 0.000000E+00
 0.000000E+00
-3.042882E+00
-4.659100E-01
+3.026290E+00
+4.597502E-01
 0.000000E+00
 0.000000E+00
 0.000000E+00
@ -662,114 +662,114 @@ k cmfd
 0.000000E+00
 0.000000E+00
 0.000000E+00
-1.155207E+00
-1.161934E+00
-1.162573E+00
-1.155825E+00
-1.156010E+00
-1.155352E+00
-1.149838E+00
-1.160768E+00
-1.160453E+00
-1.169217E+00
-1.162716E+00
-1.161432E+00
-1.163968E+00
-1.165559E+00
-1.164094E+00
-1.159570E+00
+1.150583E+00
+1.159578E+00
+1.162798E+00
+1.171003E+00
+1.162732E+00
+1.165591E+00
+1.166032E+00
+1.165387E+00
+1.165451E+00
+1.170726E+00
+1.170820E+00
+1.167945E+00
+1.166050E+00
+1.165757E+00
+1.167631E+00
+1.168366E+00
 cmfd entropy
 0.000000E+00
 0.000000E+00
 0.000000E+00
 0.000000E+00
-3.220491E+00
-3.222825E+00
-3.218323E+00
-3.219037E+00
-3.218088E+00
-3.218982E+00
-3.223440E+00
-3.219003E+00
-3.219661E+00
-3.222534E+00
-3.226366E+00
-3.225935E+00
-3.225693E+00
-3.225236E+00
-3.226171E+00
-3.227775E+00
+3.215201E+00
+3.212850E+00
+3.214094E+00
+3.208054E+00
+3.212891E+00
+3.213349E+00
+3.208290E+00
+3.206895E+00
+3.208786E+00
+3.209630E+00
+3.212321E+00
+3.211750E+00
+3.212453E+00
+3.213370E+00
+3.211791E+00
+3.212685E+00
 cmfd balance
 0.000000E+00
 0.000000E+00
 0.000000E+00
 0.000000E+00
-7.152541E-03
-7.231826E-03
-5.207222E-03
-4.847674E-03
-4.190622E-03
-3.646931E-03
-3.246272E-03
-4.268558E-03
-3.666841E-03
-3.201934E-03
-2.607402E-03
-2.522363E-03
-2.503931E-03
-2.357463E-03
-2.164466E-03
-1.815207E-03
+6.348026E-03
+5.102747E-03
+4.043947E-03
+3.952742E-03
+2.533934E-03
+2.215030E-03
+2.945032E-03
+2.597862E-03
+2.300873E-03
+1.991974E-03
+1.679430E-03
+1.636923E-03
+1.581336E-03
+1.431472E-03
+1.419168E-03
+1.256242E-03
 cmfd dominance ratio
 0.000E+00
 0.000E+00
 0.000E+00
 0.000E+00
- 5.433E-01
- 5.463E-01
- 5.421E-01
- 5.439E-01
- 5.435E-01
- 5.456E-01
- 5.482E-01
- 5.458E-01
- 5.458E-01
- 5.462E-01
- 5.494E-01
- 5.486E-01
- 5.492E-01
- 5.482E-01
- 5.482E-01
- 5.492E-01
+ 5.524E-01
+ 5.476E-01
+ 5.474E-01
+ 5.419E-01
+ 5.443E-01
+ 5.448E-01
+ 5.408E-01
+ 5.391E-01
+ 5.400E-01
+ 5.396E-01
+ 5.408E-01
+ 5.398E-01
+ 5.398E-01
+ 5.399E-01
+ 5.388E-01
+ 5.389E-01
 cmfd openmc source comparison
 0.000000E+00
 0.000000E+00
 0.000000E+00
 0.000000E+00
-1.520219E-02
-1.051769E-02
-9.811647E-03
-8.544887E-03
-7.860220E-03
-6.949328E-03
-5.032373E-03
-5.022939E-03
-4.521643E-03
-4.306799E-03
-4.227082E-03
-4.166664E-03
-4.553703E-03
-3.834049E-03
-3.649749E-03
-3.258051E-03
+8.388554E-03
+7.868057E-03
+6.387209E-03
+6.979018E-03
+5.634468E-03
+5.579466E-03
+5.647779E-03
+5.289856E-03
+4.550547E-03
+4.373716E-03
+4.042350E-03
+3.813510E-03
+3.749151E-03
+3.358126E-03
+3.562360E-03
+3.904942E-03
 cmfd source
-4.575620E-02
-8.436685E-02
-1.142434E-01
-1.327994E-01
-1.388492E-01
-1.341762E-01
-1.258878E-01
-1.060199E-01
-7.531612E-02
-4.258493E-02
+4.142294E-02
+7.484382E-02
+1.050784E-01
+1.256771E-01
+1.444717E-01
+1.420230E-01
+1.350735E-01
+1.118744E-01
+7.755343E-02
+4.198177E-02
--- a/tests/test_cmfd_jfnk/results_true.dat
+++ b/tests/test_cmfd_jfnk/results_true.dat
@ -1,128 +1,128 @@
 k-combined:
-1.166352E+00 1.167615E-02
+1.177396E+00 4.883437E-03
 tally 1:
-1.181633E+01
-1.411075E+01
-2.225993E+01
-4.989263E+01
-3.022366E+01
-9.163058E+01
-3.521719E+01
-1.243119E+02
-3.683278E+01
-1.359014E+02
-3.644881E+01
-1.330874E+02
-3.368020E+01
-1.137856E+02
-2.800504E+01
-7.862785E+01
-2.099989E+01
-4.427213E+01
-1.109715E+01
-1.242693E+01
+1.107335E+01
+1.235221E+01
+2.002676E+01
+4.017045E+01
+2.844184E+01
+8.111731E+01
+3.428492E+01
+1.177848E+02
+3.735839E+01
+1.397523E+02
+3.894180E+01
+1.517824E+02
+3.528006E+01
+1.246309E+02
+2.863448E+01
+8.222321E+01
+2.125384E+01
+4.535192E+01
+1.112124E+01
+1.241089E+01
 tally 2:
-2.375435E+01
-2.844812E+01
-1.663749E+01
-1.396549E+01
-2.263679E+00
-2.636946E-01
-4.382531E+01
-9.669964E+01
-3.095313E+01
-4.829350E+01
-4.053211E+00
-8.354098E-01
-5.911795E+01
-1.754446E+02
-4.206165E+01
-8.884145E+01
-5.555905E+00
-1.564759E+00
-6.868764E+01
-2.367084E+02
-4.888499E+01
-1.199267E+02
-6.294307E+00
-2.009790E+00
-7.235623E+01
-2.628007E+02
-5.139839E+01
-1.326712E+02
-6.686118E+00
-2.268764E+00
-7.135408E+01
-2.557589E+02
-5.083886E+01
-1.298291E+02
-6.771083E+00
-2.317293E+00
-6.696601E+01
-2.250860E+02
-4.748258E+01
-1.132403E+02
-6.327041E+00
-2.026095E+00
-5.564372E+01
-1.553574E+02
-3.953729E+01
-7.844444E+01
-5.289683E+00
-1.415775E+00
-4.092756E+01
-8.408073E+01
-2.889867E+01
-4.193356E+01
-3.727944E+00
-7.053359E-01
-2.263358E+01
-2.604194E+01
-1.584561E+01
-1.273998E+01
-2.024017E+00
-2.141218E-01
+2.243113E+01
+2.535057E+01
+1.557550E+01
+1.222813E+01
+2.164704E+00
+2.389690E-01
+4.049814E+01
+8.218116E+01
+2.854669E+01
+4.085264E+01
+3.934452E+00
+7.833208E-01
+5.706024E+01
+1.633739E+02
+4.049737E+01
+8.234850E+01
+5.231368E+00
+1.386110E+00
+6.798682E+01
+2.320807E+02
+4.819178E+01
+1.166820E+02
+6.247056E+00
+1.968990E+00
+7.449317E+01
+2.782374E+02
+5.315156E+01
+1.417287E+02
+6.667584E+00
+2.250879E+00
+7.530107E+01
+2.849330E+02
+5.378916E+01
+1.454619E+02
+7.071012E+00
+2.522919E+00
+6.820303E+01
+2.335083E+02
+4.850330E+01
+1.181013E+02
+6.241747E+00
+1.973368E+00
+5.831373E+01
+1.704779E+02
+4.149124E+01
+8.633656E+01
+5.385636E+00
+1.468642E+00
+4.184350E+01
+8.792430E+01
+2.971699E+01
+4.435896E+01
+3.784806E+00
+7.343249E-01
+2.202673E+01
+2.444732E+01
+1.531988E+01
+1.183160E+01
+2.073873E+00
+2.272561E-01
 tally 3:
-1.602499E+01
-1.295630E+01
-1.060542E+00
-5.920587E-02
-2.980673E+01
-4.480492E+01
-1.936250E+00
-1.905077E-01
-4.051926E+01
-8.246657E+01
-2.606639E+00
-3.437220E-01
-4.705779E+01
-1.111431E+02
-3.028454E+00
-4.619883E-01
-4.957304E+01
-1.234274E+02
-3.176475E+00
-5.108616E-01
-4.897053E+01
-1.204739E+02
-3.080782E+00
-4.792314E-01
-4.569001E+01
-1.048762E+02
-2.913485E+00
-4.283033E-01
-3.800244E+01
-7.248583E+01
-2.465881E+00
-3.073302E-01
-2.784859E+01
-3.895822E+01
-1.770793E+00
-1.579009E-01
-1.528645E+01
-1.186641E+01
-1.015624E+00
-5.285299E-02
+1.500439E+01
+1.135466E+01
+9.942586E-01
+5.051831E-02
+2.744453E+01
+3.776958E+01
+1.781992E+00
+1.612021E-01
+3.901013E+01
+7.642401E+01
+2.472924E+00
+3.077607E-01
+4.642527E+01
+1.082730E+02
+2.924369E+00
+4.335819E-01
+5.109083E+01
+1.309660E+02
+3.325865E+00
+5.592642E-01
+5.182512E+01
+1.350762E+02
+3.259912E+00
+5.350517E-01
+4.672480E+01
+1.095974E+02
+3.097309E+00
+4.854729E-01
+3.997405E+01
+8.014326E+01
+2.589176E+00
+3.374615E-01
+2.861624E+01
+4.114210E+01
+1.806237E+00
+1.656944E-01
+1.474531E+01
+1.096355E+01
+9.807860E-01
+4.934364E-02
 tally 4:
 0.000000E+00
 0.000000E+00
@ -160,8 +160,8 @@ tally 4:
 0.000000E+00
 0.000000E+00
 0.000000E+00
-3.198289E+00
-5.148488E-01
+3.050887E+00
+4.698799E-01
 0.000000E+00
 0.000000E+00
 0.000000E+00
@ -208,10 +208,10 @@ tally 4:
 0.000000E+00
 0.000000E+00
 0.000000E+00
-5.696337E+00
-1.628487E+00
-2.860206E+00
-4.137254E-01
+5.388951E+00
+1.456464E+00
+2.664528E+00
+3.577345E-01
 0.000000E+00
 0.000000E+00
 0.000000E+00
@ -256,10 +256,10 @@ tally 4:
 0.000000E+00
 0.000000E+00
 0.000000E+00
-7.588948E+00
-2.895325E+00
-5.292314E+00
-1.413583E+00
+7.165280E+00
+2.573230E+00
+4.930263E+00
+1.218988E+00
 0.000000E+00
 0.000000E+00
 0.000000E+00
@ -304,10 +304,10 @@ tally 4:
 0.000000E+00
 0.000000E+00
 0.000000E+00
-8.876155E+00
-3.953353E+00
-7.255925E+00
-2.639713E+00
+8.550278E+00
+3.668687E+00
+6.985934E+00
+2.450395E+00
 0.000000E+00
 0.000000E+00
 0.000000E+00
@ -352,10 +352,10 @@ tally 4:
 0.000000E+00
 0.000000E+00
 0.000000E+00
-9.354049E+00
-4.393658E+00
-8.482819E+00
-3.610891E+00
+9.236725E+00
+4.281659E+00
+8.429932E+00
+3.565264E+00
 0.000000E+00
 0.000000E+00
 0.000000E+00
@ -400,10 +400,10 @@ tally 4:
 0.000000E+00
 0.000000E+00
 0.000000E+00
-8.943279E+00
-4.014844E+00
-8.979641E+00
-4.049912E+00
+9.396613E+00
+4.431004E+00
+9.307625E+00
+4.351276E+00
 0.000000E+00
 0.000000E+00
 0.000000E+00
@ -448,10 +448,10 @@ tally 4:
 0.000000E+00
 0.000000E+00
 0.000000E+00
-8.300834E+00
-3.459191E+00
-9.090369E+00
-4.158129E+00
+8.721885E+00
+3.821463E+00
+9.438995E+00
+4.479948E+00
 0.000000E+00
 0.000000E+00
 0.000000E+00
@ -496,10 +496,10 @@ tally 4:
 0.000000E+00
 0.000000E+00
 0.000000E+00
-6.804280E+00
-2.322582E+00
-8.354155E+00
-3.514646E+00
+7.096946E+00
+2.525113E+00
+8.605114E+00
+3.710134E+00
 0.000000E+00
 0.000000E+00
 0.000000E+00
@ -544,10 +544,10 @@ tally 4:
 0.000000E+00
 0.000000E+00
 0.000000E+00
-5.046905E+00
-1.278109E+00
-7.174660E+00
-2.586803E+00
+5.222832E+00
+1.373166E+00
+7.480684E+00
+2.804650E+00
 0.000000E+00
 0.000000E+00
 0.000000E+00
@ -592,10 +592,10 @@ tally 4:
 0.000000E+00
 0.000000E+00
 0.000000E+00
-2.662185E+00
-3.600983E-01
-5.306922E+00
-1.415937E+00
+2.726690E+00
+3.773397E-01
+5.470375E+00
+1.504111E+00
 0.000000E+00
 0.000000E+00
 0.000000E+00
@ -642,8 +642,8 @@ tally 4:
 0.000000E+00
 0.000000E+00
 0.000000E+00
-3.042882E+00
-4.659100E-01
+3.026290E+00
+4.597502E-01
 0.000000E+00
 0.000000E+00
 0.000000E+00
@ -662,64 +662,64 @@ k cmfd
 0.000000E+00
 0.000000E+00
 0.000000E+00
-1.155207E+00
-1.161934E+00
-1.162573E+00
-1.155825E+00
-1.156010E+00
-1.155352E+00
-1.149838E+00
-1.160768E+00
-1.160453E+00
-1.169217E+00
-1.162716E+00
-1.161432E+00
-1.163968E+00
-1.165559E+00
-1.164094E+00
-1.159570E+00
+1.150583E+00
+1.159578E+00
+1.162798E+00
+1.171003E+00
+1.162732E+00
+1.165591E+00
+1.166032E+00
+1.165387E+00
+1.165451E+00
+1.170726E+00
+1.170820E+00
+1.167945E+00
+1.166050E+00
+1.165757E+00
+1.167631E+00
+1.168366E+00
 cmfd entropy
 0.000000E+00
 0.000000E+00
 0.000000E+00
 0.000000E+00
-3.220491E+00
-3.222825E+00
-3.218323E+00
-3.219037E+00
-3.218088E+00
-3.218982E+00
-3.223440E+00
-3.219003E+00
-3.219661E+00
-3.222534E+00
-3.226366E+00
-3.225935E+00
-3.225693E+00
-3.225236E+00
-3.226171E+00
-3.227775E+00
+3.215201E+00
+3.212850E+00
+3.214094E+00
+3.208054E+00
+3.212891E+00
+3.213349E+00
+3.208290E+00
+3.206895E+00
+3.208786E+00
+3.209630E+00
+3.212321E+00
+3.211750E+00
+3.212453E+00
+3.213370E+00
+3.211791E+00
+3.212685E+00
 cmfd balance
 0.000000E+00
 0.000000E+00
 0.000000E+00
 0.000000E+00
-7.152541E-03
-7.231826E-03
-5.207222E-03
-4.847674E-03
-4.190622E-03
-3.646931E-03
-3.246272E-03
-4.268558E-03
-3.666841E-03
-3.201934E-03
-2.607402E-03
-2.522363E-03
-2.503931E-03
-2.357463E-03
-2.164466E-03
-1.815206E-03
+6.348026E-03
+5.102747E-03
+4.043947E-03
+3.952742E-03
+2.533934E-03
+2.215030E-03
+2.945032E-03
+2.597862E-03
+2.300873E-03
+1.991974E-03
+1.679430E-03
+1.636923E-03
+1.581336E-03
+1.431472E-03
+1.419168E-03
+1.256242E-03
 cmfd dominance ratio
 0.000E+00
 0.000E+00
@ -746,30 +746,30 @@ cmfd openmc source comparison
 0.000000E+00
 0.000000E+00
 0.000000E+00
-1.520220E-02
-1.051769E-02
-9.811648E-03
-8.544888E-03
-7.860220E-03
-6.949329E-03
-5.032373E-03
-5.022939E-03
-4.521643E-03
-4.306800E-03
-4.227084E-03
-4.166665E-03
-4.553705E-03
-3.834051E-03
-3.649750E-03
-3.258053E-03
+8.388554E-03
+7.868057E-03
+6.387210E-03
+6.979018E-03
+5.634468E-03
+5.579467E-03
+5.647780E-03
+5.289856E-03
+4.550548E-03
+4.373716E-03
+4.042349E-03
+3.813510E-03
+3.749150E-03
+3.358125E-03
+3.562360E-03
+3.904943E-03
 cmfd source
-4.575620E-02
-8.436685E-02
-1.142434E-01
-1.327994E-01
-1.388492E-01
-1.341762E-01
-1.258878E-01
-1.060199E-01
-7.531612E-02
-4.258493E-02
+4.142294E-02
+7.484381E-02
+1.050784E-01
+1.256771E-01
+1.444717E-01
+1.420230E-01
+1.350735E-01
+1.118744E-01
+7.755343E-02
+4.198177E-02
--- a/tests/test_cmfd_nofeed/results_true.dat
+++ b/tests/test_cmfd_nofeed/results_true.dat
@ -1,128 +1,128 @@
 k-combined:
-1.172791E+00 6.252959E-03
+1.170519E+00 8.422959E-03
 tally 1:
-1.163448E+01
-1.363980E+01
-2.145286E+01
-4.616529E+01
-2.888253E+01
-8.376909E+01
-3.373143E+01
-1.141757E+02
-3.746579E+01
-1.406721E+02
-3.777515E+01
-1.428729E+02
-3.386238E+01
-1.147938E+02
-2.897188E+01
-8.420449E+01
-2.136315E+01
-4.582748E+01
-1.108879E+01
-1.236048E+01
+1.078122E+01
+1.170828E+01
+1.999878E+01
+4.018561E+01
+2.812898E+01
+7.936860E+01
+3.362276E+01
+1.133841E+02
+3.714459E+01
+1.382628E+02
+3.828125E+01
+1.470408E+02
+3.599263E+01
+1.299451E+02
+3.090749E+01
+9.596105E+01
+2.144103E+01
+4.630323E+01
+1.143002E+01
+1.314355E+01
 tally 2:
-2.372805E+01
-2.837972E+01
-1.658800E+01
-1.388151E+01
-2.247323E+00
-2.582582E-01
-4.299776E+01
-9.287131E+01
-3.043200E+01
-4.657631E+01
-3.934057E+00
-7.973541E-01
-5.684445E+01
-1.623153E+02
-4.034800E+01
-8.179073E+01
-5.379322E+00
-1.465670E+00
-6.606709E+01
-2.191486E+02
-4.692300E+01
-1.106126E+02
-5.750728E+00
-1.674662E+00
-7.255562E+01
-2.645381E+02
-5.158400E+01
-1.337742E+02
-6.636809E+00
-2.234026E+00
-7.201624E+01
-2.607904E+02
-5.120900E+01
-1.318401E+02
-6.679637E+00
-2.260160E+00
-6.713101E+01
-2.261599E+02
-4.758700E+01
-1.136620E+02
-6.543521E+00
-2.167610E+00
-5.662017E+01
-1.608249E+02
-4.020700E+01
-8.115173E+01
-5.470801E+00
-1.508646E+00
-4.250475E+01
-9.067511E+01
-3.008800E+01
-4.543510E+01
-3.893346E+00
-7.757374E-01
-2.346776E+01
-2.789085E+01
-1.631500E+01
-1.346917E+01
-2.248911E+00
-2.635335E-01
+2.247115E+01
+2.548076E+01
+1.574700E+01
+1.251937E+01
+2.119907E+00
+2.284737E-01
+4.160187E+01
+8.733627E+01
+2.945600E+01
+4.383448E+01
+4.027136E+00
+8.279807E-01
+5.722117E+01
+1.643758E+02
+4.057100E+01
+8.267151E+01
+5.388803E+00
+1.465180E+00
+6.769175E+01
+2.300722E+02
+4.800300E+01
+1.157663E+02
+6.213554E+00
+1.946061E+00
+7.376629E+01
+2.729167E+02
+5.253400E+01
+1.385018E+02
+6.438590E+00
+2.103693E+00
+7.454128E+01
+2.790080E+02
+5.311800E+01
+1.417584E+02
+6.784745E+00
+2.328936E+00
+6.907125E+01
+2.397912E+02
+4.912000E+01
+1.213330E+02
+6.405754E+00
+2.075535E+00
+6.012056E+01
+1.815248E+02
+4.280600E+01
+9.207864E+01
+5.534450E+00
+1.555396E+00
+4.229808E+01
+8.999380E+01
+3.003200E+01
+4.541718E+01
+3.844618E+00
+7.537006E-01
+2.272774E+01
+2.597695E+01
+1.577800E+01
+1.252728E+01
+2.221451E+00
+2.528223E-01
 tally 3:
-1.601100E+01
-1.293342E+01
-1.062007E+00
-5.868554E-02
-2.927700E+01
-4.312144E+01
-1.921709E+00
-1.866340E-01
-3.887000E+01
-7.592933E+01
-2.578823E+00
-3.377406E-01
-4.523100E+01
-1.028071E+02
-2.905782E+00
-4.248071E-01
-4.966300E+01
-1.240308E+02
-3.172094E+00
-5.080457E-01
-4.933600E+01
-1.223712E+02
-3.077790E+00
-4.818212E-01
-4.581400E+01
-1.053633E+02
-2.952966E+00
-4.398204E-01
-3.859900E+01
-7.480105E+01
-2.487981E+00
-3.120526E-01
-2.904800E+01
-4.235413E+01
-1.830501E+00
-1.695713E-01
-1.571800E+01
-1.251318E+01
-1.042785E+00
-5.535596E-02
+1.517200E+01
+1.162361E+01
+9.172562E-01
+4.342120E-02
+2.835000E+01
+4.061736E+01
+1.868192E+00
+1.761390E-01
+3.911800E+01
+7.686442E+01
+2.478956E+00
+3.088180E-01
+4.617600E+01
+1.071239E+02
+2.980518E+00
+4.488545E-01
+5.059100E+01
+1.284662E+02
+3.257651E+00
+5.341674E-01
+5.115000E+01
+1.314866E+02
+3.365441E+00
+5.729274E-01
+4.732100E+01
+1.126317E+02
+3.051596E+00
+4.705140E-01
+4.120700E+01
+8.535705E+01
+2.704451E+00
+3.705800E-01
+2.900900E+01
+4.238065E+01
+1.872660E+00
+1.780668E-01
+1.520000E+01
+1.162785E+01
+1.007084E+00
+5.171907E-02
 tally 4:
 0.000000E+00
 0.000000E+00
@ -160,8 +160,8 @@ tally 4:
 0.000000E+00
 0.000000E+00
 0.000000E+00
-3.203000E+00
-5.158630E-01
+3.017000E+00
+4.575810E-01
 0.000000E+00
 0.000000E+00
 0.000000E+00
@ -208,10 +208,10 @@ tally 4:
 0.000000E+00
 0.000000E+00
 0.000000E+00
-5.609000E+00
-1.577889E+00
-2.821000E+00
-4.027670E-01
+5.447000E+00
+1.491865E+00
+2.697000E+00
+3.709330E-01
 0.000000E+00
 0.000000E+00
 0.000000E+00
@ -256,10 +256,10 @@ tally 4:
 0.000000E+00
 0.000000E+00
 0.000000E+00
-7.388000E+00
-2.743104E+00
-5.132000E+00
-1.326058E+00
+7.403000E+00
+2.751813E+00
+5.151000E+00
+1.334701E+00
 0.000000E+00
 0.000000E+00
 0.000000E+00
@ -304,10 +304,10 @@ tally 4:
 0.000000E+00
 0.000000E+00
 0.000000E+00
-8.546000E+00
-3.663882E+00
-7.038000E+00
-2.485210E+00
+8.635000E+00
+3.741143E+00
+7.048000E+00
+2.495310E+00
 0.000000E+00
 0.000000E+00
 0.000000E+00
@ -352,10 +352,10 @@ tally 4:
 0.000000E+00
 0.000000E+00
 0.000000E+00
-9.133000E+00
-4.188925E+00
-8.421000E+00
-3.562213E+00
+9.381000E+00
+4.415619E+00
+8.456000E+00
+3.587840E+00
 0.000000E+00
 0.000000E+00
 0.000000E+00
@ -400,10 +400,10 @@ tally 4:
 0.000000E+00
 0.000000E+00
 0.000000E+00
-9.030000E+00
-4.099006E+00
-9.130000E+00
-4.191968E+00
+9.297000E+00
+4.334551E+00
+9.198000E+00
+4.240540E+00
 0.000000E+00
 0.000000E+00
 0.000000E+00
@ -448,10 +448,10 @@ tally 4:
 0.000000E+00
 0.000000E+00
 0.000000E+00
-8.215000E+00
-3.386667E+00
-9.060000E+00
-4.129934E+00
+8.737000E+00
+3.843559E+00
+9.508000E+00
+4.553256E+00
 0.000000E+00
 0.000000E+00
 0.000000E+00
@ -496,10 +496,10 @@ tally 4:
 0.000000E+00
 0.000000E+00
 0.000000E+00
-6.879000E+00
-2.379269E+00
-8.481000E+00
-3.624165E+00
+7.338000E+00
+2.709162E+00
+8.888000E+00
+3.969398E+00
 0.000000E+00
 0.000000E+00
 0.000000E+00
@ -544,10 +544,10 @@ tally 4:
 0.000000E+00
 0.000000E+00
 0.000000E+00
-5.201000E+00
-1.360099E+00
-7.317000E+00
-2.690989E+00
+5.354000E+00
+1.442386E+00
+7.584000E+00
+2.887298E+00
 0.000000E+00
 0.000000E+00
 0.000000E+00
@ -592,10 +592,10 @@ tally 4:
 0.000000E+00
 0.000000E+00
 0.000000E+00
-2.794000E+00
-3.955460E-01
-5.480000E+00
-1.507540E+00
+2.707000E+00
+3.709270E-01
+5.507000E+00
+1.522587E+00
 0.000000E+00
 0.000000E+00
 0.000000E+00
@ -642,8 +642,8 @@ tally 4:
 0.000000E+00
 0.000000E+00
 0.000000E+00
-3.083000E+00
-4.785830E-01
+3.112000E+00
+4.868600E-01
 0.000000E+00
 0.000000E+00
 0.000000E+00
@ -662,114 +662,114 @@ k cmfd
 0.000000E+00
 0.000000E+00
 0.000000E+00
-1.155207E+00
-1.158935E+00
-1.155638E+00
-1.156869E+00
-1.149254E+00
-1.142535E+00
-1.147154E+00
-1.149307E+00
-1.155432E+00
-1.154360E+00
-1.158046E+00
-1.161285E+00
-1.162239E+00
-1.159876E+00
-1.160788E+00
-1.159887E+00
+1.150583E+00
+1.160876E+00
+1.160893E+00
+1.157393E+00
+1.157826E+00
+1.163206E+00
+1.169286E+00
+1.169322E+00
+1.169866E+00
+1.177576E+00
+1.183172E+00
+1.184784E+00
+1.186581E+00
+1.183233E+00
+1.181032E+00
+1.180107E+00
 cmfd entropy
 0.000000E+00
 0.000000E+00
 0.000000E+00
 0.000000E+00
-3.220491E+00
-3.220661E+00
-3.229936E+00
-3.229924E+00
-3.231123E+00
-3.231398E+00
-3.229138E+00
-3.230592E+00
-3.228648E+00
-3.229301E+00
-3.227132E+00
-3.229052E+00
-3.228856E+00
-3.230663E+00
-3.230136E+00
-3.231025E+00
+3.215201E+00
+3.214833E+00
+3.211409E+00
+3.218241E+00
+3.220068E+00
+3.217667E+00
+3.214425E+00
+3.215427E+00
+3.214339E+00
+3.212343E+00
+3.211075E+00
+3.211281E+00
+3.209704E+00
+3.210597E+00
+3.213481E+00
+3.213943E+00
 cmfd balance
 0.000000E+00
 0.000000E+00
 0.000000E+00
 0.000000E+00
-7.152541E-03
-7.104497E-03
-3.644474E-03
-4.530563E-03
-3.122133E-03
-2.665224E-03
-3.131292E-03
-3.095093E-03
-3.182336E-03
-2.914286E-03
-2.668155E-03
-2.322013E-03
-2.261088E-03
-2.100433E-03
-2.068427E-03
-1.991522E-03
+6.348026E-03
+4.651411E-03
+3.551519E-03
+2.893286E-03
+2.930836E-03
+2.342081E-03
+2.443793E-03
+2.380658E-03
+2.091259E-03
+2.144887E-03
+2.055334E-03
+1.907704E-03
+1.879350E-03
+1.598308E-03
+1.247988E-03
+1.179680E-03
 cmfd dominance ratio
 0.000E+00
 0.000E+00
 0.000E+00
 0.000E+00
+ 5.524E-01
+ 5.492E-01
+ 5.459E-01
+ 5.486E-01
+ 5.475E-01
+ 5.455E-01
 5.433E-01
- 5.438E-01
- 5.499E-01
- 5.527E-01
- 5.556E-01
- 5.556E-01
- 5.540E-01
- 5.545E-01
- 5.521E-01
- 5.530E-01
- 5.510E-01
- 5.515E-01
- 5.500E-01
- 5.514E-01
- 5.506E-01
- 5.515E-01
+ 5.425E-01
+ 5.412E-01
+ 5.404E-01
+ 5.399E-01
+ 5.400E-01
+ 5.401E-01
+ 5.414E-01
+ 5.433E-01
+ 5.437E-01
 cmfd openmc source comparison
 0.000000E+00
 0.000000E+00
 0.000000E+00
 0.000000E+00
-1.520219E-02
-1.064239E-02
-7.165390E-03
-6.348371E-03
-6.195458E-03
-5.926990E-03
-5.851775E-03
-4.374979E-03
-4.719631E-03
-4.419781E-03
-4.364431E-03
-3.551498E-03
-3.772091E-03
-2.907247E-03
-3.421922E-03
-2.616239E-03
+8.388554E-03
+6.525044E-03
+5.810856E-03
+3.651620E-03
+3.448625E-03
+3.805838E-03
+4.064235E-03
+3.244723E-03
+3.963513E-03
+4.186768E-03
+3.785555E-03
+2.732731E-03
+2.308430E-03
+2.074797E-03
+1.581512E-03
+1.729988E-03
 cmfd source
-4.503063E-02
-8.252550E-02
-1.117300E-01
-1.266280E-01
-1.386100E-01
-1.348011E-01
-1.291490E-01
-1.083842E-01
-7.890593E-02
-4.423568E-02
+3.816410E-02
+7.860013E-02
+1.050204E-01
+1.270331E-01
+1.389768E-01
+1.438216E-01
+1.304530E-01
+1.155470E-01
+7.975741E-02
+4.262650E-02
--- a/tests/test_confidence_intervals/results_true.dat
+++ b/tests/test_confidence_intervals/results_true.dat
@ -1,5 +1,5 @@
 k-combined:
-3.024518E-01 5.455257E-03
+2.913599E-01 6.738749E-03
 tallies:
-6.500714E+01
-5.304197E+02
+6.420923E+01
+5.190738E+02
--- a/tests/test_density_atombcm/results_true.dat
+++ b/tests/test_density_atombcm/results_true.dat
@ -1,2 +1,2 @@
 k-combined:
-1.752550E+00 2.449583E-02
+1.760126E+00 1.038820E-02
--- a/tests/test_density_atomcm3/results_true.dat
+++ b/tests/test_density_atomcm3/results_true.dat
@ -1,2 +1,2 @@
 k-combined:
-1.098756E+00 5.348243E-03
+1.092203E+00 1.990175E-02
--- a/tests/test_density_kgm3/results_true.dat
+++ b/tests/test_density_kgm3/results_true.dat
@ -1,2 +1,2 @@
 k-combined:
-8.114640E-01 1.668731E-02
+8.085745E-01 9.674582E-03
--- a/tests/test_density_sum/results_true.dat
+++ b/tests/test_density_sum/results_true.dat
@ -1,2 +1,2 @@
 k-combined:
-3.125997E-01 2.926683E-03
+3.319139E-01 1.688777E-02
--- a/tests/test_eigenvalue_genperbatch/results_true.dat
+++ b/tests/test_eigenvalue_genperbatch/results_true.dat
@ -1,2 +1,2 @@
 k-combined:
-2.977802E-01 1.555276E-04
+3.012381E-01 1.890480E-03
--- a/tests/test_eigenvalue_no_inactive/results_true.dat
+++ b/tests/test_eigenvalue_no_inactive/results_true.dat
@ -1,2 +1,2 @@
 k-combined:
-3.107793E-01 6.372010E-03
+3.066374E-01 7.794575E-03
--- a/tests/test_energy_grid/results_true.dat
+++ b/tests/test_energy_grid/results_true.dat
@ -1,2 +1,2 @@
 k-combined:
-3.016492E-01 7.391211E-03
+3.215828E-01 2.966835E-03
--- a/tests/test_entropy/results_true.dat
+++ b/tests/test_entropy/results_true.dat
@ -1,13 +1,13 @@
 k-combined:
-3.037840E-01 4.395585E-03
+3.011726E-01 1.841644E-03
 entropy:
-7.114513E+00
-8.055602E+00
-8.238326E+00
-8.257291E+00
-8.322657E+00
-8.269075E+00
-8.304070E+00
-8.328516E+00
-8.238311E+00
-8.276390E+00
+7.608094E+00
+8.167702E+00
+8.273634E+00
+8.238974E+00
+8.307173E+00
+8.239618E+00
+8.230443E+00
+8.201657E+00
+8.289158E+00
+8.364683E+00
--- a/tests/test_filter_cell/results_true.dat
+++ b/tests/test_filter_cell/results_true.dat
@ -1,11 +1,11 @@
 k-combined:
-1.054379E+00 1.552941E-01
+1.026057E+00 2.398033E-02
 tallies:
 0.000000E+00
 0.000000E+00
-1.617612E+01
-5.390254E+01
-3.372300E+00
-2.331937E+00
-4.802737E+01
-4.730991E+02
+1.890713E+01
+7.152908E+01
+3.917546E+00
+3.075301E+00
+5.552927E+01
+6.183865E+02
--- a/tests/test_filter_cellborn/results_true.dat
+++ b/tests/test_filter_cellborn/results_true.dat
@ -1,10 +1,10 @@
 k-combined:
-1.054379E+00 1.552941E-01
+1.026057E+00 2.398033E-02
 tallies:
 0.000000E+00
 0.000000E+00
-7.758694E+01
-1.236890E+03
+9.139025E+01
+1.677920E+03
 0.000000E+00
 0.000000E+00
 0.000000E+00
--- a/tests/test_filter_energy/results_true.dat
+++ b/tests/test_filter_energy/results_true.dat
@ -1,11 +1,11 @@
 k-combined:
-1.054379E+00 1.552941E-01
+1.026057E+00 2.398033E-02
 tallies:
-2.566768E+01
-1.351306E+02
-4.240229E+01
-3.607346E+02
-5.235041E+01
-5.533570E+02
-9.577046E+00
-1.839535E+01
+3.042702E+01
+1.853385E+02
+4.178722E+01
+3.512687E+02
+5.646523E+01
+6.385839E+02
+1.076536E+01
+2.354172E+01
--- a/tests/test_filter_energyout/results_true.dat
+++ b/tests/test_filter_energyout/results_true.dat
@ -1,11 +1,11 @@
 k-combined:
-1.054379E+00 1.552941E-01
+1.026057E+00 2.398033E-02
 tallies:
-2.588000E+01
-1.367664E+02
-4.217000E+01
-3.560817E+02
-5.020000E+01
-5.082846E+02
-6.380000E+00
-8.171200E+00
+2.946000E+01
+1.737786E+02
+4.311000E+01
+3.722645E+02
+5.405000E+01
+5.861625E+02
+7.210000E+00
+1.053790E+01
--- a/tests/test_filter_group_transfer/results_true.dat
+++ b/tests/test_filter_group_transfer/results_true.dat
@ -1,67 +1,67 @@
 k-combined:
-1.054379E+00 1.552941E-01
+1.026057E+00 2.398033E-02
 tallies:
-2.346000E+01
-1.126806E+02
+2.669000E+01
+1.427261E+02
 0.000000E+00
 0.000000E+00
-6.000000E-02
-1.800000E-03
+1.000000E-01
+2.200000E-03
 0.000000E+00
 0.000000E+00
 0.000000E+00
 0.000000E+00
-9.270731E-01
-1.825304E-01
+9.216998E-01
+1.723927E-01
 0.000000E+00
 0.000000E+00
-2.142403E+00
-9.826517E-01
-2.420000E+00
-1.191400E+00
+2.318870E+00
+1.101279E+00
+2.770000E+00
+1.544500E+00
 0.000000E+00
 0.000000E+00
-3.761000E+01
-2.832655E+02
+3.830000E+01
+2.939262E+02
 0.000000E+00
 0.000000E+00
 0.000000E+00
 0.000000E+00
-4.748734E-01
-4.981454E-02
+4.392023E-01
+4.483407E-02
 0.000000E+00
 0.000000E+00
-9.700282E-01
-1.960175E-01
+1.034620E+00
+2.183695E-01
 0.000000E+00
 0.000000E+00
 0.000000E+00
 0.000000E+00
-4.500000E+00
-4.052800E+00
+4.700000E+00
+4.418400E+00
 0.000000E+00
 0.000000E+00
-4.707000E+01
-4.473535E+02
-1.000287E-02
-1.000574E-04
+5.068000E+01
+5.156254E+02
+2.988653E-02
+2.977530E-04
 0.000000E+00
 0.000000E+00
-4.837681E-02
-6.455453E-04
+6.285441E-02
+1.122296E-03
 0.000000E+00
 0.000000E+00
 0.000000E+00
 0.000000E+00
+1.000000E-02
+1.000000E-04
 0.000000E+00
 0.000000E+00
-0.000000E+00
-0.000000E+00
-3.130000E+00
-1.970500E+00
-1.528257E-01
-6.554951E-03
-6.380000E+00
-8.171200E+00
-2.585943E-01
-1.482792E-02
+3.370000E+00
+2.274100E+00
+1.346003E-01
+4.276369E-03
+7.210000E+00
+1.053790E+01
+2.760328E-01
+1.728087E-02
--- a/tests/test_filter_material/results_true.dat
+++ b/tests/test_filter_material/results_true.dat
@ -1,11 +1,11 @@
 k-combined:
-1.054379E+00 1.552941E-01
+1.026057E+00 2.398033E-02
 tallies:
-2.837037E+01
-1.620037E+02
-6.601729E+00
-8.768563E+00
-5.568540E+01
-6.338942E+02
-3.889868E+01
-3.062900E+02
+2.965464E+01
+1.766718E+02
+6.972495E+00
+9.750915E+00
+6.670645E+01
+8.919447E+02
+3.609345E+01
+2.630165E+02
--- a/tests/test_filter_mesh_2d/results_true.dat
+++ b/tests/test_filter_mesh_2d/results_true.dat
@ -1,5 +1,5 @@
 k-combined:
-1.054379E+00 1.552941E-01
+1.026057E+00 2.398033E-02
 tallies:
 0.000000E+00
 0.000000E+00
@ -9,16 +9,10 @@ tallies:
 0.000000E+00
 0.000000E+00
 0.000000E+00
-2.067448E-01
-4.274340E-02
 0.000000E+00
 0.000000E+00
 0.000000E+00
 0.000000E+00
-1.599145E-01
-2.557265E-02
-1.519117E+00
-9.308124E-01
 0.000000E+00
 0.000000E+00
 0.000000E+00
@ -29,6 +23,8 @@ tallies:
 0.000000E+00
 0.000000E+00
 0.000000E+00
+3.836091E-02
+1.471559E-03
 0.000000E+00
 0.000000E+00
 0.000000E+00
@ -39,26 +35,8 @@ tallies:
 0.000000E+00
 0.000000E+00
 0.000000E+00
-2.687180E-01
-6.399534E-02
-9.204269E-01
-3.088182E-01
-1.632932E+00
-8.695881E-01
-6.186874E-01
-1.041492E-01
 0.000000E+00
 0.000000E+00
-2.221122E-01
-4.933385E-02
-8.439520E-01
-3.590517E-01
-1.578772E+00
-6.411680E-01
-1.594478E+00
-6.497806E-01
-6.689754E-01
-4.425723E-01
 0.000000E+00
 0.000000E+00
 0.000000E+00
@ -73,28 +51,18 @@ tallies:
 0.000000E+00
 0.000000E+00
 0.000000E+00
-8.446397E-02
-7.134162E-03
-6.402967E-01
-2.318525E-01
-1.374164E+00
-6.611604E-01
-1.745391E+00
-7.454444E-01
-2.383491E-01
-3.706916E-02
 0.000000E+00
 0.000000E+00
-3.407922E-01
-1.161393E-01
-5.151862E-01
-1.527476E-01
-1.307839E-02
-1.034804E-04
 0.000000E+00
 0.000000E+00
 0.000000E+00
 0.000000E+00
+7.352387E-01
+2.794248E-01
+1.032868E-02
+1.066817E-04
+1.327783E-01
+1.763007E-02
 0.000000E+00
 0.000000E+00
 0.000000E+00
@ -105,30 +73,14 @@ tallies:
 0.000000E+00
 0.000000E+00
 0.000000E+00
-9.372645E-02
-8.784647E-03
-6.458807E-01
-2.095348E-01
-1.150039E+00
-6.274417E-01
-1.873097E-01
-1.754781E-02
-1.493926E+00
-6.164041E-01
-9.062028E-01
-2.151813E-01
-1.325532E-01
-1.757034E-02
 0.000000E+00
 0.000000E+00
-2.544600E-01
-6.474989E-02
-1.401886E+00
-6.972891E-01
-2.267686E-01
-4.934623E-02
+1.347755E-02
+1.816445E-04
 0.000000E+00
 0.000000E+00
+2.162821E-01
+4.677795E-02
 0.000000E+00
 0.000000E+00
 0.000000E+00
@ -139,168 +91,152 @@ tallies:
 0.000000E+00
 0.000000E+00
 0.000000E+00
+9.336124E-02
+5.297326E-03
+4.089674E-01
+1.017207E-01
+6.736831E-02
+4.538490E-03
 0.000000E+00
 0.000000E+00
-2.078371E-03
-4.319627E-06
-9.479189E-01
-2.438654E-01
-3.378721E-02
-1.141575E-03
-1.473350E-01
-2.170760E-02
-7.168298E-02
-2.952718E-03
 0.000000E+00
 0.000000E+00
 0.000000E+00
 0.000000E+00
-2.151936E-03
-4.630831E-06
-3.139825E-01
-9.858503E-02
-1.926235E-01
-3.710383E-02
-4.482643E-02
-2.009409E-03
 0.000000E+00
 0.000000E+00
 0.000000E+00
 0.000000E+00
 0.000000E+00
 0.000000E+00
+2.917187E-01
+5.596181E-02
+6.262470E-01
+1.624019E-01
+2.319411E-01
+1.795124E-02
 0.000000E+00
 0.000000E+00
 0.000000E+00
 0.000000E+00
-1.876912E-01
-1.764015E-02
-1.904301E-02
-3.626364E-04
-1.689326E+00
-6.461632E-01
-1.618705E+00
-7.658065E-01
-2.834105E+00
-2.848933E+00
-1.072911E+00
-4.098442E-01
-1.760863E-01
-1.897331E-02
 0.000000E+00
 0.000000E+00
 0.000000E+00
 0.000000E+00
-2.211684E-01
-4.360902E-02
-3.026360E-01
-5.734557E-02
-1.122832E+00
-4.516283E-01
-2.302663E+00
-1.556442E+00
-5.823690E-01
-2.428142E-01
 0.000000E+00
 0.000000E+00
+1.134133E+00
+5.529588E-01
+1.623143E+00
+9.666429E-01
+2.602630E-01
+3.315159E-02
+8.014687E-02
+6.423521E-03
 0.000000E+00
 0.000000E+00
 0.000000E+00
 0.000000E+00
-4.026094E-01
-8.517381E-02
-8.827804E-01
-4.907232E-01
-1.833169E+00
-1.165023E+00
-2.114901E+00
-1.134256E+00
-2.223548E+00
-1.617526E+00
-2.796086E+00
-1.960185E+00
-3.215277E-01
-4.495988E-02
-4.382839E-02
-1.920927E-03
 0.000000E+00
 0.000000E+00
 0.000000E+00
 0.000000E+00
-2.152480E-02
-4.633168E-04
-7.203850E-01
-2.429183E-01
-8.687570E-01
-2.115590E-01
-4.204620E-01
-7.683254E-02
 0.000000E+00
 0.000000E+00
 0.000000E+00
 0.000000E+00
+9.122878E-02
+4.277808E-03
+1.136603E+00
+6.461604E-01
 0.000000E+00
 0.000000E+00
-4.345250E-01
-1.630579E-01
-1.217218E+00
-3.724462E-01
-4.249000E-01
-1.607358E-01
-9.804244E-01
-3.289318E-01
-1.571290E+00
-6.349369E-01
-2.544509E+00
-1.508294E+00
-4.223501E-01
-8.450420E-02
-9.462371E-01
-3.727546E-01
+1.333411E-01
+1.777986E-02
+2.872220E-01
+6.196942E-02
+1.368212E-01
+1.476107E-02
+1.497209E+00
+4.788675E-01
+3.958026E+00
+3.433393E+00
+4.453300E+00
+5.159976E+00
+6.131886E-01
+1.223407E-01
+7.691202E-01
+2.885362E-01
+3.613759E-01
+7.174128E-02
+5.612937E-01
+3.150506E-01
 0.000000E+00
 0.000000E+00
 0.000000E+00
 0.000000E+00
-3.150438E-01
-9.925260E-02
-1.656870E-01
-2.255602E-02
-9.080601E-02
-8.245731E-03
 0.000000E+00
 0.000000E+00
 0.000000E+00
 0.000000E+00
+2.383236E-02
+5.679816E-04
+2.468013E-02
+6.091089E-04
 0.000000E+00
 0.000000E+00
+4.042875E-01
+8.356324E-02
+6.887631E-01
+2.322419E-01
+3.987925E+00
+3.665009E+00
+3.731626E+00
+2.825352E+00
+4.075835E+00
+4.219646E+00
+3.492372E+00
+3.216436E+00
+2.625313E+00
+1.855692E+00
+3.386726E+00
+2.549125E+00
+1.621099E-01
+2.627960E-02
 0.000000E+00
 0.000000E+00
 0.000000E+00
 0.000000E+00
 0.000000E+00
 0.000000E+00
-2.681375E-01
-4.576794E-02
-8.598176E-01
-2.248938E-01
-1.745142E+00
-8.486020E-01
-8.871813E-01
-1.901562E-01
-2.869046E-01
-8.231428E-02
-6.100630E-01
-1.335934E-01
-1.697010E+00
-6.733466E-01
-3.980354E-02
-5.846471E-04
 0.000000E+00
 0.000000E+00
-4.542455E-03
-2.063390E-05
 0.000000E+00
 0.000000E+00
+1.645488E+00
+6.484702E-01
+2.105070E+00
+1.039725E+00
+2.770588E-02
+3.983972E-04
+5.120689E-01
+1.349554E-01
+2.673795E-01
+3.765852E-02
+3.919484E+00
+3.849186E+00
+3.933355E+00
+3.412764E+00
+5.093983E-01
+1.292547E-01
+3.296823E-01
+5.420313E-02
+1.787236E-01
+1.892424E-02
+9.727226E-01
+2.258144E-01
+5.592907E-02
+3.128061E-03
 0.000000E+00
 0.000000E+00
 0.000000E+00
@ -309,29 +245,136 @@ tallies:
 0.000000E+00
 0.000000E+00
 0.000000E+00
+5.685458E-02
+2.566580E-03
+5.698878E-01
+2.470520E-01
+1.140611E+00
+2.894377E-01
+9.627380E-01
+4.475222E-01
+0.000000E+00
+0.000000E+00
+1.510671E-01
+1.049873E-02
+2.083826E+00
+1.386550E+00
+1.186375E+00
+5.194434E-01
+1.974603E+00
+1.468093E+00
+5.170827E-01
+1.288942E-01
+5.715543E-01
+1.545153E-01
+8.091086E-01
+3.031014E-01
+2.731226E-01
+7.459595E-02
+0.000000E+00
+0.000000E+00
+0.000000E+00
+0.000000E+00
+2.192647E-02
+2.652476E-04
+1.685308E-01
+2.466311E-02
+1.672406E+00
+7.272613E-01
+1.170810E+00
+8.297263E-01
+8.185140E-02
+5.067114E-03
+4.435864E-01
+1.390191E-01
+1.083269E-02
+1.173473E-04
+0.000000E+00
+0.000000E+00
+5.831993E-02
+2.092263E-03
+1.647519E+00
+7.189652E-01
+2.270051E+00
+1.113805E+00
+1.295104E+00
+4.001063E-01
+7.782480E-01
+5.981969E-01
+1.248632E-01
+1.559081E-02
+5.570785E-02
+3.103364E-03
+0.000000E+00
+0.000000E+00
+0.000000E+00
 0.000000E+00
+8.247513E-01
+3.662689E-01
+1.226131E-01
+5.514962E-03
+9.616625E-01
+4.633281E-01
+2.098348E+00
+1.027770E+00
+7.121142E-01
+3.369196E-01
+3.658195E-02
+1.338239E-03
 0.000000E+00
 0.000000E+00
+1.756529E-01
+1.590541E-02
+1.030018E+00
+2.386993E-01
+7.375541E-01
+1.595463E-01
+2.502417E+00
+2.175897E+00
+1.446441E+00
+5.077455E-01
+1.922277E-01
+3.695148E-02
+1.946578E-02
+3.789164E-04
+1.022010E-01
+1.044504E-02
+9.612126E-03
+9.239297E-05
 0.000000E+00
-7.002302E-01
-3.193544E-01
-2.215487E+00
-1.065349E+00
-4.302846E+00
-4.016495E+00
-9.020099E-01
-2.614148E-01
-7.194393E-02
-5.175929E-03
-4.534523E-01
-7.154783E-02
-1.325731E+00
-5.109341E-01
-2.824636E-01
-3.918059E-02
 0.000000E+00
+1.758011E-01
+2.173517E-02
+4.094899E-01
+9.081722E-02
+6.700193E-02
+4.489259E-03
+5.154232E-02
+2.656611E-03
+2.235870E-02
+4.999114E-04
+1.099096E-02
+1.208012E-04
 0.000000E+00
 0.000000E+00
+3.169319E-01
+1.004458E-01
+4.684484E+00
+5.507748E+00
+2.263300E+00
+1.330626E+00
+2.218045E-01
+2.169627E-02
+1.485073E-01
+2.205441E-02
+6.877500E-01
+2.481145E-01
+1.946451E-01
+3.788672E-02
+1.044582E-02
+1.091151E-04
+3.032646E-01
+9.196941E-02
 0.000000E+00
 0.000000E+00
 0.000000E+00
@ -345,121 +388,109 @@ tallies:
 0.000000E+00
 0.000000E+00
 0.000000E+00
-4.801104E-03
-2.305060E-05
-1.719622E-01
-2.449465E-02
-3.332552E+00
-2.587819E+00
-2.402238E+00
-1.684268E+00
-1.039281E+00
-5.094672E-01
 0.000000E+00
 0.000000E+00
 0.000000E+00
+3.191784E-01
+8.446301E-02
+7.876835E-01
+2.219634E-01
+1.869209E+00
+1.032415E+00
+1.043340E+00
+4.337761E-01
+2.343277E-01
+3.491359E-02
+2.101922E+00
+1.084961E+00
+1.309010E-01
+1.646340E-02
 0.000000E+00
 0.000000E+00
 0.000000E+00
-2.277688E-01
-5.187862E-02
 0.000000E+00
 0.000000E+00
 0.000000E+00
 0.000000E+00
 0.000000E+00
 0.000000E+00
-1.549692E-01
-2.401545E-02
 0.000000E+00
+4.115305E-01
+7.622215E-02
+6.580797E-01
+1.708458E-01
 0.000000E+00
 0.000000E+00
+2.395934E-01
+5.740502E-02
 0.000000E+00
 0.000000E+00
 0.000000E+00
 0.000000E+00
+2.413254E-01
+2.912495E-02
 0.000000E+00
-6.423956E-02
-2.262410E-03
-1.817775E+00
-1.156737E+00
-3.969130E+00
-5.499781E+00
-5.763147E+00
-7.637688E+00
-1.553663E+00
-5.288552E-01
 0.000000E+00
+5.884565E-02
+2.261381E-03
+9.237002E-01
+3.520815E-01
+1.489709E+00
+5.250390E-01
+4.900135E-01
+1.203156E-01
 0.000000E+00
-4.697647E-01
-2.206789E-01
 0.000000E+00
 0.000000E+00
 0.000000E+00
 0.000000E+00
 0.000000E+00
 0.000000E+00
-6.731504E-01
-1.648524E-01
-2.224352E+00
-1.511765E+00
-1.566204E+00
-6.739647E-01
-7.651069E-01
-1.486649E-01
-3.140320E-01
-9.861609E-02
 0.000000E+00
 0.000000E+00
 0.000000E+00
+8.038920E-01
+2.852436E-01
+2.547490E+00
+2.412234E+00
+5.320570E-01
+2.101582E-01
+4.365735E-02
+1.905964E-03
 0.000000E+00
-7.192971E-01
-3.804443E-01
-6.267474E+00
-1.021266E+01
-3.939791E+00
-3.974901E+00
-1.595743E+00
-8.775404E-01
-7.448325E-01
-2.282169E-01
-6.864561E-02
-4.712220E-03
-1.231654E-01
-1.516971E-02
 0.000000E+00
 0.000000E+00
 0.000000E+00
 0.000000E+00
 0.000000E+00
 0.000000E+00
-2.192322E-01
-2.904934E-02
-3.485536E+00
-2.773803E+00
-4.852361E+00
-5.617266E+00
-2.233655E+00
-1.293846E+00
-1.882535E-01
-3.431375E-02
 0.000000E+00
+7.140054E-02
+5.098037E-03
+1.366272E+00
+6.777134E-01
+1.113480E+00
+5.078912E-01
+3.264266E-01
+1.052821E-01
+4.841665E-02
+2.344172E-03
 0.000000E+00
 0.000000E+00
 0.000000E+00
-4.805501E-02
-2.309284E-03
-3.547830E-01
-6.670495E-02
-8.353454E-01
-3.489530E-01
 0.000000E+00
 0.000000E+00
 0.000000E+00
 0.000000E+00
-1.696218E-01
-2.877154E-02
 0.000000E+00
+8.063169E-01
+1.357629E-01
+6.306382E+00
+9.222321E+00
+1.532171E+00
+6.468356E-01
+8.689108E-01
+3.830961E-01
 0.000000E+00
 0.000000E+00
 0.000000E+00
@ -469,22 +500,16 @@ tallies:
 0.000000E+00
 0.000000E+00
 0.000000E+00
-3.711809E-02
-1.377752E-03
-1.093948E+00
-4.583003E-01
-3.068323E-01
-8.638061E-02
-6.553993E-01
-4.295483E-01
 0.000000E+00
 0.000000E+00
 0.000000E+00
+1.829410E-01
+2.144514E-02
 0.000000E+00
 0.000000E+00
+3.305969E-01
+1.092943E-01
 0.000000E+00
-3.096692E-02
-9.589503E-04
 0.000000E+00
 0.000000E+00
 0.000000E+00
@ -492,12 +517,30 @@ tallies:
 0.000000E+00
 0.000000E+00
 0.000000E+00
+7.959569E-01
+2.438601E-01
+1.040117E+00
+3.764912E-01
+2.249651E+00
+1.558517E+00
+1.414532E-01
+2.000900E-02
 0.000000E+00
 0.000000E+00
 0.000000E+00
 0.000000E+00
 0.000000E+00
 0.000000E+00
+8.360199E-02
+6.989293E-03
+6.223597E-01
+1.993319E-01
+1.900736E+00
+1.073311E+00
+1.369721E+00
+6.249572E-01
+2.505899E-01
+6.279532E-02
 0.000000E+00
 0.000000E+00
 0.000000E+00
@ -508,9 +551,13 @@ tallies:
 0.000000E+00
 0.000000E+00
 0.000000E+00
+6.031545E-01
+3.637953E-01
+1.705499E+00
+2.541983E+00
+1.159415E-01
+5.337652E-03
 0.000000E+00
-1.433573E-01
-2.055131E-02
 0.000000E+00
 0.000000E+00
 0.000000E+00
@ -522,60 +569,13 @@ tallies:
 0.000000E+00
 0.000000E+00
 0.000000E+00
+2.553926E+00
+2.191405E+00
+3.092083E-01
+8.486829E-02
 0.000000E+00
 0.000000E+00
 0.000000E+00
 0.000000E+00
 0.000000E+00
 0.000000E+00
-0.000000E+00
-0.000000E+00
-0.000000E+00
-0.000000E+00
-0.000000E+00
-0.000000E+00
-0.000000E+00
-0.000000E+00
-0.000000E+00
-2.312088E-01
-5.345751E-02
-5.070389E-01
-2.570884E-01
-0.000000E+00
-0.000000E+00
-0.000000E+00
-0.000000E+00
-0.000000E+00
-0.000000E+00
-0.000000E+00
-0.000000E+00
-0.000000E+00
-0.000000E+00
-0.000000E+00
-0.000000E+00
-0.000000E+00
-0.000000E+00
-0.000000E+00
-0.000000E+00
-0.000000E+00
-0.000000E+00
-0.000000E+00
-0.000000E+00
-0.000000E+00
-0.000000E+00
-0.000000E+00
-0.000000E+00
-0.000000E+00
-0.000000E+00
-0.000000E+00
-0.000000E+00
-0.000000E+00
-0.000000E+00
-2.020720E-01
-4.083311E-02
-2.506654E-01
-6.283314E-02
-0.000000E+00
-0.000000E+00
-0.000000E+00
-0.000000E+00
--- a/tests/test_filter_mesh_3d/results_true.dat
+++ b/tests/test_filter_mesh_3d/results_true.dat
--- a/tests/test_filter_universe/results_true.dat
+++ b/tests/test_filter_universe/results_true.dat
@ -1,11 +1,11 @@
 k-combined:
-1.054379E+00 1.552941E-01
+1.026057E+00 2.398033E-02
 tallies:
-6.547388E+01
-8.788963E+02
-7.839055E+00
-1.288037E+01
-4.515343E+01
-4.110130E+02
-4.800044E+00
-4.852192E+00
+7.561358E+01
+1.146006E+03
+8.916920E+00
+1.615490E+01
+3.966083E+01
+3.223915E+02
+4.635218E+00
+4.397732E+00
--- a/tests/test_fixed_source/results_true.dat
+++ b/tests/test_fixed_source/results_true.dat
@ -1,3 +1,3 @@
 tallies:
-4.538492E+02
-2.066738E+04
+4.483337E+02
+2.017057E+04
--- a/tests/test_lattice/results_true.dat
+++ b/tests/test_lattice/results_true.dat
@ -1,2 +1,2 @@
 k-combined:
-8.680338E-01 1.693401E-01
+9.642421E-01 6.239193E-02
--- a/tests/test_lattice_multiple/results_true.dat
+++ b/tests/test_lattice_multiple/results_true.dat
@ -1,2 +1,2 @@
 k-combined:
-1.054379E+00 1.552941E-01
+1.026057E+00 2.398033E-02
--- a/tests/test_natural_element/results_true.dat
+++ b/tests/test_natural_element/results_true.dat
@ -1,2 +1,2 @@
 k-combined:
-9.953848E-01 7.832376E-03
+1.053229E+00 9.241274E-02
--- a/tests/test_output/results_true.dat
+++ b/tests/test_output/results_true.dat
@ -1,2 +1,2 @@
 k-combined:
-3.037840E-01 4.395585E-03
+3.011726E-01 1.841644E-03
--- a/tests/test_particle_restart_eigval/geometry.xml
+++ b/tests/test_particle_restart_eigval/geometry.xml
--- a/tests/test_particle_restart_eigval/materials.xml
+++ b/tests/test_particle_restart_eigval/materials.xml
--- a/tests/test_particle_restart_eigval/results.py
+++ b/tests/test_particle_restart_eigval/results.py
@ -10,7 +10,7 @@ import particle_restart as pr
 if len(sys.argv) > 1:
    p = pr.Particle(sys.argv[1])
 else:
-    p = pr.Particle('particle_12_885.binary')
+    p = pr.Particle('particle_12_842.binary')

 # set up output string
 outstr = ''
@ -22,6 +22,8 @@ outstr += 'current gen:\n'
 outstr += "{0:12.6E}\n".format(p.current_gen)
 outstr += 'particle id:\n'
 outstr += "{0:12.6E}\n".format(p.id)
+outstr += 'run mode:\n'
+outstr += "{0:12.6E}\n".format(p.run_mode)
 outstr += 'particle weight:\n'
 outstr += "{0:12.6E}\n".format(p.weight)
 outstr += 'particle energy:\n'
--- a/tests/test_particle_restart_eigval/results_true.dat
+++ b/tests/test_particle_restart_eigval/results_true.dat
@ -3,12 +3,14 @@ current batch:
 current gen:
 1.000000E+00
 particle id:
-8.850000E+02
+8.420000E+02
+run mode:
+2.000000E+00
 particle weight:
 1.000000E+00
 particle energy:
-3.157721E+00
+2.413462E+00
 particle xyz:
-4.847790E+01 -5.299518E+01 3.072360E+01
+-5.050553E+01 -9.983306E+00 -4.898542E+01
 particle uvw:
-2.025542E-01 2.719628E-01 -9.407487E-01
+-4.903067E-01 7.971652E-01 -3.523165E-01
--- a/tests/test_particle_restart_eigval/settings.xml
+++ b/tests/test_particle_restart_eigval/settings.xml
--- a/tests/test_particle_restart_eigval/test_particle_restart_eigval.py
+++ b/tests/test_particle_restart_eigval/test_particle_restart_eigval.py
@ -24,13 +24,13 @@ def test_run():
    assert returncode == 0, 'OpenMC did not exit successfully.'

 def test_created_restart():
-    particle = glob.glob(os.path.join(cwd, 'particle_12_885.*'))
+    particle = glob.glob(os.path.join(cwd, 'particle_12_842.*'))
    assert len(particle) == 1, 'Either multiple or no particle restart files exist.'
    assert particle[0].endswith('binary') or \
           particle[0].endswith('h5'), 'Particle restart file not a binary or hdf5 file.'

 def test_results():
-    particle = glob.glob(os.path.join(cwd, 'particle_12_885.*'))
+    particle = glob.glob(os.path.join(cwd, 'particle_12_842.*'))
    call(['python', 'results.py', particle[0]])
    compare = filecmp.cmp('results_test.dat', 'results_true.dat')
    if not compare:
@ -38,7 +38,7 @@ def test_results():
    assert compare, 'Results do not agree.'

 def test_run_restart():
-    particle = glob.glob(os.path.join(cwd, 'particle_12_885.*'))
+    particle = glob.glob(os.path.join(cwd, 'particle_12_842.*'))
    proc = Popen([opts.exe, '-r', particle[0], cwd], stderr=STDOUT, stdout=PIPE)
    print(proc.communicate()[0])
    returncode = proc.returncode 
--- a/tests/test_particle_restart_fixed/geometry.xml
+++ b/tests/test_particle_restart_fixed/geometry.xml
@ -0,0 +1,9 @@
+<?xml version="1.0"?>
+<geometry>
+
+  <!-- Sphere with no boundary condition -->
+  <surface id="1" type="sphere" coeffs="0.0 0.0 0.0 80.0" />
+  <surface id="2" type="sphere" coeffs="0.0 0.0 0.0 10000.0" boundary="vacuum" />
+  <cell id="1" material="1" surfaces="-1" />
+
+</geometry>
--- a/tests/test_particle_restart_fixed/materials.xml
+++ b/tests/test_particle_restart_fixed/materials.xml
@ -0,0 +1,9 @@
+<?xml version="1.0"?>
+<materials>
+
+  <material id="1">
+    <density value="1.4" units="g/cc" />
+    <nuclide name="B-10" xs="71c" ao="1.0" />
+  </material>
+
+</materials>
--- a/tests/test_particle_restart_fixed/results.py
+++ b/tests/test_particle_restart_fixed/results.py
@ -0,0 +1,38 @@
+#!/usr/bin/env python
+
+import sys
+
+# import particle restart 
+sys.path.append('../../src/utils')
+import particle_restart as pr
+
+# read in particle restart file
+if len(sys.argv) > 1:
+    p = pr.Particle(sys.argv[1])
+else:
+    p = pr.Particle('particle_7_6144.binary')
+
+# set up output string
+outstr = ''
+ 
+# write out properties 
+outstr += 'current batch:\n'
+outstr += "{0:12.6E}\n".format(p.current_batch)
+outstr += 'current gen:\n'
+outstr += "{0:12.6E}\n".format(p.current_gen)
+outstr += 'particle id:\n'
+outstr += "{0:12.6E}\n".format(p.id)
+outstr += 'run mode:\n'
+outstr += "{0:12.6E}\n".format(p.run_mode)
+outstr += 'particle weight:\n'
+outstr += "{0:12.6E}\n".format(p.weight)
+outstr += 'particle energy:\n'
+outstr += "{0:12.6E}\n".format(p.energy)
+outstr += 'particle xyz:\n'
+outstr += "{0:12.6E} {1:12.6E} {2:12.6E}\n".format(p.xyz[0],p.xyz[1],p.xyz[2])
+outstr += 'particle uvw:\n'
+outstr += "{0:12.6E} {1:12.6E} {2:12.6E}\n".format(p.uvw[0],p.uvw[1],p.uvw[2])
+
+# write results to file
+with open('results_test.dat','w') as fh:
+    fh.write(outstr)
--- a/tests/test_particle_restart_fixed/results_true.dat
+++ b/tests/test_particle_restart_fixed/results_true.dat
@ -0,0 +1,16 @@
+current batch:
+7.000000E+00
+current gen:
+0.000000E+00
+particle id:
+6.144000E+03
+run mode:
+1.000000E+00
+particle weight:
+1.000000E+00
+particle energy:
+5.749729E+00
+particle xyz:
+8.754675E+00 2.551620E+00 4.394350E-01
+particle uvw:
+-5.971721E-01 -4.845709E-01 6.391999E-01
--- a/tests/test_particle_restart_fixed/settings.xml
+++ b/tests/test_particle_restart_fixed/settings.xml
@ -0,0 +1,15 @@
+<?xml version="1.0"?>
+<settings>
+
+  <fixed_source>
+    <batches>12</batches>
+    <particles>1000</particles>
+  </fixed_source>
+
+  <source>
+    <space type="box">
+      <parameters>-10 -10 -5  10  10  5</parameters>
+    </space>
+  </source>
+
+</settings>
--- a/tests/test_particle_restart_fixed/test_particle_restart_fixed.py
+++ b/tests/test_particle_restart_fixed/test_particle_restart_fixed.py
@ -0,0 +1,68 @@
+#!/usr/bin/env python
+
+import os
+from subprocess import Popen, STDOUT, PIPE, call
+import filecmp
+import glob
+from optparse import OptionParser
+
+parser = OptionParser()
+parser.add_option('--mpi_exec', dest='mpi_exec', default='')
+parser.add_option('--mpi_np', dest='mpi_np', default='3')
+parser.add_option('--exe', dest='exe')
+(opts, args) = parser.parse_args()
+cwd = os.getcwd()
+
+def test_run():
+    if opts.mpi_exec != '':
+        proc = Popen([opts.mpi_exec, '-np', opts.mpi_np, opts.exe, cwd],
+               stderr=STDOUT, stdout=PIPE)
+    else:
+        proc = Popen([opts.exe, cwd], stderr=STDOUT, stdout=PIPE)
+    print(proc.communicate()[0])
+    returncode = proc.returncode
+    assert returncode == 0, 'OpenMC did not exit successfully.'
+
+def test_created_restart():
+    particle = glob.glob(os.path.join(cwd, 'particle_7_6144.*'))
+    assert len(particle) == 1, 'Either multiple or no particle restart files exist.'
+    assert particle[0].endswith('binary') or \
+           particle[0].endswith('h5'), 'Particle restart file not a binary or hdf5 file.'
+
+def test_results():
+    particle = glob.glob(os.path.join(cwd, 'particle_7_6144.*'))
+    call(['python', 'results.py', particle[0]])
+    compare = filecmp.cmp('results_test.dat', 'results_true.dat')
+    if not compare:
+      os.rename('results_test.dat', 'results_error.dat')
+    assert compare, 'Results do not agree.'
+
+def test_run_restart():
+    particle = glob.glob(os.path.join(cwd, 'particle_7_6144.*'))
+    proc = Popen([opts.exe, '-r', particle[0], cwd], stderr=STDOUT, stdout=PIPE)
+    print(proc.communicate()[0])
+    returncode = proc.returncode 
+    assert returncode == 0, 'Particle restart not successful.'
+
+def teardown():
+    output = glob.glob(os.path.join(cwd, 'statepoint.*')) + \
+             glob.glob(os.path.join(cwd, 'particle_*')) + \
+             [os.path.join(cwd, 'results_test.dat')]
+    for f in output:
+        if os.path.exists(f):
+            os.remove(f)
+
+if __name__ == '__main__':
+
+    # test for openmc executable
+    if opts.exe is None:
+        raise Exception('Must specify OpenMC executable from command line with --exe.')
+
+    # run tests
+    try:
+        test_run()
+        test_created_restart()
+        test_results()
+        test_run_restart()
+    finally:
+        teardown()
--- a/tests/test_ptables_off/results_true.dat
+++ b/tests/test_ptables_off/results_true.dat
@ -1,2 +1,2 @@
 k-combined:
-2.983940E-01 4.263222E-03
+2.984064E-01 3.464414E-03
--- a/tests/test_reflective_cone/results_true.dat
+++ b/tests/test_reflective_cone/results_true.dat
@ -1,2 +1,2 @@
 k-combined:
-2.260113E+00 6.817507E-03
+2.247735E+00 1.661365E-02
--- a/tests/test_reflective_cylinder/results_true.dat
+++ b/tests/test_reflective_cylinder/results_true.dat
@ -1,2 +1,2 @@
 k-combined:
-2.267746E+00 2.710853E-03
+2.276055E+00 3.186525E-03
--- a/tests/test_reflective_plane/results_true.dat
+++ b/tests/test_reflective_plane/results_true.dat
@ -1,2 +1,2 @@
 k-combined:
-2.281826E+00 1.022267E-02
+2.281505E+00 3.254688E-03
--- a/tests/test_reflective_sphere/results_true.dat
+++ b/tests/test_reflective_sphere/results_true.dat
@ -1,2 +1,2 @@
 k-combined:
-2.278144E+00 6.590095E-03
+2.276020E+00 2.831786E-03
--- a/tests/test_rotation/results_true.dat
+++ b/tests/test_rotation/results_true.dat
@ -1,2 +1,2 @@
 k-combined:
-3.037840E-01 4.395585E-03
+3.011726E-01 1.841644E-03
--- a/tests/test_salphabeta/results_true.dat
+++ b/tests/test_salphabeta/results_true.dat
@ -1,2 +1,2 @@
 k-combined:
-8.476267E-01 2.464858E-03
+8.418898E-01 5.633536E-03
--- a/tests/test_salphabeta_multiple/results_true.dat
+++ b/tests/test_salphabeta_multiple/results_true.dat
@ -1,2 +1,2 @@
 k-combined:
-9.189920E-01 1.784117E-02
+9.686161E-01 5.058148E-02
--- a/tests/test_score_MT/results_true.dat
+++ b/tests/test_score_MT/results_true.dat
@ -1,5 +1,5 @@
 k-combined:
-1.054379E+00 1.552941E-01
+1.026057E+00 2.398033E-02
 tallies:
 0.000000E+00
 0.000000E+00
@ -9,27 +9,27 @@ tallies:
 0.000000E+00
 0.000000E+00
 0.000000E+00
-3.253192E-03
-6.937728E-06
-3.253192E-03
-6.937728E-06
-3.911302E-01
-3.150342E-02
-1.329242E+00
-3.680536E-01
-2.041759E-04
-4.168531E-08
-2.041759E-04
-4.168531E-08
-3.088079E-02
-1.927936E-04
-2.746956E-02
-1.831897E-04
+5.107210E-03
+1.115395E-05
+5.107210E-03
+1.115395E-05
+4.333475E-01
+3.808130E-02
+1.486430E+00
+4.460082E-01
+6.079805E-04
+2.427682E-07
+6.079805E-04
+2.427682E-07
+3.591927E-02
+2.735525E-04
+1.840648E-02
+6.858507E-05
 0.000000E+00
 0.000000E+00
 0.000000E+00
 0.000000E+00
-3.956258E-05
-4.168409E-10
-7.249797E-02
-1.134763E-03
+7.729188E-05
+1.760385E-09
+8.668997E-02
+1.517751E-03
--- a/tests/test_score_absorption/results_true.dat
+++ b/tests/test_score_absorption/results_true.dat
@ -1,20 +1,20 @@
 k-combined:
-1.054379E+00 1.552941E-01
+1.026057E+00 2.398033E-02
 tally 1:
 0.000000E+00
 0.000000E+00
-2.423265E+00
-1.203542E+00
-2.736131E-02
-1.818349E-04
-3.474644E-01
-2.604110E-02
+2.752688E+00
+1.519822E+00
+1.839896E-02
+6.847549E-05
+4.163078E-01
+3.500130E-02
 tally 2:
 0.000000E+00
 0.000000E+00
-2.560000E+00
-1.324800E+00
-2.000000E-02
-2.000000E-04
-3.200000E-01
-2.120000E-02
+2.590000E+00
+1.347300E+00
+1.000000E-02
+1.000000E-04
+4.400000E-01
+4.560000E-02
--- a/tests/test_score_current/results_true.dat
+++ b/tests/test_score_current/results_true.dat
--- a/tests/test_score_events/results_true.dat
+++ b/tests/test_score_events/results_true.dat
@ -1,12 +1,12 @@
 k-combined:
-1.054379E+00 1.552941E-01
+1.026057E+00 2.398033E-02
 tally 1:
-6.104000E+01
-7.616622E+02
-4.449000E+01
-4.006525E+02
+6.962000E+01
+9.707884E+02
+3.952000E+01
+3.204384E+02
 tally 2:
-1.648000E+01
-5.587440E+01
-1.220000E+01
-3.020980E+01
+1.819000E+01
+6.642470E+01
+1.068000E+01
+2.337500E+01
--- a/tests/test_score_fission/results_true.dat
+++ b/tests/test_score_fission/results_true.dat
@ -1,20 +1,20 @@
 k-combined:
-1.054379E+00 1.552941E-01
+1.026057E+00 2.398033E-02
 tally 1:
-1.090595E+00
-2.495879E-01
+1.262131E+00
+3.195239E-01
 0.000000E+00
 0.000000E+00
 0.000000E+00
 0.000000E+00
-8.380635E-01
-1.449526E-01
+6.901239E-01
+1.005482E-01
 tally 2:
-1.118247E+00
-2.554706E-01
+1.255288E+00
+3.153728E-01
 0.000000E+00
 0.000000E+00
 0.000000E+00
 0.000000E+00
-7.146295E-01
-1.028428E-01
+6.822560E-01
+9.370377E-02
--- a/tests/test_score_flux/results_true.dat
+++ b/tests/test_score_flux/results_true.dat
@ -1,15 +1,15 @@
 k-combined:
-1.054379E+00 1.552941E-01
+1.026057E+00 2.398033E-02
 tallies:
-3.592258E+01
-2.643254E+02
-1.231116E+01
-3.090947E+01
-6.043863E+01
-7.435923E+02
-2.642967E+01
-1.419580E+02
-9.016535E+00
-1.645213E+01
-4.290463E+01
-3.702938E+02
+4.196778E+01
+3.530350E+02
+1.435805E+01
+4.131125E+01
+6.911779E+01
+9.588442E+02
+2.386422E+01
+1.167546E+02
+8.356743E+00
+1.425896E+01
+4.020665E+01
+3.286445E+02
--- a/tests/test_score_flux_yn/results_true.dat
+++ b/tests/test_score_flux_yn/results_true.dat
@ -1,448 +1,448 @@
 k-combined:
-1.054379E+00 1.552941E-01
+1.026057E+00 2.398033E-02
 tally 1:
-3.592258E+01
-2.643254E+02
-1.231116E+01
-3.090947E+01
-6.043863E+01
-7.435923E+02
-2.642967E+01
-1.419580E+02
-9.016535E+00
-1.645213E+01
-4.290463E+01
-3.702938E+02
+4.196778E+01
+3.530350E+02
+1.435805E+01
+4.131125E+01
+6.911779E+01
+9.588442E+02
+2.386422E+01
+1.167546E+02
+8.356743E+00
+1.425896E+01
+4.020665E+01
+3.286445E+02
 tally 2:
-3.592258E+01
-2.643254E+02
-7.457377E-01
-1.568936E-01
-1.409908E+00
-6.179156E-01
-4.109071E-02
-5.040752E-01
-3.085907E-01
-6.765272E-02
-6.065414E-02
-9.095451E-02
-5.274442E-01
-2.349686E-01
-3.339613E-01
-1.299321E-01
-5.368844E-01
-1.738693E-01
-1.878692E-01
-9.437284E-02
-1.379127E-02
-1.598297E-01
-6.186979E-01
-2.454461E-01
-2.487311E-01
-1.654668E-01
-3.204662E-01
-9.781927E-02
-8.780059E-03
-1.112313E-02
-2.162356E-01
-1.541879E-01
-4.965314E-02
-1.252648E-01
-8.438839E-03
-6.436864E-02
-1.924756E-01
-6.599086E-02
-3.383870E-01
-4.338880E-02
-4.702022E-02
-1.152857E-01
-3.654916E-01
-7.585217E-02
-6.321973E-01
-1.560043E-01
-1.170791E-01
-5.682270E-02
-8.507544E-02
-5.423911E-02
-7.689411E-02
-1.096675E-01
-1.776059E-01
-3.962763E-02
-1.096140E-01
-4.388676E-02
-1.483569E-01
-5.123487E-02
-1.857887E-01
-2.791531E-02
-6.560188E-03
-7.849650E-03
-3.234248E-01
-8.714468E-02
-9.334255E-02
-5.535022E-02
-4.307079E-01
-1.149263E-01
-1.262833E-01
-4.913416E-02
-3.925183E-01
-9.049584E-02
-1.231116E+01
-3.090947E+01
-2.743826E-01
-2.330032E-02
-3.161319E-01
-9.828167E-02
-6.149158E-03
-4.024808E-02
-6.157190E-02
-3.670707E-03
-8.680715E-02
-1.181644E-02
-2.558514E-01
-2.820233E-02
-1.250185E-01
-1.264151E-02
-1.777685E-01
-1.120916E-02
-1.996403E-02
-9.589033E-03
-6.469367E-02
-2.025502E-02
-9.977202E-02
-2.465065E-02
-9.346164E-02
-1.387857E-02
-2.000302E-01
-1.030458E-02
-1.893437E-02
-8.642564E-03
-8.766101E-02
-1.604360E-02
-3.476395E-02
-1.231472E-02
-4.666207E-02
-9.397119E-03
-2.852701E-02
-3.627339E-03
-3.636939E-02
-9.152347E-03
-5.913610E-02
-1.395669E-02
-7.442090E-02
-4.029892E-03
-1.405218E-01
-7.858482E-03
-5.468817E-02
-1.260568E-02
-1.509485E-03
-8.273710E-04
-4.701227E-02
-1.031808E-02
-3.400703E-02
-4.554683E-03
-1.324288E-02
-2.325945E-03
-1.779612E-02
-3.156448E-03
-9.030336E-02
-2.931278E-03
-8.184691E-02
-4.640791E-03
-7.664678E-02
-1.448602E-02
-6.884531E-02
-4.941042E-03
-1.200132E-01
-9.853152E-03
-3.337513E-03
-3.793526E-03
-1.501552E-01
-1.397964E-02
-6.043863E+01
-7.435923E+02
-1.028786E+00
-3.893889E-01
-7.218297E-01
-1.477133E+00
-1.592062E-01
-6.950445E-01
-1.392555E-01
-9.798491E-02
-2.375541E-01
-3.690914E-01
-1.224647E+00
-7.484056E-01
-5.113783E-01
-2.785883E-01
-9.770304E-01
-5.347885E-01
-1.707314E-01
-3.514133E-01
-1.252681E-01
-3.609928E-01
-8.032379E-01
-3.579820E-01
-5.581301E-01
-3.899743E-01
-4.018495E-02
-1.833152E-01
-6.816671E-02
-2.316841E-01
-3.691192E-01
-2.762893E-01
-6.053016E-02
-3.436658E-01
-3.768464E-02
-1.049309E-01
-4.111788E-01
-1.364172E-01
-1.796548E-01
-8.907427E-02
-1.935781E-01
-2.114277E-01
-4.872276E-01
-2.310834E-01
-5.444075E-01
-2.523044E-01
-1.064104E-01
-2.206886E-01
-4.499997E-01
-7.878053E-02
-8.816613E-02
-1.110794E-01
-2.818691E-01
-7.308947E-02
-1.133714E-01
-3.498809E-02
-2.540159E-01
-1.364947E-01
-4.231763E-01
-7.476211E-02
-3.040583E-01
-1.342806E-01
-1.982521E-01
-3.445279E-01
-2.128791E-01
-1.107677E-01
-3.409949E-01
-2.346600E-01
-3.098111E-01
-8.938591E-02
-5.278696E-01
-1.610161E-01
-2.642967E+01
-1.419580E+02
-4.714778E-01
-4.605833E-01
-5.568703E-01
-3.562202E-01
-4.967480E-01
-3.925122E-01
-1.228044E-01
-1.094557E-01
-3.233007E-01
-1.748879E-01
-8.985495E-03
-5.673914E-02
-1.331372E-01
-6.084241E-02
-4.182245E-01
-9.038362E-02
-4.088710E-01
-6.170602E-02
-5.265773E-01
-1.294940E-01
-1.863082E-01
-3.072299E-02
-1.602038E-01
-5.613527E-02
-2.632992E-01
-3.196204E-02
-7.272195E-02
-6.495590E-02
-3.196990E-01
-8.623875E-02
-2.404576E-01
-4.007660E-02
-3.019126E-01
-4.360508E-02
-8.628146E-03
-1.598553E-02
-2.793676E-01
-7.720463E-02
-4.830200E-01
-7.464700E-02
-3.779871E-02
-1.308995E-02
-3.589463E-01
-3.852660E-02
-1.704419E-01
-2.960124E-02
-2.170752E-02
-8.198055E-02
-1.235262E-01
-8.086411E-02
-1.459231E-02
-7.746286E-02
-4.563039E-01
-6.020384E-02
-2.147989E-01
-3.763613E-02
-7.629301E-02
-9.793962E-03
-4.890493E-03
-8.674635E-02
-3.671588E-01
-6.275706E-02
-3.309358E-01
-5.498979E-02
-2.931004E-01
-8.431776E-02
-1.099478E-01
-2.469818E-02
-1.206171E-01
-1.604785E-02
-9.016535E+00
-1.645213E+01
-4.178438E-02
-5.624772E-02
-2.486297E-01
-4.493653E-02
-1.493392E-01
-5.291485E-02
-1.107216E-02
-6.831925E-03
-6.524669E-02
-1.973347E-02
-1.628117E-01
-1.565590E-02
-5.890653E-02
-6.198764E-03
-7.302906E-02
-1.741230E-02
-1.342950E-01
-8.253449E-03
-1.382154E-01
-1.315402E-02
-6.159427E-02
-3.671590E-03
-8.970861E-02
-1.064405E-02
-2.304707E-01
-1.536740E-02
-3.536034E-03
-4.912980E-03
-1.147781E-01
-1.222893E-02
-1.281041E-01
-7.651493E-03
-8.689901E-02
-5.886718E-03
-1.280445E-01
-3.863286E-03
-6.017482E-02
-2.135363E-03
-4.284145E-02
-2.720878E-03
-7.931439E-02
-6.002983E-03
-1.188172E-01
-1.003427E-02
-3.795274E-02
-1.002784E-03
-1.505337E-02
-4.904760E-03
-5.948220E-03
-7.549333E-03
-1.248623E-02
-7.717805E-03
-3.542108E-02
-2.903848E-03
-5.812837E-02
-3.159078E-03
-6.199867E-03
-1.812170E-03
-7.001458E-03
-1.477567E-02
-2.603871E-02
-2.076953E-03
-1.197955E-01
-7.170527E-03
-1.406440E-01
-1.454987E-02
-1.045777E-01
-6.236527E-03
-5.140566E-02
-2.709523E-03
-4.290463E+01
-3.702938E+02
-2.817389E-02
-1.555546E+00
-8.847293E-01
-6.219487E-01
-7.800342E-01
-1.101233E+00
-2.277818E-01
-2.326344E-01
-9.271898E-02
-4.536328E-01
-2.026303E-02
-1.163104E-02
-1.496673E-01
-6.364459E-02
-3.771596E-02
-3.097272E-01
-6.397855E-01
-1.296896E-01
-7.927053E-01
-3.232877E-01
-5.710516E-01
-1.401599E-01
-5.487513E-01
-1.519686E-01
-3.525597E-01
-1.426498E-01
-2.092183E-01
-5.887561E-02
-5.561349E-01
-3.006611E-01
-4.160756E-01
-8.115663E-02
-4.320656E-01
-1.522343E-01
-3.373618E-01
-8.026679E-02
-1.885818E-02
-5.336978E-02
-7.533085E-01
-2.384514E-01
-2.100093E-01
-9.409506E-02
-6.107494E-01
-7.873829E-02
-6.443055E-02
-2.031932E-02
-3.257997E-01
-1.644322E-01
-2.362859E-01
-1.580959E-01
-9.265836E-02
-2.217708E-01
-3.316779E-01
-6.362062E-02
-1.076690E-01
-1.012213E-01
-2.365455E-01
-1.039120E-01
-1.786167E-01
-1.035157E-01
-1.630640E-01
-7.176118E-02
-2.693906E-01
-5.974088E-02
-5.374700E-01
-1.980528E-01
-4.441574E-01
-1.067919E-01
-2.106430E-01
-5.559213E-02
+4.196778E+01
+3.530350E+02
+2.485016E-01
+8.405674E-02
+-3.879323E-01
+9.167459E-02
+4.508722E-01
+5.940427E-01
+-5.581297E-01
+8.817283E-02
+-4.298465E-01
+1.166568E-01
+2.189843E-01
+2.581118E-01
+2.277848E-02
+2.187159E-01
+4.005053E-02
+1.465462E-01
+1.172397E-01
+4.120332E-02
+4.314239E-01
+1.204293E-01
+-8.471728E-03
+6.014855E-03
+1.080158E-01
+2.727746E-01
+1.067918E-01
+1.739305E-02
+-2.347246E-02
+1.198935E-01
+1.244379E-01
+8.907767E-02
+-2.949398E-01
+8.887927E-02
+-2.114222E-01
+9.164391E-02
+-4.168004E-01
+1.085041E-01
+-7.650322E-02
+4.480095E-02
+-2.724942E-01
+1.818418E-01
+4.271458E-01
+1.250461E-01
+3.568173E-01
+3.569874E-02
+-3.515782E-01
+6.714772E-02
+8.819129E-02
+7.378857E-02
+-2.683794E-01
+6.970101E-02
+-1.301532E-01
+8.412855E-02
+-1.743175E-01
+1.091908E-01
+2.236725E-01
+1.267758E-01
+6.296889E-01
+9.896059E-02
+1.388630E-01
+6.120279E-02
+-1.718855E-02
+1.148978E-01
+4.622015E-01
+6.597706E-02
+2.531333E-01
+1.010256E-01
+6.104344E-01
+1.657351E-01
+-3.430136E-01
+7.569883E-02
+1.435805E+01
+4.131125E+01
+1.113966E-01
+2.860352E-02
+-4.098513E-01
+3.721126E-02
+2.257618E-01
+6.455057E-02
+-1.920067E-01
+1.032001E-02
+-2.681620E-02
+1.571030E-02
+-1.846384E-03
+2.433124E-02
+1.466902E-02
+2.493306E-02
+-1.139774E-01
+1.245338E-02
+-4.391572E-02
+7.557624E-03
+1.682105E-01
+1.586497E-02
+-1.167261E-01
+7.111886E-03
+1.305940E-02
+1.354915E-02
+-1.989655E-02
+2.858672E-03
+-5.838072E-02
+2.100469E-02
+-5.611650E-02
+1.487248E-02
+-1.508486E-01
+1.373358E-02
+-8.217302E-02
+8.321404E-03
+-1.733825E-01
+2.166778E-02
+-3.480309E-02
+2.297395E-03
+-1.967901E-01
+1.309369E-02
+1.441436E-01
+1.737213E-02
+-9.802062E-04
+4.627320E-03
+-7.350348E-02
+3.672361E-03
+8.320465E-02
+1.072517E-02
+-7.946398E-02
+7.146019E-03
+-1.607398E-02
+1.795081E-02
+6.932925E-03
+9.445191E-03
+2.085514E-01
+2.285275E-02
+-1.648308E-02
+1.821123E-03
+5.722638E-02
+5.762040E-03
+5.914433E-02
+1.204480E-02
+1.880291E-01
+8.657218E-03
+2.863993E-02
+1.017168E-02
+2.180939E-01
+1.719589E-02
+-1.548364E-01
+1.086494E-02
+6.911779E+01
+9.588442E+02
+8.284527E-01
+7.988588E-01
+-1.096658E+00
+6.086585E-01
+4.919633E-01
+1.728036E+00
+-7.812071E-01
+2.529603E-01
+-3.153443E-01
+2.547322E-01
+-6.897056E-01
+4.610229E-01
+-6.305241E-01
+4.433235E-01
+-4.957921E-02
+4.774998E-01
+-1.126885E-01
+3.212008E-01
+1.043761E+00
+4.309496E-01
+-9.947668E-01
+3.300676E-01
+4.426331E-01
+3.791353E-01
+-2.892121E-02
+7.559102E-02
+-5.347898E-01
+2.401866E-01
+2.669113E-01
+1.427206E-01
+-4.324494E-01
+2.434427E-01
+-4.028039E-01
+1.457150E-01
+-4.054779E-01
+3.243179E-01
+-2.323146E-01
+4.378377E-02
+-1.040595E+00
+3.683603E-01
+2.931554E-01
+3.714171E-01
+2.515620E-01
+2.235834E-01
+-3.650470E-01
+1.102240E-01
+2.683089E-01
+3.035302E-01
+-8.661880E-02
+6.894928E-02
+-9.201891E-02
+2.377586E-01
+1.103209E-01
+2.224716E-01
+6.801120E-01
+4.159687E-01
+-1.707018E-01
+6.747023E-02
+9.130822E-01
+2.246344E-01
+2.665996E-01
+1.714093E-01
+7.090399E-01
+1.217207E-01
+2.068935E-01
+1.320655E-01
+1.001322E+00
+4.328349E-01
+-5.405691E-01
+1.027308E-01
+2.386422E+01
+1.167546E+02
+4.160579E-01
+1.408433E-01
+-6.682852E-02
+2.301618E-01
+-3.695172E-01
+1.883545E-01
+9.181195E-02
+9.525680E-02
+5.138299E-01
+2.378408E-01
+4.363726E-01
+1.029064E-01
+-7.740110E-02
+3.555595E-02
+3.389365E-01
+4.532689E-02
+2.049373E-01
+3.574195E-02
+-3.104619E-01
+4.084369E-02
+2.766890E-01
+6.645898E-02
+2.339673E-01
+3.155149E-02
+2.615552E-02
+5.874934E-02
+-5.513903E-03
+1.541198E-01
+9.226503E-02
+4.553779E-02
+-1.454181E-01
+4.454598E-02
+2.144464E-02
+9.987907E-02
+-2.275191E-02
+1.014656E-02
+-3.921397E-01
+5.109675E-02
+-1.987404E-01
+2.988881E-02
+9.597180E-02
+3.291774E-02
+2.129797E-01
+1.370939E-02
+2.632940E-01
+7.442661E-02
+3.246772E-01
+4.749199E-02
+-2.753884E-01
+3.435951E-02
+1.930188E-01
+3.903695E-02
+-1.094984E-01
+2.882115E-02
+3.709879E-01
+5.622833E-02
+-1.445693E-01
+9.542193E-02
+2.549544E-01
+5.259426E-02
+1.630417E-01
+7.471091E-03
+9.472882E-02
+2.091780E-02
+-5.548165E-02
+1.499433E-02
+7.297692E-02
+1.892721E-02
+6.720510E-02
+8.352141E-03
+8.356743E+00
+1.425896E+01
+1.863083E-01
+1.880918E-02
+-7.658723E-02
+5.967259E-02
+-1.628075E-01
+2.723865E-02
+-7.390553E-02
+1.118843E-02
+9.102591E-02
+2.678979E-02
+1.744097E-01
+1.002352E-02
+-6.805765E-03
+1.173958E-02
+1.848781E-01
+1.028158E-02
+6.170162E-02
+6.334359E-03
+-1.063401E-01
+3.807908E-03
+3.859862E-02
+8.673205E-03
+6.188265E-02
+6.860607E-03
+3.194103E-02
+6.978707E-03
+1.825977E-02
+1.540538E-02
+8.694319E-02
+7.507723E-03
+-8.844138E-02
+5.703451E-03
+5.162477E-02
+9.628660E-03
+-4.972982E-02
+4.693175E-03
+-1.425427E-01
+6.822687E-03
+-4.249368E-02
+7.544513E-03
+2.543732E-02
+5.164849E-03
+6.591925E-02
+3.444599E-03
+4.557905E-02
+5.305190E-03
+8.573869E-02
+3.373580E-03
+-6.918981E-02
+4.652055E-03
+4.948117E-02
+4.051710E-03
+-1.185905E-01
+5.225232E-03
+1.494813E-01
+6.868472E-03
+-5.889132E-02
+1.021406E-02
+5.884587E-02
+7.493021E-03
+7.851953E-02
+5.680582E-03
+1.243852E-02
+1.674916E-03
+-7.322563E-02
+5.420066E-03
+8.857821E-02
+2.290771E-03
+2.446921E-02
+3.061443E-03
+4.020665E+01
+3.286445E+02
+6.730897E-01
+7.013287E-01
+-4.103860E-02
+1.751935E+00
+-1.336629E+00
+1.083040E+00
+-3.556867E-01
+2.406019E-01
+5.280601E-01
+4.647564E-01
+1.276933E+00
+4.862359E-01
+1.364565E-01
+2.511923E-01
+4.648499E-01
+9.111728E-02
+6.582890E-02
+4.169410E-02
+-6.389049E-01
+9.529213E-02
+2.357663E-01
+1.444813E-01
+3.761297E-01
+1.497043E-01
+3.860095E-02
+6.392626E-02
+-1.203307E-01
+2.331096E-01
+1.749867E-01
+5.969514E-02
+-1.894930E-01
+1.321411E-01
+3.238253E-01
+1.951142E-01
+-1.122900E-01
+6.744524E-02
+-6.286055E-01
+1.980821E-01
+-2.974285E-01
+1.450154E-01
+6.821840E-01
+2.359462E-01
+3.548789E-01
+1.209873E-01
+4.427587E-01
+2.010761E-01
+3.181912E-01
+1.083247E-01
+-4.329146E-01
+1.644902E-01
+3.611490E-01
+1.750856E-01
+-3.454722E-01
+5.284676E-02
+3.484353E-01
+5.408786E-02
+-4.449440E-01
+1.604305E-01
+3.547697E-01
+1.451729E-01
+5.514348E-01
+3.309350E-01
+1.358686E-01
+2.949057E-02
+-4.847037E-01
+1.775746E-01
+4.174144E-01
+1.041622E-01
+-4.084946E-02
+7.716717E-02
--- a/tests/test_score_kappafission/results_true.dat
+++ b/tests/test_score_kappafission/results_true.dat
@ -1,11 +1,11 @@
 k-combined:
-1.054379E+00 1.552941E-01
+1.026057E+00 2.398033E-02
 tallies:
-2.136105E+02
-9.571657E+03
+2.473989E+02
+1.227656E+04
 0.000000E+00
 0.000000E+00
 0.000000E+00
 0.000000E+00
-1.640814E+02
-5.556005E+03
+1.352697E+02
+3.863347E+03
--- a/tests/test_score_nufission/results_true.dat
+++ b/tests/test_score_nufission/results_true.dat
@ -1,11 +1,11 @@
 k-combined:
-1.054379E+00 1.552941E-01
+1.026057E+00 2.398033E-02
 tallies:
-2.867205E+00
-1.722964E+00
+3.327715E+00
+2.220799E+00
 0.000000E+00
 0.000000E+00
 0.000000E+00
 0.000000E+00
-2.197082E+00
-9.960828E-01
+1.819231E+00
+6.995769E-01
--- a/tests/test_score_nuscatter/results_true.dat
+++ b/tests/test_score_nuscatter/results_true.dat
@ -1,11 +1,11 @@
 k-combined:
-1.054379E+00 1.552941E-01
+1.026057E+00 2.398033E-02
 tallies:
 0.000000E+00
 0.000000E+00
-1.392000E+01
-4.004380E+01
-3.210000E+00
-2.087100E+00
-4.724000E+01
-4.560010E+02
+1.564000E+01
+4.916600E+01
+3.920000E+00
+3.109600E+00
+5.521000E+01
+6.110321E+02
--- a/tests/test_score_nuscatter_n/results_true.dat
+++ b/tests/test_score_nuscatter_n/results_true.dat
@ -1,33 +1,33 @@
 k-combined:
-1.054379E+00 1.552941E-01
+1.026057E+00 2.398033E-02
 tallies:
-1.392000E+01
-4.004380E+01
-1.361312E+00
-3.885494E-01
-7.443156E-01
-1.439646E-01
-3.706744E-01
-5.428442E-02
-9.923757E-02
-2.319741E-02
-3.210000E+00
-2.087100E+00
-6.296238E-01
-8.155393E-02
-3.813003E-01
-3.265962E-02
-3.245663E-02
-6.445325E-03
-1.560951E-03
-1.522740E-03
-4.724000E+01
-4.560010E+02
-2.341582E+01
-1.110046E+02
-8.680460E+00
-1.519874E+01
-4.204455E-01
-1.295766E-01
-1.013720E+00
-3.672665E-01
+1.564000E+01
+4.916600E+01
+1.732008E+00
+6.519811E-01
+1.050135E+00
+2.811326E-01
+5.022249E-01
+7.365690E-02
+5.181483E-01
+6.230558E-02
+3.920000E+00
+3.109600E+00
+3.797567E-01
+4.279038E-02
+2.871365E-01
+2.682867E-02
+-7.080425E-02
+2.399440E-03
+-7.471957E-02
+1.768104E-02
+5.521000E+01
+6.110321E+02
+2.770173E+01
+1.538758E+02
+9.729167E+00
+1.894035E+01
+1.084712E-01
+2.197558E-02
+-1.909197E+00
+7.728336E-01
--- a/tests/test_score_nuscatter_pn/results_true.dat
+++ b/tests/test_score_nuscatter_pn/results_true.dat
@ -1,24 +1,24 @@
 k-combined:
-1.054379E+00 1.552941E-01
+1.026057E+00 2.398033E-02
 tally 1:
-1.392000E+01
-4.004380E+01
-1.361312E+00
-3.885494E-01
-7.443156E-01
-1.439646E-01
-3.706744E-01
-5.428442E-02
-9.923757E-02
-2.319741E-02
+1.564000E+01
+4.916600E+01
+1.732008E+00
+6.519811E-01
+1.050135E+00
+2.811326E-01
+5.022249E-01
+7.365690E-02
+5.181483E-01
+6.230558E-02
 tally 2:
-1.392000E+01
-4.004380E+01
-1.361312E+00
-3.885494E-01
-7.443156E-01
-1.439646E-01
-3.706744E-01
-5.428442E-02
-9.923757E-02
-2.319741E-02
+1.564000E+01
+4.916600E+01
+1.732008E+00
+6.519811E-01
+1.050135E+00
+2.811326E-01
+5.022249E-01
+7.365690E-02
+5.181483E-01
+6.230558E-02
--- a/tests/test_score_nuscatter_yn/results_true.dat
+++ b/tests/test_score_nuscatter_yn/results_true.dat
@ -1,38 +1,38 @@
 k-combined:
-1.054379E+00 1.552941E-01
+1.026057E+00 2.398033E-02
 tally 1:
-1.392000E+01
-4.004380E+01
+1.564000E+01
+4.916600E+01
 tally 2:
-1.392000E+01
-4.004380E+01
-1.162523E-01
-6.285463E-03
-4.604876E-02
-9.758725E-03
-7.446115E-02
-1.188951E-02
-1.070725E-01
-8.199347E-03
-1.430332E-01
-1.006189E-02
-6.220835E-02
-2.170032E-03
-4.461911E-02
-5.311571E-03
-5.893834E-02
-2.853624E-03
-1.774247E-02
-4.565916E-03
-1.361764E-01
-9.720466E-03
-5.552471E-02
-1.688629E-03
-6.444523E-02
-4.980551E-03
-1.165646E-01
-4.593555E-03
-3.689214E-02
-6.805224E-03
-4.889834E-02
-4.798768E-03
+1.564000E+01
+4.916600E+01
+3.575358E-02
+1.415947E-02
+-2.827615E-01
+4.002725E-02
+1.500274E-01
+1.620332E-02
+-9.890009E-02
+7.235934E-03
+2.175099E-03
+1.892599E-03
+-5.781969E-02
+1.408884E-02
+-2.318422E-02
+8.598036E-04
+7.585681E-02
+1.087696E-02
+2.979107E-02
+1.239775E-03
+9.460069E-02
+6.264186E-03
+4.813435E-02
+1.288795E-03
+-8.147729E-04
+3.790118E-03
+1.843800E-02
+1.900359E-03
+5.336792E-02
+4.801932E-03
+-8.467690E-02
+1.804759E-03
--- a/tests/test_score_scatter/results_true.dat
+++ b/tests/test_score_scatter/results_true.dat
@ -1,11 +1,11 @@
 k-combined:
-1.054379E+00 1.552941E-01
+1.026057E+00 2.398033E-02
 tallies:
 0.000000E+00
 0.000000E+00
-1.375286E+01
-3.902014E+01
-3.344939E+00
-2.293548E+00
-4.767991E+01
-4.661954E+02
+1.615444E+01
+5.222504E+01
+3.899147E+00
+3.046508E+00
+5.511296E+01
+6.091436E+02
--- a/tests/test_score_scatter_n/results_true.dat
+++ b/tests/test_score_scatter_n/results_true.dat
@ -1,33 +1,33 @@
 k-combined:
-1.054379E+00 1.552941E-01
+1.026057E+00 2.398033E-02
 tallies:
-1.392000E+01
-4.004380E+01
-1.361312E+00
-3.885494E-01
-7.443156E-01
-1.439646E-01
-3.706744E-01
-5.428442E-02
-9.923757E-02
-2.319741E-02
-3.210000E+00
-2.087100E+00
-6.296238E-01
-8.155393E-02
-3.813003E-01
-3.265962E-02
-3.245663E-02
-6.445325E-03
-1.560951E-03
-1.522740E-03
-4.724000E+01
-4.560010E+02
-2.341582E+01
-1.110046E+02
-8.680460E+00
-1.519874E+01
-4.204455E-01
-1.295766E-01
-1.013720E+00
-3.672665E-01
+1.563000E+01
+4.911010E+01
+1.726509E+00
+6.486406E-01
+1.050600E+00
+2.811603E-01
+5.063165E-01
+7.401437E-02
+5.217372E-01
+6.254925E-02
+3.920000E+00
+3.109600E+00
+3.797567E-01
+4.279038E-02
+2.871365E-01
+2.682867E-02
+-7.080425E-02
+2.399440E-03
+-7.471957E-02
+1.768104E-02
+5.521000E+01
+6.110321E+02
+2.770173E+01
+1.538758E+02
+9.729167E+00
+1.894035E+01
+1.084712E-01
+2.197558E-02
+-1.909197E+00
+7.728336E-01
--- a/tests/test_score_scatter_pn/results_true.dat
+++ b/tests/test_score_scatter_pn/results_true.dat
@ -1,24 +1,24 @@
 k-combined:
-1.054379E+00 1.552941E-01
+1.026057E+00 2.398033E-02
 tally 1:
-1.392000E+01
-4.004380E+01
-1.361312E+00
-3.885494E-01
-7.443156E-01
-1.439646E-01
-3.706744E-01
-5.428442E-02
-9.923757E-02
-2.319741E-02
+1.563000E+01
+4.911010E+01
+1.726509E+00
+6.486406E-01
+1.050600E+00
+2.811603E-01
+5.063165E-01
+7.401437E-02
+5.217372E-01
+6.254925E-02
 tally 2:
-1.392000E+01
-4.004380E+01
-1.361312E+00
-3.885494E-01
-7.443156E-01
-1.439646E-01
-3.706744E-01
-5.428442E-02
-9.923757E-02
-2.319741E-02
+1.563000E+01
+4.911010E+01
+1.726509E+00
+6.486406E-01
+1.050600E+00
+2.811603E-01
+5.063165E-01
+7.401437E-02
+5.217372E-01
+6.254925E-02
--- a/tests/test_score_scatter_yn/results_true.dat
+++ b/tests/test_score_scatter_yn/results_true.dat
@ -1,56 +1,56 @@
 k-combined:
-1.054379E+00 1.552941E-01
+1.026057E+00 2.398033E-02
 tally 1:
-1.392000E+01
-4.004380E+01
+1.563000E+01
+4.911010E+01
 tally 2:
-1.392000E+01
-4.004380E+01
-1.162523E-01
-6.285463E-03
-4.604876E-02
-9.758725E-03
-7.446115E-02
-1.188951E-02
-1.070725E-01
-8.199347E-03
-1.430332E-01
-1.006189E-02
-6.220835E-02
-2.170032E-03
-4.461911E-02
-5.311571E-03
-5.893834E-02
-2.853624E-03
-1.774247E-02
-4.565916E-03
-1.361764E-01
-9.720466E-03
-5.552471E-02
-1.688629E-03
-6.444523E-02
-4.980551E-03
-1.165646E-01
-4.593555E-03
-3.689214E-02
-6.805224E-03
-4.889834E-02
-4.798768E-03
-1.790962E-03
-1.667560E-03
-1.519084E-02
-9.406351E-04
-2.872474E-02
-2.189180E-03
-8.853646E-03
-2.363124E-03
-2.426150E-02
-9.584716E-04
-8.001382E-02
-2.772334E-03
-7.289455E-02
-2.731364E-03
-9.256989E-02
-2.877968E-03
-1.856055E-02
-1.054268E-03
+1.563000E+01
+4.911010E+01
+3.265314E-02
+1.401010E-02
+-2.784092E-01
+4.070843E-02
+1.487306E-01
+1.624362E-02
+-9.879312E-02
+7.238939E-03
+1.816077E-03
+1.917187E-03
+-5.761546E-02
+1.408617E-02
+-2.333439E-02
+8.671648E-04
+7.575130E-02
+1.088305E-02
+2.951556E-02
+1.230756E-03
+9.293290E-02
+6.250534E-03
+5.114677E-02
+1.294207E-03
+-1.029072E-03
+3.792933E-03
+1.969798E-02
+1.818465E-03
+5.501284E-02
+4.658135E-03
+-8.536202E-02
+1.830272E-03
+-1.121277E-01
+3.579469E-03
+9.495652E-04
+1.749162E-03
+-2.255205E-03
+7.869839E-04
+3.066446E-02
+1.141945E-03
+8.832025E-03
+7.315010E-04
+4.009282E-03
+2.489196E-03
+9.234469E-02
+3.629271E-03
+-2.647418E-02
+1.994398E-03
+-6.930572E-02
+2.199080E-03
--- a/tests/test_score_total/results_true.dat
+++ b/tests/test_score_total/results_true.dat
@ -1,11 +1,11 @@
 k-combined:
-1.054379E+00 1.552941E-01
+1.026057E+00 2.398033E-02
 tallies:
 0.000000E+00
 0.000000E+00
-1.617612E+01
-5.390254E+01
-3.372300E+00
-2.331937E+00
-4.802737E+01
-4.730991E+02
+1.890713E+01
+7.152908E+01
+3.917546E+00
+3.075301E+00
+5.552927E+01
+6.183865E+02
--- a/tests/test_score_total_yn/results_true.dat
+++ b/tests/test_score_total_yn/results_true.dat
@ -1,14 +1,14 @@
 k-combined:
-1.054379E+00 1.552941E-01
+1.026057E+00 2.398033E-02
 tally 1:
 0.000000E+00
 0.000000E+00
-1.617612E+01
-5.390254E+01
-3.372300E+00
-2.331937E+00
-4.802737E+01
-4.730991E+02
+1.890713E+01
+7.152908E+01
+3.917546E+00
+3.075301E+00
+5.552927E+01
+6.183865E+02
 tally 2:
 0.000000E+00
 0.000000E+00
@ -60,153 +60,153 @@ tally 2:
 0.000000E+00
 0.000000E+00
 0.000000E+00
-1.617612E+01
-5.390254E+01
-3.391290E-01
-2.902906E-02
-5.893531E-01
-1.086693E-01
-9.842055E-02
-4.594672E-02
-2.026152E-01
-1.934933E-02
-8.058283E-02
-1.202883E-02
-3.190611E-01
-4.120088E-02
-2.050295E-01
-4.216136E-02
-1.033714E-01
-3.452134E-02
-1.806501E-01
-1.447252E-02
-1.414116E-01
-1.987496E-02
-3.023275E-01
-4.060470E-02
-6.219556E-02
-2.206346E-02
-5.521256E-02
-1.275248E-02
-3.440035E-02
-4.696252E-03
-1.027964E-01
-1.992848E-02
-1.048566E-01
-1.298693E-02
-6.961496E-02
-1.199639E-02
-5.117983E-02
-1.381454E-02
-1.414576E-01
-1.101260E-02
-9.653663E-02
-1.238750E-02
-1.740796E-01
-8.554460E-03
-2.393526E-01
-2.525987E-02
-9.385317E-03
-6.059816E-03
-5.162003E-02
-7.937128E-03
-3.372300E+00
-2.331937E+00
-6.924048E-02
-1.640899E-03
-1.142544E-01
-7.971028E-03
-3.861841E-02
-2.510526E-03
-1.588298E-02
-4.283766E-04
-2.080690E-02
-1.873842E-03
-5.342881E-02
-1.243770E-03
-2.730917E-02
-9.444093E-04
-2.758476E-02
-2.823936E-04
-3.763360E-03
-3.376176E-04
-1.086970E-02
-9.734763E-04
-3.316897E-02
-1.404811E-03
-2.187410E-02
-7.140973E-04
-6.953079E-02
-1.146572E-03
-2.354120E-03
-5.051636E-04
-2.004062E-02
-5.222830E-04
-7.882825E-03
-5.180518E-04
-2.924958E-03
-6.481391E-04
-2.333490E-03
-1.271149E-04
-9.793849E-04
-5.312373E-04
-4.759355E-03
-4.249951E-04
-1.003553E-02
-3.560113E-04
-3.704375E-02
-4.064112E-04
-2.341746E-02
-1.098676E-03
-1.937929E-02
-2.467818E-04
-4.802737E+01
-4.730991E+02
-6.706425E-01
-9.586501E-02
-8.031002E-01
-6.000856E-01
-5.764282E-01
-1.149956E-01
-2.906834E-01
-1.124937E-01
-1.597343E-01
-1.304559E-01
-9.574314E-01
-3.501900E-01
-3.127211E-01
-1.597200E-01
-1.510303E-01
-8.209402E-02
-8.967339E-02
-1.247025E-01
-4.158899E-01
-8.588694E-02
-4.851858E-01
-8.939922E-02
-2.748334E-01
-1.180595E-01
-2.380377E-01
-3.966814E-02
-7.566480E-02
-4.089338E-02
-1.594406E-01
-1.037757E-01
-2.009183E-01
-1.475961E-01
-2.073217E-01
-1.890854E-02
-3.406299E-01
-1.534584E-01
-1.158433E-01
-7.138098E-02
-2.351363E-01
-3.920000E-02
-3.126095E-01
-1.243328E-01
-3.132077E-01
-3.695066E-02
-1.755359E-02
-5.084452E-02
-1.640780E-01
-4.462165E-02
+1.890713E+01
+7.152908E+01
+1.540971E-01
+2.096363E-02
+-1.195630E-02
+1.920476E-02
+1.435431E-01
+5.630497E-02
+-2.834211E-01
+2.062584E-02
+-1.146857E-01
+1.979598E-02
+-1.590494E-01
+5.560603E-02
+-5.697185E-02
+3.953649E-02
+-1.005664E-01
+6.530992E-03
+1.267180E-01
+9.446804E-03
+2.157455E-02
+2.173278E-02
+8.599913E-03
+4.404730E-03
+-1.934882E-02
+3.274972E-02
+4.911689E-02
+3.311127E-03
+9.869050E-03
+3.361814E-02
+4.069442E-02
+1.337725E-02
+-5.423255E-02
+1.606579E-02
+-1.337364E-01
+2.603975E-02
+-1.876630E-01
+1.302219E-02
+-1.859101E-02
+9.387336E-03
+-4.348784E-02
+2.920385E-02
+7.165691E-02
+1.319410E-02
+1.011266E-01
+3.007547E-03
+-1.070307E-02
+1.031868E-02
+-1.144515E-01
+8.151090E-03
+3.917546E+00
+3.075301E+00
+6.570426E-02
+2.338190E-03
+-1.035420E-01
+3.326924E-03
+1.132136E-02
+3.530955E-03
+-5.873495E-02
+1.067474E-03
+1.117638E-02
+1.072043E-03
+-1.104808E-02
+1.979143E-03
+-4.538283E-03
+1.943128E-03
+-2.285799E-02
+1.164137E-03
+-9.458311E-03
+2.890275E-04
+4.544119E-02
+1.097943E-03
+-7.053853E-03
+1.837385E-04
+-1.409662E-02
+1.622809E-03
+1.436006E-02
+1.452850E-04
+-3.192019E-03
+1.390851E-03
+-2.278325E-02
+5.491174E-04
+-3.708952E-02
+9.052735E-04
+2.036647E-03
+3.935901E-04
+-4.746606E-02
+1.238755E-03
+-1.856189E-02
+2.769040E-04
+-3.263358E-02
+5.037085E-04
+4.438126E-02
+1.501352E-03
+-7.960647E-03
+7.667880E-04
+-2.733672E-02
+6.550081E-04
+-8.523785E-04
+5.301322E-04
+5.552927E+01
+6.183865E+02
+2.553389E-01
+1.972678E-01
+-4.802411E-02
+4.047125E-01
+-3.576204E-01
+8.267775E-01
+-2.370981E-01
+1.094746E-01
+6.719123E-02
+1.016838E-01
+-6.275220E-01
+2.276848E-01
+-1.006212E+00
+3.305706E-01
+-1.075971E-01
+1.071164E-01
+-2.403240E-02
+8.732515E-02
+1.763798E-01
+4.856442E-02
+-3.064447E-01
+4.657904E-02
+3.500508E-01
+1.005928E-01
+1.345324E-01
+3.301208E-02
+-2.457195E-01
+1.239986E-01
+1.231432E-01
+4.748970E-02
+-2.831615E-01
+7.052242E-02
+1.386470E-02
+1.342870E-02
+-1.023274E-01
+4.237028E-02
+-2.779053E-01
+3.093304E-02
+-5.897687E-01
+1.043015E-01
+-8.046551E-02
+6.275687E-02
+-1.654252E-01
+4.643724E-02
+4.112639E-01
+1.395497E-01
+2.808468E-01
+6.355664E-02
--- a/tests/test_seed/results_true.dat
+++ b/tests/test_seed/results_true.dat
@ -1,2 +1,2 @@
 k-combined:
-3.002250E-01 2.560424E-03
+2.984828E-01 5.293550E-03
--- a/tests/test_source_angle_mono/results_true.dat
+++ b/tests/test_source_angle_mono/results_true.dat
@ -1,2 +1,2 @@
 k-combined:
-2.996387E-01 4.791063E-03
+3.034005E-01 5.499078E-03
--- a/tests/test_source_energy_maxwell/results_true.dat
+++ b/tests/test_source_energy_maxwell/results_true.dat
@ -1,2 +1,2 @@
 k-combined:
-2.960341E-01 2.432626E-03
+3.008495E-01 6.113736E-03
--- a/tests/test_source_energy_mono/results_true.dat
+++ b/tests/test_source_energy_mono/results_true.dat
@ -1,2 +1,2 @@
 k-combined:
-3.067897E-01 2.558512E-03
+2.964207E-01 7.263112E-03
--- a/tests/test_source_file/results_true.dat
+++ b/tests/test_source_file/results_true.dat
@ -1,2 +1,2 @@
 k-combined:
-2.968014E-01 3.867835E-03
+3.031470E-01 4.441814E-03
--- a/tests/test_source_point/results_true.dat
+++ b/tests/test_source_point/results_true.dat
@ -1,2 +1,2 @@
 k-combined:
-3.100117E-01 1.385536E-03
+3.025384E-01 4.682677E-03
--- a/tests/test_sourcepoint_batch/results_true.dat
+++ b/tests/test_sourcepoint_batch/results_true.dat
@ -1,3 +1,3 @@
 k-combined:
 0.000000E+00 0.000000E+00
-9.443159E-02 -4.436948E+00 -2.416874E+00 
+1.892327E+00 -3.385257E+00 6.702634E-01 
--- a/tests/test_sourcepoint_interval/results_true.dat
+++ b/tests/test_sourcepoint_interval/results_true.dat
@ -1,3 +1,3 @@
 k-combined:
 0.000000E+00 0.000000E+00
-9.443159E-02 -4.436948E+00 -2.416874E+00 
+1.892327E+00 -3.385257E+00 6.702634E-01 
--- a/tests/test_sourcepoint_latest/results_true.dat
+++ b/tests/test_sourcepoint_latest/results_true.dat
@ -1,2 +1,2 @@
 k-combined:
-3.037840E-01 4.395585E-03
+3.011726E-01 1.841644E-03
--- a/tests/test_sourcepoint_restart/results_true.dat
+++ b/tests/test_sourcepoint_restart/results_true.dat
--- a/tests/test_statepoint_batch/results_true.dat
+++ b/tests/test_statepoint_batch/results_true.dat
@ -1,2 +1,2 @@
 k-combined:
-3.059072E-01 2.420579E-03
+3.109090E-01 5.807934E-03
--- a/tests/test_statepoint_interval/results_true.dat
+++ b/tests/test_statepoint_interval/results_true.dat
@ -1,2 +1,2 @@
 k-combined:
-3.037840E-01 4.395585E-03
+3.011726E-01 1.841644E-03
--- a/tests/test_statepoint_restart/results_true.dat
+++ b/tests/test_statepoint_restart/results_true.dat
--- a/tests/test_statepoint_sourcesep/results_true.dat
+++ b/tests/test_statepoint_sourcesep/results_true.dat
@ -1,2 +1,2 @@
 k-combined:
-3.037840E-01 4.395585E-03
+3.011726E-01 1.841644E-03
--- a/tests/test_survival_biasing/results_true.dat
+++ b/tests/test_survival_biasing/results_true.dat
@ -1,2 +1,2 @@
 k-combined:
-9.971216E-01 1.547566E-02
+1.025211E+00 1.372397E-02
--- a/tests/test_tally_assumesep/results.py
+++ b/tests/test_tally_assumesep/results.py
@ -23,7 +23,7 @@ results2 = sp.tallies[1].results
 shape2 = results2.shape
 size2 = (np.product(shape2))
 results2 = np.reshape(results2, size2)
-results3 = sp.tallies[1].results
+results3 = sp.tallies[2].results
 shape3 = results3.shape
 size3 = (np.product(shape3))
 results3 = np.reshape(results3, size3)
--- a/tests/test_tally_assumesep/results_true.dat
+++ b/tests/test_tally_assumesep/results_true.dat
@ -1,11 +1,11 @@
 k-combined:
-1.054379E+00 1.552941E-01
+1.026057E+00 2.398033E-02
 tally 1:
-1.617612E+01
-5.390254E+01
+1.890713E+01
+7.152908E+01
 tally 2:
-3.372300E+00
-2.331937E+00
+3.917546E+00
+3.075301E+00
 tally 3:
-3.372300E+00
-2.331937E+00
+5.552927E+01
+6.183865E+02
--- a/tests/test_tally_nuclides/results_true.dat
+++ b/tests/test_tally_nuclides/results_true.dat
@ -1,27 +1,27 @@
 k-combined:
-9.915468E-01 3.304007E-02
+9.851180E-01 1.587642E-02
 tallies:
-7.248433E+00
-1.055718E+01
-1.648818E+00
-5.456989E-01
-1.597741E+00
-5.123728E-01
-5.599615E+00
-6.304184E+00
-7.248433E+00
-1.055718E+01
-1.648818E+00
-5.456989E-01
-1.597741E+00
-5.123728E-01
-5.599615E+00
-6.304184E+00
-7.248433E+00
-1.055718E+01
-1.648818E+00
-5.456989E-01
-1.597741E+00
-5.123728E-01
-5.599615E+00
-6.304184E+00
+7.516940E+00
+1.149356E+01
+1.700884E+00
+5.835345E-01
+1.635327E+00
+5.385674E-01
+5.816056E+00
+6.901370E+00
+7.516940E+00
+1.149356E+01
+1.700884E+00
+5.835345E-01
+1.635327E+00
+5.385674E-01
+5.816056E+00
+6.901370E+00
+7.516940E+00
+1.149356E+01
+1.700884E+00
+5.835345E-01
+1.635327E+00
+5.385674E-01
+5.816056E+00
+6.901370E+00
--- a/tests/test_trace/results_true.dat
+++ b/tests/test_trace/results_true.dat
@ -1,2 +1,2 @@
 k-combined:
-3.037840E-01 4.395585E-03
+3.011726E-01 1.841644E-03
--- a/tests/test_translation/results_true.dat
+++ b/tests/test_translation/results_true.dat
@ -1,2 +1,2 @@
 k-combined:
-3.037840E-01 4.395585E-03
+3.011726E-01 1.841644E-03
--- a/tests/test_uniform_fs/results_true.dat
+++ b/tests/test_uniform_fs/results_true.dat
@ -1,2 +1,2 @@
 k-combined:
-3.539168E-01 1.044452E-02
+3.623468E-01 4.795863E-03
--- a/tests/test_universe/results_true.dat
+++ b/tests/test_universe/results_true.dat
@ -1,2 +1,2 @@
 k-combined:
-3.037840E-01 4.395585E-03
+3.011726E-01 1.841644E-03
--- a/tests/test_void/results_true.dat
+++ b/tests/test_void/results_true.dat
@ -1,2 +1,2 @@
 k-combined:
-1.010005E+00 3.844050E-02
+1.069802E+00 2.223092E-02