merged develop into test_suite

src/constants.F90

@@ -256,8 +256,7 @@ module constants
        EVENT_SURFACE = -2, &
        EVENT_LATTICE = -1, &
        EVENT_SCATTER =  1, &
-       EVENT_ABSORB  =  2, &
-       EVENT_FISSION =  3 
+       EVENT_ABSORB  =  2
 
   ! Tally score type
   integer, parameter :: N_SCORE_TYPES = 14

src/eigenvalue.F90

@@ -98,6 +98,9 @@ contains
     ! END OF RUN WRAPUP
 
     if (master) call header("SIMULATION FINISHED", level=1)
+    
+    ! Clear particle
+    call p % clear()
 
   end subroutine run_eigenvalue
 

src/energy_grid.F90

@@ -2,7 +2,7 @@ module energy_grid
 
   use constants,        only: MAX_LINE_LEN
   use global
-  use list_header,      only: ListElemReal
+  use list_header,      only: ListReal
   use output,           only: write_message
 
 contains
@@ -18,9 +18,8 @@ contains
   subroutine unionized_grid()
 
     integer :: i ! index in nuclides array
-    type(ListElemReal), pointer :: list => null()
-    type(ListElemReal), pointer :: current => null()
-    type(Nuclide),      pointer :: nuc => null()
+    type(ListReal), pointer :: list => null()
+    type(Nuclide),  pointer :: nuc => null()
 
     message = "Creating unionized energy grid..."
     call write_message(5)
@@ -31,24 +30,18 @@ contains
       call add_grid_points(list, nuc % energy)
     end do
 
-    ! determine size of list
-    n_grid = 0
-    current => list
-    do while (associated(current))
-      n_grid = n_grid + 1
-      current => current % next
-    end do
+    ! Set size of unionized energy grid 
+    n_grid = list % size() 
 
     ! create allocated array from linked list
     allocate(e_grid(n_grid))
-    current => list
     do i = 1, n_grid
-      e_grid(i) = current % data
-      current => current % next
+      e_grid(i) = list % get_item(i)
     end do
 
     ! delete linked list and dictionary
-    ! call list_delete(list)
+    call list % clear()
+    deallocate(list)
 
     ! Set pointers to unionized energy grid for each nuclide
     call grid_pointers()
@@ -62,89 +55,64 @@ contains
 
   subroutine add_grid_points(list, energy)
 
-    type(ListElemReal), pointer :: list
+    type(ListReal), pointer :: list
     real(8), intent(in) :: energy(:)
 
-    integer :: i  ! index in energy array
-    integer :: n  ! size of energy array
-    real(8) :: E  ! actual energy value
-    type(ListElemReal), pointer :: current => null()
-    type(ListElemReal), pointer :: previous => null()
-    type(ListElemReal), pointer :: head => null()
-    type(ListElemReal), pointer :: tmp => null()
+    integer :: i       ! index in energy array
+    integer :: n       ! size of energy array
+    integer :: current ! current index 
+    real(8) :: E       ! actual energy value
 
     i = 1
     n = size(energy)
 
-    ! if the original list is empty, we need to allocate the first element and
+    ! If the original list is empty, we need to allocate the first element and
     ! store first energy point
     if (.not. associated(list)) then
       allocate(list)
-      current => list
       do i = 1, n
-        current % data = energy(i)
-        if (i == n) then
-          current % next => null()
-          return
-        end if
-        allocate(current % next)
-        current => current % next
+        call list % append(energy(i))
       end do
+      return
     end if
 
-    current => list
-    head => list
+    ! Set current index to beginning of the list 
+    current = 1
 
     do while (i <= n)
       E = energy(i)
 
       ! If we've reached the end of the grid energy list, add the remaining
       ! energy points to the end
-      if (.not. associated(current)) then
-        ! finish remaining energies
+      if (current > list % size()) then
+        ! Finish remaining energies
         do while (i <= n)
-          allocate(previous % next)
-          current => previous % next
-          current % data = energy(i)
-          previous => current
+          call list % append(energy(i))
           i = i + 1
         end do
-        current%next => null()
         exit
       end if
 
-      if (E < current % data) then
-        ! create new element and insert it in energy grid list
-        allocate(tmp)
-        tmp % data = E
-        tmp % next => current
-        if (associated(previous)) then
-          previous % next => tmp
-          previous => tmp
-        else
-          previous => tmp
-          head => previous
-        end if
-        nullify(tmp)
+      if (E < list % get_item(current)) then
 
-        ! advance index
+        ! Insert new energy in this position
+        call list % insert(current, E)
+
+        ! Advance index in linked list and in new energy grid
         i = i + 1
+        current = current + 1
 
-      elseif (E == current % data) then
-        ! found the exact same energy, no need to store duplicates so just
+      elseif (E == list % get_item(current)) then
+        ! Found the exact same energy, no need to store duplicates so just
         ! skip and move to next index
         i = i + 1
+        current = current + 1
       else
-        previous => current
-        current => current % next
+        current = current + 1
       end if
 
     end do
 
-    ! It's possible that an element was inserted at the front of the list, so we
-    ! need to move the list pointer back to the start of the list
-    list => head
-
   end subroutine add_grid_points
 
 !===============================================================================

src/finalize.F90

@@ -69,6 +69,10 @@ contains
 #endif
 
 #ifdef MPI
+    ! Free all MPI types
+    call MPI_TYPE_FREE(MPI_BANK, mpi_err)
+    call MPI_TYPE_FREE(MPI_TALLYRESULT, mpi_err)
+
     ! If MPI is in use and enabled, terminate it
     call MPI_FINALIZE(mpi_err)
 #endif

src/global.F90

@@ -409,6 +409,19 @@ contains
     if (allocated(xs_listings)) deallocate(xs_listings)
     if (allocated(micro_xs)) deallocate(micro_xs)
 
+    ! Deallocate external source
+    if (allocated(external_source % params_space)) &
+         deallocate(external_source % params_space)
+    if (allocated(external_source % params_angle)) &
+         deallocate(external_source % params_angle)
+    if (allocated(external_source % params_energy)) &
+         deallocate(external_source % params_energy)
+
+    ! Deallocate k and entropy
+    if (allocated(k_generation)) deallocate(k_generation)
+    if (allocated(entropy)) deallocate(entropy)
+    if (allocated(entropy_p)) deallocate(entropy_p)
+
     ! Deallocate tally-related arrays
     if (allocated(meshes)) deallocate(meshes)
     if (allocated(tallies)) then
@@ -450,6 +463,9 @@ contains
     call nuclide_dict % clear()
     call sab_dict % clear()
     call xs_listing_dict % clear()
+
+    ! Clear statepoint batch set
+    call statepoint_batch % clear()
     
   end subroutine free_memory
 

src/initialize.F90

@@ -242,6 +242,9 @@ contains
     ! Commit derived type for tally scores
     call MPI_TYPE_COMMIT(MPI_TALLYRESULT, mpi_err)
 
+    ! Free temporary MPI type
+    call MPI_TYPE_FREE(temp_type, mpi_err)
+
   end subroutine initialize_mpi
 #endif
 
@@ -417,6 +420,8 @@ contains
     integer, allocatable :: index_cell_in_univ(:) ! the index in the univ%cells
                                                   ! array for each universe
     type(ElemKeyValueII), pointer :: pair_list => null()
+    type(ElemKeyValueII), pointer :: current => null()
+    type(ElemKeyValueII), pointer :: next => null()
     type(Universe),       pointer :: univ => null()
     type(Cell),           pointer :: c => null()
 
@@ -428,24 +433,27 @@ contains
     ! cells_in_univ_dict, it's the id of the universe and the number of cells.
 
     pair_list => universe_dict % keys()
-    do while (associated(pair_list))
-      ! find index of universe in universes array
-      i_univ = pair_list % value
+    current => pair_list
+    do while (associated(current))
+      ! Find index of universe in universes array
+      i_univ = current % value
       univ => universes(i_univ)
-      univ % id = pair_list % key
+      univ % id = current % key
 
-      ! check for lowest level universe
+      ! Check for lowest level universe
       if (univ % id == 0) BASE_UNIVERSE = i_univ
 
-      ! find cell count for this universe
+      ! Find cell count for this universe
       n_cells_in_univ = cells_in_univ_dict % get_key(univ % id)
 
-      ! allocate cell list for universe
+      ! Allocate cell list for universe
       allocate(univ % cells(n_cells_in_univ))
       univ % n_cells = n_cells_in_univ
 
-      ! move to next universe
-      pair_list => pair_list % next
+      ! Move to next universe
+      next => current % next
+      deallocate(current)
+      current => next
     end do
 
     ! Also allocate a list for keeping track of where cells have been assigned
@@ -457,16 +465,19 @@ contains
     do i = 1, n_cells
       c => cells(i)
 
-      ! get pointer to corresponding universe
+      ! Get pointer to corresponding universe
       i_univ = universe_dict % get_key(c % universe)
       univ => universes(i_univ)
 
-      ! increment the index for the cells array within the Universe object and
+      ! Increment the index for the cells array within the Universe object and
       ! then store the index of the Cell object in that array
       index_cell_in_univ(i_univ) = index_cell_in_univ(i_univ) + 1
       univ % cells(index_cell_in_univ(i_univ)) = i
     end do
-    
+
+    ! Clear dictionary
+    call cells_in_univ_dict % clear()
+
   end subroutine prepare_universes
 
 !===============================================================================

src/list_header.F90

@@ -19,16 +19,19 @@ module list_header
   type :: ListElemInt
     integer :: data
     type(ListElemInt), pointer :: next => null()
+    type(ListElemInt), pointer :: prev => null()
   end type ListElemInt
 
   type :: ListElemReal
     real(8) :: data
     type(ListElemReal), pointer :: next => null()
+    type(ListElemReal), pointer :: prev => null()
   end type ListElemReal
 
   type :: ListElemChar
     character(MAX_WORD_LEN) :: data
     type(ListElemChar), pointer :: next => null()
+    type(ListElemChar), pointer :: prev => null()
   end type ListElemChar
 
 !===============================================================================
@@ -128,6 +131,7 @@ contains
     else
       ! Otherwise append element at end of list
       this % tail % next => elem
+      elem % prev => this % tail
       this % tail => this % tail % next
     end if
 
@@ -152,6 +156,7 @@ contains
     else
       ! Otherwise append element at end of list
       this % tail % next => elem
+      elem % prev => this % tail
       this % tail => this % tail % next
     end if
 
@@ -176,6 +181,7 @@ contains
     else
       ! Otherwise append element at end of list
       this % tail % next => elem
+      elem % prev => this % tail
       this % tail => this % tail % next
     end if
 
@@ -499,8 +505,13 @@ contains
 
     else
       ! Default case with new element somewhere in middle of list
-      i = 0
-      elem => this % head
+      if (i_list >= this % last_index) then
+        i = this % last_index
+        elem => this % last_elem
+      else
+        i = 0
+        elem => this % head
+      end if
       do while (associated(elem))
         i = i + 1
         if (i == i_list - 1) then
@@ -509,11 +520,17 @@ contains
           new_elem % data = data
           
           ! Put it before the i-th element
-          new_elem % next => elem % next
-          elem % next => new_elem
+          new_elem % prev => elem % prev
+          new_elem % next => elem
+          new_elem % prev % next => new_elem
+          new_elem % next % prev => new_elem
           this % count = this % count + 1
+          this % last_index = i_list
+          this % last_elem => new_elem
           exit
         end if
+        i = i + 1
+        elem => elem % next
       end do
     end if
 
@@ -544,21 +561,31 @@ contains
 
     else
       ! Default case with new element somewhere in middle of list
-      i = 0
-      elem => this % head
+      if (i_list >= this % last_index) then
+        i = this % last_index
+        elem => this % last_elem
+      else
+        i = 0
+        elem => this % head
+      end if
       do while (associated(elem))
-        i = i + 1
-        if (i == i_list - 1) then
+        if (i == i_list) then
           ! Allocate new element
           allocate(new_elem)
           new_elem % data = data
           
           ! Put it before the i-th element
-          new_elem % next => elem % next
-          elem % next => new_elem
+          new_elem % prev => elem % prev
+          new_elem % next => elem
+          new_elem % prev % next => new_elem
+          new_elem % next % prev => new_elem
           this % count = this % count + 1
+          this % last_index = i_list
+          this % last_elem => new_elem
           exit
         end if
+        i = i + 1
+        elem => elem % next
       end do
     end if
 
@@ -589,21 +616,31 @@ contains
 
     else
       ! Default case with new element somewhere in middle of list
-      i = 0
-      elem => this % head
+      if (i_list >= this % last_index) then
+        i = this % last_index
+        elem => this % last_elem
+      else
+        i = 0
+        elem => this % head
+      end if
       do while (associated(elem))
-        i = i + 1
-        if (i == i_list - 1) then
+        if (i == i_list) then
           ! Allocate new element
           allocate(new_elem)
           new_elem % data = data
           
           ! Put it before the i-th element
-          new_elem % next => elem % next
-          elem % next => new_elem
+          new_elem % prev => elem % prev
+          new_elem % next => elem
+          new_elem % prev % next => new_elem
+          new_elem % next % prev => new_elem
           this % count = this % count + 1
+          this % last_index = i_list
+          this % last_elem => new_elem
           exit
         end if
+        i = i + 1
+        elem => elem % next
       end do
     end if
 
@@ -620,7 +657,6 @@ contains
     integer        :: data
 
     type(ListElemInt), pointer :: elem => null()
-    type(ListElemInt), pointer :: prev => null()
 
     elem => this % head
     do while (associated(elem))
@@ -632,12 +668,14 @@ contains
         if (associated(elem, this % head)) then
           this % head => elem % next
           if (associated(elem, this % tail)) nullify(this % tail)
+          if (associated(this % head)) nullify(this % head % prev)
           deallocate(elem)
         else if (associated(elem, this % tail)) then
-          this % tail => prev
+          this % tail => elem % prev
           deallocate(this % tail % next)
         else
-          prev % next => elem % next
+          elem % prev % next => elem % next
+          elem % next % prev => elem % prev
           deallocate(elem)
         end if
 
@@ -647,7 +685,6 @@ contains
       end if
 
       ! Advance pointers
-      prev => elem
       elem => elem % next
     end do
 
@@ -659,7 +696,6 @@ contains
     real(8)         :: data
 
     type(ListElemReal), pointer :: elem => null()
-    type(ListElemReal), pointer :: prev => null()
 
     elem => this % head
     do while (associated(elem))
@@ -671,12 +707,14 @@ contains
         if (associated(elem, this % head)) then
           this % head => elem % next
           if (associated(elem, this % tail)) nullify(this % tail)
+          if (associated(this % head)) nullify(this % head % prev)
           deallocate(elem)
         else if (associated(elem, this % tail)) then
-          this % tail => prev
+          this % tail => elem % prev
           deallocate(this % tail % next)
         else
-          prev % next => elem % next
+          elem % prev % next => elem % next
+          elem % next % prev => elem % prev
           deallocate(elem)
         end if
 
@@ -686,7 +724,6 @@ contains
       end if
 
       ! Advance pointers
-      prev => elem
       elem => elem % next
     end do
 
@@ -698,7 +735,6 @@ contains
     character(*)    :: data
 
     type(ListElemChar), pointer :: elem => null()
-    type(ListElemChar), pointer :: prev => null()
 
     elem => this % head
     do while (associated(elem))
@@ -710,12 +746,14 @@ contains
         if (associated(elem, this % head)) then
           this % head => elem % next
           if (associated(elem, this % tail)) nullify(this % tail)
+          if (associated(this % head)) nullify(this % head % prev)
           deallocate(elem)
         else if (associated(elem, this % tail)) then
-          this % tail => prev
+          this % tail => elem % prev
           deallocate(this % tail % next)
         else
-          prev % next => elem % next
+          elem % prev % next => elem % next
+          elem % next % prev => elem % prev
           deallocate(elem)
         end if
 
@@ -725,7 +763,6 @@ contains
       end if
 
       ! Advance pointers
-      prev => elem
       elem => elem % next
     end do
 

src/particle_header.F90

@@ -58,7 +58,8 @@ module particle_header
     real(8)    :: absorb_wgt    ! weight absorbed for survival biasing
 
     ! What event last took place
-    integer    :: event         ! scatter, absorption, fission
+    logical    :: fission       ! did the particle cause implicit fission
+    integer    :: event         ! scatter, absorption
     integer    :: event_nuclide ! index in nuclides array
     integer    :: event_MT      ! reaction MT
 
@@ -77,6 +78,7 @@ module particle_header
 
   contains
     procedure :: initialize => initialize_particle
+    procedure :: clear => clear_particle
   end type Particle
 
 contains
@@ -110,6 +112,9 @@ contains
 
     class(Particle) :: this
 
+    ! Clear coordinate lists
+    call this % clear()
+
     ! Set particle to neutron that's alive
     this % type  = NEUTRON
     this % alive = .true.
@@ -125,9 +130,7 @@ contains
     this % n_bank        = 0
     this % wgt_bank      = ZERO
     this % n_collision   = 0
-
-    ! remove any original coordinates
-    call deallocate_coord(this % coord0)
+    this % fission       = .false.
 
     ! Set up base level coordinates
     allocate(this % coord0)
@@ -136,4 +139,20 @@ contains
 
   end subroutine initialize_particle
 
+!===============================================================================
+! CLEAR_PARTICLE
+!===============================================================================
+
+  subroutine clear_particle(this)
+
+    class(Particle) :: this
+
+    ! remove any coordinate levels
+    call deallocate_coord(this % coord0)
+
+    ! Make sure coord pointer is nullified
+    nullify(this % coord)
+
+  end subroutine clear_particle
+
 end module particle_header

src/physics.F90

@@ -746,7 +746,7 @@ contains
     end if
 
     ! Determine expected number of neutrons produced
-    nu_t = p % wgt / keff * weight * micro_xs(i_nuclide) % fission / &
+    nu_t = p % wgt / keff * weight * micro_xs(i_nuclide) % nu_fission / &
          micro_xs(i_nuclide) % total
 
     ! Sample number of neutrons produced
@@ -758,6 +758,7 @@ contains
 
     ! Bank source neutrons
     if (nu == 0 .or. n_bank == 3*work) return
+    p % fission = .true. ! Fission neutrons will be banked
     do i = int(n_bank,4) + 1, int(min(n_bank + nu, 3*work),4)
       ! Bank source neutrons by copying particle data
       fission_bank(i) % xyz = p % coord0 % xyz

src/tally.F90

@@ -258,7 +258,7 @@ contains
 
             else
               ! Skip any non-fission events
-              if (p % event /= EVENT_FISSION) cycle SCORE_LOOP
+              if (.not. p % fission) cycle SCORE_LOOP
 
               ! All fission events will contribute, so again we can use
               ! particle's weight entering the collision as the estimate for the
@@ -278,7 +278,7 @@ contains
 
             else
               ! Skip any non-fission events
-              if (p % event /= EVENT_FISSION) cycle SCORE_LOOP
+              if (.not. p % fission) cycle SCORE_LOOP
 
               if (t % find_filter(FILTER_ENERGYOUT) > 0) then
                 ! Normally, we only need to make contributions to one scoring
@@ -314,7 +314,7 @@ contains
               
             else
               ! Skip any non-fission events
-              if (p % event /= EVENT_FISSION) cycle SCORE_LOOP
+              if (.not. p % fission) cycle SCORE_LOOP
 
               ! All fission events will contribute, so again we can use
               ! particle's weight entering the collision as the estimate for

src/tracking.F90

@@ -150,6 +150,9 @@ contains
         p % n_bank   = 0
         p % wgt_bank = ZERO
 
+        ! Reset fission logical
+        p % fission = .false.
+
         ! Save coordinates for tallying purposes
         p % last_xyz = p % coord0 % xyz
 

tests/test_basic/results_true.dat

@@ -1,2 +1,2 @@
 k-combined:
-3.040876E-01 8.800801E-04
+3.011353E-01 2.854556E-03

tests/test_confidence_intervals/results_true.dat

@@ -1,5 +1,5 @@
 k-combined:
-2.943204E-01 1.265543E-02
+2.937103E-01 7.391597E-03
 tallies:
-6.539238E+01
-5.398325E+02
+6.267771E+01
+4.928030E+02

tests/test_density_atombcm/results_true.dat

@@ -1,2 +1,2 @@
 k-combined:
-1.759260E+00 2.728159E-02
+1.739614E+00 1.281892E-02

tests/test_density_atomcm3/results_true.dat

@@ -1,2 +1,2 @@
 k-combined:
-1.125625E+00 1.475256E-02
+1.081464E+00 2.283652E-02

tests/test_density_kgm3/results_true.dat

@@ -1,2 +1,2 @@
 k-combined:
-7.760796E-01 2.228188E-02
+8.058880E-01 5.121476E-03

tests/test_density_sum/results_true.dat

@@ -1,2 +1,2 @@
 k-combined:
-3.260007E-01 1.356562E-02
+3.166569E-01 6.367411E-03

tests/test_eigenvalue_genperbatch/results_true.dat

@@ -1,2 +1,2 @@
 k-combined:
-2.840282E-01 2.273104E-02
+3.004375E-01 2.308696E-03

tests/test_eigenvalue_no_inactive/results_true.dat

@@ -1,2 +1,2 @@
 k-combined:
-3.089683E-01 1.118024E-02
+3.118508E-01 6.764530E-03

tests/test_energy_grid/results_true.dat

@@ -1,2 +1,2 @@
 k-combined:
-3.152275E-01 5.099594E-03
+3.243018E-01 9.673636E-04

tests/test_entropy/results_true.dat

@@ -1,13 +1,13 @@
 k-combined:
-3.040876E-01 8.800801E-04
+3.011353E-01 2.854556E-03
 entropy:
-6.224530E+00
-7.343359E+00
-7.763362E+00
-7.768850E+00
-7.786077E+00
-7.725812E+00
-7.761218E+00
-7.841014E+00
-7.925601E+00
-7.860382E+00
+7.114513E+00
+8.055602E+00
+8.233973E+00
+8.235572E+00
+8.284484E+00
+8.289848E+00
+8.420080E+00
+8.279431E+00
+8.299997E+00
+8.363968E+00

tests/test_filter_cell/results_true.dat

@@ -1,11 +1,11 @@
 k-combined:
-9.804685E-01 4.718832E-02
+9.377383E-01 6.215432E-02
 tallies:
 0.000000E+00
 0.000000E+00
-8.782377E+00
-1.555795E+01
-1.844823E+00
-7.029768E-01
-2.652660E+01
-1.423342E+02
+1.882286E+01
+7.203128E+01
+4.035920E+00
+3.309607E+00
+5.615336E+01
+6.414295E+02

tests/test_filter_cellborn/results_true.dat

@@ -1,10 +1,10 @@
 k-combined:
-9.804685E-01 4.718832E-02
+9.377383E-01 6.215432E-02
 tallies:
 0.000000E+00
 0.000000E+00
-4.350661E+01
-3.851070E+02
+9.112133E+01
+1.691917E+03
 0.000000E+00
 0.000000E+00
 0.000000E+00

tests/test_filter_energy/results_true.dat

@@ -1,11 +1,11 @@
 k-combined:
-9.804685E-01 4.718832E-02
+9.377383E-01 6.215432E-02
 tallies:
-2.567612E+01
-1.350623E+02
-4.369329E+01
-3.843133E+02
-5.366385E+01
-5.770809E+02
-9.124401E+00
-1.745739E+01
+3.264740E+01
+2.156683E+02
+4.390485E+01
+3.881739E+02
+5.074294E+01
+5.169367E+02
+1.005233E+01
+2.030525E+01

tests/test_filter_energyout/results_true.dat

@@ -1,11 +1,11 @@
 k-combined:
-9.804685E-01 4.718832E-02
+9.377383E-01 6.215432E-02
 tallies:
-2.559000E+01
-1.335439E+02
-4.296000E+01
-3.705446E+02
-5.141000E+01
-5.292019E+02
-6.140000E+00
-7.843400E+00
+3.268000E+01
+2.163902E+02
+4.350000E+01
+3.802402E+02
+5.133000E+01
+5.287433E+02
+6.620000E+00
+8.827000E+00

tests/test_filter_group_transfer/results_true.dat

@@ -1,12 +1,54 @@
 k-combined:
-9.804685E-01 4.718832E-02
+9.377383E-01 6.215432E-02
 tallies:
-2.297000E+01
-1.080823E+02
+3.003000E+01
+1.833551E+02
 0.000000E+00
 0.000000E+00
-6.000000E-02
-1.400000E-03
+4.000000E-02
+4.000000E-04
+0.000000E+00
+0.000000E+00
+0.000000E+00
+0.000000E+00
+7.744614E-01
+1.257125E-01
+0.000000E+00
+0.000000E+00
+2.155579E+00
+9.683005E-01
+2.650000E+00
+1.413900E+00
+0.000000E+00
+0.000000E+00
+3.897000E+01
+3.053885E+02
+0.000000E+00
+0.000000E+00
+0.000000E+00
+0.000000E+00
+2.791999E-01
+1.768291E-02
+0.000000E+00
+0.000000E+00
+6.714765E-01
+9.169556E-02
+0.000000E+00
+0.000000E+00
+0.000000E+00
+0.000000E+00
+4.490000E+00
+4.036500E+00
+0.000000E+00
+0.000000E+00
+4.794000E+01
+4.614712E+02
+1.733787E-02
+3.006016E-04
+0.000000E+00
+0.000000E+00
+8.687216E-02
+2.204684E-03
 0.000000E+00
 0.000000E+00
 0.000000E+00
@@ -15,53 +57,11 @@ tallies:
 0.000000E+00
 0.000000E+00
 0.000000E+00
-0.000000E+00
-0.000000E+00
-2.620000E+00
-1.377200E+00
-0.000000E+00
-0.000000E+00
-3.833000E+01
-2.952663E+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
-4.560000E+00
-4.159200E+00
-0.000000E+00
-0.000000E+00
-4.848000E+01
-4.706858E+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
-1.000000E-02
-1.000000E-04
-0.000000E+00
-0.000000E+00
-2.930000E+00
-1.784700E+00
-0.000000E+00
-0.000000E+00
-6.140000E+00
-7.843400E+00
-0.000000E+00
-0.000000E+00
+3.390000E+00
+2.316500E+00
+1.289777E-01
+4.057153E-03
+6.620000E+00
+8.827000E+00
+3.187732E-01
+2.168587E-02

tests/test_filter_material/results_true.dat

@@ -1,11 +1,11 @@
 k-combined:
-9.804685E-01 4.718832E-02
+9.377383E-01 6.215432E-02
 tallies:
-2.888596E+01
-1.677045E+02
-6.686793E+00
-8.949192E+00
-3.519284E+01
-2.542594E+02
-6.096488E+01
-7.509961E+02
+2.775441E+01
+1.548313E+02
+6.478091E+00
+8.429334E+00
+6.633549E+01
+8.891478E+02
+2.894859E+01
+1.728531E+02

tests/test_filter_mesh_2d/results_true.dat

@@ -1,5 +1,5 @@
 k-combined:
-9.804685E-01 4.718832E-02
+9.377383E-01 6.215432E-02
 tallies:
 0.000000E+00
 0.000000E+00
@@ -15,20 +15,16 @@ tallies:
 0.000000E+00
 0.000000E+00
 0.000000E+00
-8.588844E-02
-7.376825E-03
-1.293954E+00
-6.134535E-01
-3.176056E+00
-2.843773E+00
-2.972216E+00
-2.280986E+00
-2.267953E+00
-1.831918E+00
 0.000000E+00
 0.000000E+00
 0.000000E+00
 0.000000E+00
+2.643994E-01
+6.990705E-02
+1.189246E-01
+1.272422E-02
+1.950085E-01
+3.802830E-02
 0.000000E+00
 0.000000E+00
 0.000000E+00
@@ -39,28 +35,10 @@ tallies:
 0.000000E+00
 0.000000E+00
 0.000000E+00
-2.102052E-01
-4.418622E-02
 0.000000E+00
 0.000000E+00
 0.000000E+00
 0.000000E+00
-7.523715E-01
-2.846084E-01
-1.276775E-01
-1.563459E-02
-1.096356E+00
-8.112460E-01
-1.310094E+00
-7.842445E-01
-4.488627E+00
-4.401760E+00
-2.614767E+00
-2.292633E+00
-2.734832E+00
-2.441476E+00
-2.224907E-03
-4.950211E-06
 0.000000E+00
 0.000000E+00
 0.000000E+00
@@ -71,28 +49,18 @@ tallies:
 0.000000E+00
 0.000000E+00
 0.000000E+00
-9.474020E-02
-8.975706E-03
-4.986216E-01
-2.486235E-01
 0.000000E+00
 0.000000E+00
+9.812466E-01
+3.508883E-01
+7.746344E-01
+1.494356E-01
+1.167356E+00
+5.769021E-01
+7.011661E-02
+4.916339E-03
 0.000000E+00
 0.000000E+00
-1.860618E-01
-3.461899E-02
-6.427301E-02
-4.131020E-03
-1.199112E+00
-4.564874E-01
-1.421427E+00
-5.367875E-01
-3.602392E+00
-2.897786E+00
-1.329731E-01
-1.768184E-02
-1.121510E+00
-3.228193E-01
 0.000000E+00
 0.000000E+00
 0.000000E+00
@@ -111,24 +79,20 @@ tallies:
 0.000000E+00
 0.000000E+00
 0.000000E+00
-2.733767E-03
-7.473483E-06
-8.740627E-01
-3.088805E-01
-3.996089E-01
-8.005836E-02
-2.300807E+00
-2.049687E+00
-1.666256E+00
-7.841205E-01
-2.689159E-01
-3.246764E-02
 0.000000E+00
 0.000000E+00
 0.000000E+00
 0.000000E+00
 0.000000E+00
 0.000000E+00
+1.841986E+00
+9.145385E-01
+3.304048E+00
+2.370551E+00
+2.223753E+00
+2.432702E+00
+1.195802E+00
+4.468821E-01
 0.000000E+00
 0.000000E+00
 0.000000E+00
@@ -143,34 +107,28 @@ tallies:
 0.000000E+00
 0.000000E+00
 0.000000E+00
-2.415288E-01
-5.833617E-02
-2.563299E-01
-3.814006E-02
-4.653498E+00
-5.940719E+00
-2.105158E+00
-1.527280E+00
-2.580797E+00
-1.555361E+00
-3.505694E+00
-2.613211E+00
-2.115893E+00
-2.237034E+00
+3.968156E-01
+1.574626E-01
+7.654730E-02
+5.859489E-03
 0.000000E+00
 0.000000E+00
 0.000000E+00
 0.000000E+00
 0.000000E+00
 0.000000E+00
-5.899104E-01
-3.479943E-01
+4.503383E-02
+2.028046E-03
+1.331893E+00
+4.474482E-01
+3.470256E-01
+9.728546E-02
+5.020144E-01
+7.010055E-02
+1.057095E+00
+3.474856E-01
 0.000000E+00
 0.000000E+00
-1.510467E-01
-2.281509E-02
-4.288984E-01
-1.839538E-01
 0.000000E+00
 0.000000E+00
 0.000000E+00
@@ -181,60 +139,34 @@ tallies:
 0.000000E+00
 0.000000E+00
 0.000000E+00
-3.542649E-01
-1.255036E-01
-7.591268E-01
-1.578888E-01
-1.490359E+00
-6.526382E-01
-1.540691E+00
-1.589827E+00
-5.440226E-02
-2.959606E-03
 0.000000E+00
 0.000000E+00
-6.189472E-02
-3.830956E-03
-7.567228E-02
-5.726294E-03
-7.689532E-01
-5.597372E-01
-1.828089E+00
-1.178438E+00
-3.196058E-01
-1.021479E-01
-4.014117E-02
-1.611314E-03
 0.000000E+00
 0.000000E+00
 0.000000E+00
 0.000000E+00
 0.000000E+00
 0.000000E+00
+8.606814E-01
+3.885885E-01
 0.000000E+00
 0.000000E+00
+4.424723E-02
+1.957817E-03
+1.112423E+00
+3.630655E-01
 0.000000E+00
 0.000000E+00
-8.698490E-03
-7.566372E-05
-1.946395E-01
-3.788452E-02
-1.906165E-01
-3.633465E-02
-3.552583E-01
-1.262085E-01
+6.143175E-01
+2.311795E-01
+2.146999E+00
+1.246449E+00
+1.396916E+00
+6.527420E-01
 0.000000E+00
 0.000000E+00
 0.000000E+00
 0.000000E+00
-1.494849E-01
-2.234575E-02
-2.664202E-01
-4.919614E-02
-1.811990E-01
-1.648042E-02
-3.306677E-01
-4.503538E-02
 0.000000E+00
 0.000000E+00
 0.000000E+00
@@ -247,164 +179,126 @@ tallies:
 0.000000E+00
 0.000000E+00
 0.000000E+00
-1.098498E-01
-1.206698E-02
-3.003988E-01
-5.912935E-02
-4.004197E-02
-1.603360E-03
-1.723086E-01
-2.969025E-02
-5.732049E-01
-1.706819E-01
+7.881838E-01
+2.327065E-01
+8.250109E-02
+6.157644E-03
 0.000000E+00
 0.000000E+00
+1.773149E-01
+3.144058E-02
+3.738193E-01
+1.397409E-01
+1.956153E-02
+3.826533E-04
+5.895025E-01
+2.865079E-01
+3.233835E+00
+3.339471E+00
+5.261477E-01
+1.409611E-01
 0.000000E+00
 0.000000E+00
-4.772221E-02
-2.277409E-03
-1.276581E-02
-9.445893E-05
-1.376985E+00
-7.123627E-01
-1.178753E-01
-1.389459E-02
-8.491532E-03
-7.210611E-05
 0.000000E+00
 0.000000E+00
 0.000000E+00
 0.000000E+00
 0.000000E+00
 0.000000E+00
-2.731512E-02
-7.461160E-04
-6.779892E-01
-2.186291E-01
-5.697599E-01
-7.959617E-02
-9.052003E-01
-3.786880E-01
-3.159535E+00
-3.140970E+00
-1.224527E+00
-5.350853E-01
-3.235360E-02
-1.046755E-03
 0.000000E+00
 0.000000E+00
 0.000000E+00
 0.000000E+00
 0.000000E+00
 0.000000E+00
+1.865345E-01
+3.479511E-02
+1.195972E+00
+8.390317E-01
+2.571597E+00
+2.350836E+00
+1.293733E+00
+5.061913E-01
+1.134405E+00
+4.566981E-01
+8.925927E-01
+3.792322E-01
+1.676313E-02
+2.810025E-04
+9.544809E-04
+9.110338E-07
+3.520981E-02
+1.239730E-03
 0.000000E+00
 0.000000E+00
-1.672477E+00
-9.440205E-01
-3.266940E-01
-3.903995E-02
-2.235034E-01
-4.995377E-02
 0.000000E+00
 0.000000E+00
 0.000000E+00
 0.000000E+00
 0.000000E+00
 0.000000E+00
-2.445619E-01
-5.981054E-02
-3.903252E+00
-4.142220E+00
-3.083643E+00
-2.455174E+00
-2.327485E+00
-1.521153E+00
-4.524779E+00
-5.128964E+00
-2.642957E+00
-1.749446E+00
-6.672196E-01
-1.466897E-01
 0.000000E+00
 0.000000E+00
 0.000000E+00
 0.000000E+00
-1.436233E+00
-7.064084E-01
-2.503539E-01
-3.446661E-02
-1.243228E+00
-5.270951E-01
-1.757842E+00
-1.650928E+00
 0.000000E+00
 0.000000E+00
+1.470517E-01
+1.195363E-02
+7.176972E-01
+1.399245E-01
+1.233228E+00
+5.590277E-01
+2.039428E+00
+1.383199E+00
+1.570738E+00
+5.528827E-01
+3.006370E+00
+2.136395E+00
+1.301378E+00
+4.552334E-01
+2.275348E+00
+2.462313E+00
+1.448522E+00
+7.714327E-01
+3.546630E-01
+7.240100E-02
 0.000000E+00
 0.000000E+00
 0.000000E+00
 0.000000E+00
 0.000000E+00
 0.000000E+00
-3.373481E-02
-1.138038E-03
-1.576056E+00
-8.056151E-01
-2.472463E+00
-1.777735E+00
-2.600370E+00
-1.558785E+00
-3.211207E+00
-2.336780E+00
-4.244585E+00
-4.441197E+00
-9.143818E-01
-3.342290E-01
-6.047344E-01
-1.855723E-01
 0.000000E+00
 0.000000E+00
-1.445694E+00
-7.502232E-01
-9.924741E-01
-3.103617E-01
-8.416234E-01
-2.880734E-01
-2.704968E-03
-7.316851E-06
 0.000000E+00
 0.000000E+00
 0.000000E+00
 0.000000E+00
 0.000000E+00
 0.000000E+00
+3.419128E-01
+1.169043E-01
+2.766416E+00
+1.963796E+00
+1.282388E+00
+4.365490E-01
+1.237739E-01
+8.777483E-03
+8.004318E-01
+1.708734E-01
+1.709340E+00
+9.725729E-01
+1.585826E+00
+7.414871E-01
+1.850264E+00
+1.136801E+00
+7.743896E-01
+1.773560E-01
 0.000000E+00
 0.000000E+00
-6.002436E-02
-3.602924E-03
-1.013513E+00
-5.456914E-01
-2.076278E-01
-1.641673E-02
-5.752709E-01
-2.287103E-01
-1.805756E-01
-3.011038E-02
-1.005981E+00
-4.597219E-01
-8.803659E-01
-3.771074E-01
-5.308645E-01
-1.409090E-01
-1.763245E-01
-3.109031E-02
 0.000000E+00
 0.000000E+00
-7.808960E-01
-3.263354E-01
-2.817207E+00
-2.435641E+00
-9.425784E-03
-8.884540E-05
 0.000000E+00
 0.000000E+00
 0.000000E+00
@@ -419,28 +313,48 @@ tallies:
 0.000000E+00
 0.000000E+00
 0.000000E+00
+5.735232E-01
+1.142807E-01
+2.731570E-01
+7.461474E-02
+4.341880E-01
+7.516877E-02
+7.471215E-01
+2.373995E-01
+1.927757E-01
+2.528469E-02
+1.531168E-02
+2.344476E-04
+1.859549E-01
+3.457921E-02
+8.129822E-02
+6.609401E-03
+1.792745E-02
+3.213936E-04
+4.546455E-02
+2.067026E-03
+3.025507E-01
+9.153690E-02
 0.000000E+00
 0.000000E+00
 0.000000E+00
 0.000000E+00
 0.000000E+00
 0.000000E+00
-5.603993E-01
-3.140474E-01
-4.503159E-03
-2.027845E-05
 0.000000E+00
 0.000000E+00
 0.000000E+00
 0.000000E+00
-5.214062E-01
-1.104261E-01
-1.919041E+00
-1.340505E+00
-1.041183E-01
-7.450359E-03
 0.000000E+00
 0.000000E+00
+9.831689E-02
+6.595769E-03
+2.074817E-01
+3.027131E-02
+2.286640E+00
+1.465241E+00
+8.377380E-01
+2.385147E-01
 0.000000E+00
 0.000000E+00
 0.000000E+00
@@ -453,32 +367,48 @@ tallies:
 0.000000E+00
 0.000000E+00
 0.000000E+00
+1.833642E-01
+1.713921E-02
 0.000000E+00
 0.000000E+00
 0.000000E+00
 0.000000E+00
+1.057442E-01
+1.118183E-02
 0.000000E+00
 0.000000E+00
 0.000000E+00
 0.000000E+00
 0.000000E+00
 0.000000E+00
+8.868035E-02
+7.864204E-03
 0.000000E+00
 0.000000E+00
+2.391633E-01
+5.719907E-02
+6.311445E-01
+2.098576E-01
 0.000000E+00
 0.000000E+00
-2.751492E-02
-7.570709E-04
-9.924942E-01
-3.286807E-01
-8.562228E-03
-7.331174E-05
 0.000000E+00
 0.000000E+00
 0.000000E+00
 0.000000E+00
 0.000000E+00
 0.000000E+00
+6.910990E-01
+3.719874E-01
+1.392740E+00
+6.972200E-01
+1.887591E+00
+8.004711E-01
+5.815007E-01
+1.610695E-01
+6.034283E-01
+1.821207E-01
+9.561018E-01
+4.904799E-01
 0.000000E+00
 0.000000E+00
 0.000000E+00
@@ -489,38 +419,42 @@ tallies:
 0.000000E+00
 0.000000E+00
 0.000000E+00
+1.887054E-02
+3.560974E-04
+2.051066E-01
+4.206871E-02
 0.000000E+00
 0.000000E+00
 0.000000E+00
 0.000000E+00
 0.000000E+00
 0.000000E+00
+2.977202E-01
+6.763321E-02
+1.730167E+00
+1.071129E+00
+5.636239E+00
+8.270732E+00
+2.959768E+00
+2.049829E+00
+2.335204E+00
+1.554951E+00
+1.440809E-01
+2.075932E-02
 0.000000E+00
 0.000000E+00
 0.000000E+00
 0.000000E+00
+2.453404E-01
+3.089846E-02
+1.025745E-02
+1.052153E-04
 0.000000E+00
 0.000000E+00
-0.000000E+00
-0.000000E+00
-3.827320E-01
-1.038939E-01
-1.182298E-02
-1.397827E-04
-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
+5.075886E-01
+1.618592E-01
+1.966528E+00
+1.132980E+00
 0.000000E+00
 0.000000E+00
 0.000000E+00
@@ -529,16 +463,50 @@ tallies:
 0.000000E+00
 0.000000E+00
 0.000000E+00
+8.394913E-01
+3.917963E-01
+2.606787E+00
+2.572860E+00
+3.463994E+00
+3.996631E+00
+3.154757E+00
+2.350837E+00
+7.761361E-01
+2.122420E-01
+1.627857E-01
+2.649918E-02
 0.000000E+00
 0.000000E+00
 0.000000E+00
 0.000000E+00
 0.000000E+00
 0.000000E+00
+2.871640E-02
+8.246316E-04
+1.186222E-02
+1.407121E-04
+9.614158E-01
+2.420734E-01
+2.012901E+00
+1.654543E+00
 0.000000E+00
 0.000000E+00
 0.000000E+00
 0.000000E+00
+2.779386E-02
+7.724987E-04
+8.144920E-01
+3.841060E-01
+1.728176E+00
+8.127678E-01
+4.873377E+00
+4.973628E+00
+5.563256E+00
+1.027709E+01
+4.278331E+00
+4.022361E+00
+4.868256E-01
+1.283110E-01
 0.000000E+00
 0.000000E+00
 0.000000E+00
@@ -547,10 +515,34 @@ tallies:
 0.000000E+00
 0.000000E+00
 0.000000E+00
+2.917662E-01
+7.251729E-02
+2.514482E-01
+6.088181E-02
+2.430618E-01
+2.898423E-02
+1.285786E-01
+1.493176E-02
 0.000000E+00
 0.000000E+00
 0.000000E+00
 0.000000E+00
+1.199472E-01
+1.438733E-02
+2.015379E+00
+1.215665E+00
+1.952498E+00
+1.474848E+00
+2.411257E+00
+1.777383E+00
+1.568624E+00
+9.085508E-01
+7.334432E-01
+1.980586E-01
+1.693680E-01
+1.751072E-02
+2.226778E-01
+4.958542E-02
 0.000000E+00
 0.000000E+00
 0.000000E+00
@@ -571,6 +563,14 @@ tallies:
 0.000000E+00
 0.000000E+00
 0.000000E+00
+2.652854E-01
+4.012687E-02
+1.548856E+00
+1.402825E+00
+8.432624E-01
+2.432601E-01
+6.387866E-01
+4.080483E-01
 0.000000E+00
 0.000000E+00
 0.000000E+00

tests/test_filter_universe/results_true.dat

@@ -1,11 +1,11 @@
 k-combined:
-9.804685E-01 4.718832E-02
+9.377383E-01 6.215432E-02
 tallies:
-3.602063E+01
-2.626787E+02
-4.687897E+00
-4.507044E+00
-7.402502E+01
-1.111886E+03
-8.538118E+00
-1.472178E+01
+7.634207E+01
+1.184751E+03
+9.284889E+00
+1.765554E+01
+3.312780E+01
+2.252661E+02
+3.623849E+00
+2.753016E+00

tests/test_lattice/results_true.dat

@@ -1,2 +1,2 @@
 k-combined:
-9.152533E-01 6.208235E-02
+1.094267E+00 7.838238E-02

tests/test_lattice_multiple/results_true.dat

@@ -1,2 +1,2 @@
 k-combined:
-9.804685E-01 4.718832E-02
+9.377383E-01 6.215432E-02

tests/test_natural_element/results_true.dat

@@ -1,2 +1,2 @@
 k-combined:
-9.691263E-01 4.173669E-02
+1.012443E+00 2.162448E-02

tests/test_output/results_true.dat

@@ -1,2 +1,2 @@
 k-combined:
-3.040876E-01 8.800801E-04
+3.011353E-01 2.854556E-03

tests/test_particle_restart/results.py

@@ -10,8 +10,7 @@ import particle_restart as pr
 if len(sys.argv) > 1:
     p = pr.Particle(sys.argv[1])
 else:
-    p = pr.Particle('particle_10_903.binary')
-
+    p = pr.Particle('particle_10_394.binary')
 
 # set up output string
 outstr = ''

tests/test_particle_restart/results_true.dat

@@ -3,12 +3,12 @@ current batch:
 current gen:
 1.000000E+00
 particle id:
-9.030000E+02
+3.940000E+02
 particle weight:
 1.000000E+00
 particle energy:
-4.056571E+00
+2.154640E+00
 particle xyz:
--1.593841E+01 2.403837E+01 4.892880E+01
+1.320548E+01 -2.677009E+01 -6.617908E+01
 particle uvw:
--1.776148E-01 9.746703E-01 1.359071E-01
+3.461509E-01 -8.847164E-01 -3.121801E-01

tests/test_particle_restart/test_particle_restart.py

@@ -23,17 +23,13 @@ def test_run():
     assert stderr != '' 
 
 def test_created_restart():
-    particle = glob.glob(pwd + '/particle_10_903.*')
-    assert len(particle) == 1
-    assert particle[0].endswith('binary') or \
-           particle[0].endswith('h5')
-    particle = glob.glob(pwd + '/particle_8_777.*')
+    particle = glob.glob(pwd + '/particle_10_394.*')
     assert len(particle) == 1
     assert particle[0].endswith('binary') or \
            particle[0].endswith('h5')
 
 def test_results():
-    particle = glob.glob(pwd + '/particle_10_903.*')
+    particle = glob.glob(pwd + '/particle_10_394.*')
     call(['python', 'results.py', particle[0]])
     compare = filecmp.cmp('results_test.dat', 'results_true.dat')
     if not compare:
@@ -41,7 +37,7 @@ def test_results():
     assert compare
 
 def test_run_restart():
-    particle = glob.glob(pwd + '/particle_10_903.*')
+    particle = glob.glob(pwd + '/particle_10_394.*')
     proc = Popen([pwd + '/../../src/openmc -r ' + particle[0]],
            stderr=PIPE, stdout=PIPE, shell=True)
     stdout, stderr = proc.communicate()

tests/test_ptables_off/results_true.dat

@@ -1,2 +1,2 @@
 k-combined:
-3.036095E-01 2.792706E-03
+3.041924E-01 5.001790E-03

tests/test_reflective_cone/results_true.dat

@@ -1,2 +1,2 @@
 k-combined:
-2.284236E+00 6.860333E-03
+2.260147E+00 6.707086E-03

tests/test_reflective_cylinder/results_true.dat

@@ -1,2 +1,2 @@
 k-combined:
-2.272304E+00 3.400487E-03
+2.280622E+00 6.248353E-03

tests/test_reflective_plane/results_true.dat

@@ -1,2 +1,2 @@
 k-combined:
-2.269674E+00 8.962213E-03
+2.275150E+00 4.574091E-03

tests/test_reflective_sphere/results_true.dat

@@ -1,2 +1,2 @@
 k-combined:
-2.293686E+00 5.328646E-03
+2.274193E+00 1.434689E-02

tests/test_rotation/results_true.dat

@@ -1,2 +1,2 @@
 k-combined:
-3.040876E-01 8.800801E-04
+3.011353E-01 2.854556E-03

tests/test_salphabeta/results_true.dat

@@ -1,2 +1,2 @@
 k-combined:
-8.399772E-01 2.336172E-02
+8.375966E-01 1.499621E-02

tests/test_salphabeta_multiple/results_true.dat

@@ -1,2 +1,2 @@
 k-combined:
-1.018338E+00 4.898906E-02
+1.013747E+00 3.067630E-02

tests/test_score_MT/results_true.dat

@@ -1,5 +1,5 @@
 k-combined:
-9.804685E-01 4.718832E-02
+9.377383E-01 6.215432E-02
 tallies:
 0.000000E+00
 0.000000E+00
@@ -9,27 +9,27 @@ tallies:
 0.000000E+00
 0.000000E+00
 0.000000E+00
-9.989136E-06
-5.497721E-11
-9.989136E-06
-5.497721E-11
-2.108722E-01
-9.172684E-03
-7.349454E-01
-1.113335E-01
+6.221972E-03
+1.807176E-05
+6.221972E-03
+1.807176E-05
+4.414188E-01
+3.925779E-02
+1.504095E+00
+4.624014E-01
+1.631489E-04
+1.781398E-08
+1.631489E-04
+1.781398E-08
+3.411837E-02
+2.387070E-04
+2.451779E-02
+1.515906E-04
 0.000000E+00
 0.000000E+00
 0.000000E+00
 0.000000E+00
-1.386040E-02
-4.268820E-05
-1.123359E-02
-2.708591E-05
-0.000000E+00
-0.000000E+00
-0.000000E+00
-0.000000E+00
-1.666209E-05
-7.390812E-11
-4.302898E-02
-3.706945E-04
+7.025342E-05
+1.400259E-09
+8.782799E-02
+1.571999E-03

tests/test_score_absorption/results_true.dat

@@ -1,20 +1,20 @@
 k-combined:
-9.804685E-01 4.718832E-02
+9.377383E-01 6.215432E-02
 tally 1:
 0.000000E+00
 0.000000E+00
-1.384040E+00
-3.879557E-01
-1.124864E-02
-2.714543E-05
-2.058565E-01
-8.483549E-03
+2.851055E+00
+1.673269E+00
+2.453376E-02
+1.515785E-04
+4.221076E-01
+3.628443E-02
 tally 2:
 0.000000E+00
 0.000000E+00
-1.290000E+00
-3.493000E-01
-1.000000E-02
-1.000000E-04
-2.900000E-01
-1.890000E-02
+2.850000E+00
+1.633500E+00
+2.000000E-02
+2.000000E-04
+4.200000E-01
+4.040000E-02

tests/test_score_events/results_true.dat

@@ -1,12 +1,12 @@
 k-combined:
-9.804685E-01 4.718832E-02
+9.377383E-01 6.215432E-02
 tally 1:
-3.211000E+01
-2.097181E+02
-7.339000E+01
-1.096369E+03
+7.099000E+01
+1.023516E+03
+3.311000E+01
+2.264681E+02
 tally 2:
-8.350000E+00
-1.414870E+01
-1.958000E+01
-7.770300E+01
+1.906000E+01
+7.366360E+01
+8.980000E+00
+1.681740E+01

tests/test_score_fission/results_true.dat

@@ -1,20 +1,20 @@
 k-combined:
-9.804685E-01 4.718832E-02
+9.377383E-01 6.215432E-02
 tally 1:
-6.477697E-01
-8.434925E-02
+1.342073E+00
+3.770050E-01
 0.000000E+00
 0.000000E+00
 0.000000E+00
 0.000000E+00
-1.280442E+00
-3.352103E-01
+5.892595E-01
+7.043773E-02
 tally 2:
+1.850000E+00
+6.867000E-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
+8.500000E-01
+1.467000E-01

tests/test_score_flux/results_true.dat

@@ -1,15 +1,15 @@
 k-combined:
-9.804685E-01 4.718832E-02
+9.377383E-01 6.215432E-02
 tallies:
-1.926123E+01
-7.554613E+01
-6.736529E+00
-9.366731E+00
-3.186042E+01
-2.084110E+02
-4.430984E+01
-4.014512E+02
-1.480520E+01
-4.465617E+01
-7.213984E+01
-1.064079E+03
+4.183911E+01
+3.555930E+02
+1.463598E+01
+4.341569E+01
+6.976992E+01
+9.887738E+02
+1.991438E+01
+8.242734E+01
+6.600084E+00
+8.946977E+00
+3.257985E+01
+2.167538E+02

tests/test_score_kappafission/results_true.dat

@@ -1,11 +1,11 @@
 k-combined:
-9.804685E-01 4.718832E-02
+9.377383E-01 6.215432E-02
 tallies:
-1.269408E+02
-3.239282E+03
+2.629615E+02
+1.447344E+04
 0.000000E+00
 0.000000E+00
 0.000000E+00
 0.000000E+00
-2.510502E+02
-1.288566E+04
+1.154602E+02
+2.703980E+03

tests/test_score_nufission/results_true.dat

@@ -1,11 +1,11 @@
 k-combined:
-9.804685E-01 4.718832E-02
+9.377383E-01 6.215432E-02
 tallies:
-1.702637E+00
-5.827094E-01
+3.527328E+00
+2.602553E+00
 0.000000E+00
 0.000000E+00
 0.000000E+00
 0.000000E+00
-3.368091E+00
-2.320234E+00
+1.545290E+00
+4.842245E-01

tests/test_score_nuscatter/results_true.dat

@@ -1,11 +1,11 @@
 k-combined:
-9.804685E-01 4.718832E-02
+9.377383E-01 6.215432E-02
 tallies:
 0.000000E+00
 0.000000E+00
-7.060000E+00
-1.007900E+01
-2.170000E+00
-1.035500E+00
-2.662000E+01
-1.441790E+02
+1.630000E+01
+5.404060E+01
+4.370000E+00
+3.872700E+00
+5.635000E+01
+6.461683E+02

tests/test_score_scatter/results_true.dat

@@ -1,11 +1,11 @@
 k-combined:
-9.804685E-01 4.718832E-02
+9.377383E-01 6.215432E-02
 tallies:
 0.000000E+00
 0.000000E+00
-7.398337E+00
-1.105882E+01
-1.833574E+00
-6.944349E-01
-2.632075E+01
-1.401586E+02
+1.597181E+01
+5.176958E+01
+4.011386E+00
+3.268489E+00
+5.573125E+01
+6.318277E+02

tests/test_score_scatter_n/results_true.dat

@@ -1,33 +1,33 @@
 k-combined:
-9.804685E-01 4.718832E-02
+9.377383E-01 6.215432E-02
 tallies:
-7.060000E+00
-1.007900E+01
-5.762850E-01
-9.057735E-02
-1.639331E-01
-7.108972E-03
-1.081274E-01
-1.738566E-02
--5.518860E-02
-1.170613E-02
-2.170000E+00
-1.035500E+00
-1.562769E-01
-1.347659E-02
-7.161707E-02
-1.004427E-02
--4.113472E-02
-4.919292E-03
-1.474041E-03
-3.042069E-03
-2.662000E+01
-1.441790E+02
-1.317580E+01
-3.562860E+01
-4.476930E+00
-4.135632E+00
-5.339990E-02
-1.603587E-02
--6.893336E-01
-1.368530E-01
+1.629000E+01
+5.396710E+01
+2.083139E+00
+9.274711E-01
+7.581526E-01
+1.372357E-01
+5.788404E-01
+8.474398E-02
+2.267322E-01
+2.004576E-02
+4.370000E+00
+3.872700E+00
+4.587321E-01
+8.870902E-02
+1.656970E-01
+9.031570E-03
+1.058959E-01
+5.107516E-03
+2.954694E-02
+4.346647E-03
+5.635000E+01
+6.461683E+02
+2.838722E+01
+1.643341E+02
+1.048196E+01
+2.267831E+01
+9.339653E-01
+3.810572E-01
+-1.140156E+00
+3.438818E-01

tests/test_score_scatter_pn/results_true.dat

@@ -1,24 +1,24 @@
 k-combined:
-9.804685E-01 4.718832E-02
+9.377383E-01 6.215432E-02
 tally 1:
-7.060000E+00
-1.007900E+01
-5.762850E-01
-9.057735E-02
-1.639331E-01
-7.108972E-03
-1.081274E-01
-1.738566E-02
--5.518860E-02
-1.170613E-02
+1.629000E+01
+5.396710E+01
+2.083139E+00
+9.274711E-01
+7.581526E-01
+1.372357E-01
+5.788404E-01
+8.474398E-02
+2.267322E-01
+2.004576E-02
 tally 2:
-7.060000E+00
-1.007900E+01
-5.762850E-01
-9.057735E-02
-1.639331E-01
-7.108972E-03
-1.081274E-01
-1.738566E-02
--5.518860E-02
-1.170613E-02
+1.629000E+01
+5.396710E+01
+2.083139E+00
+9.274711E-01
+7.581526E-01
+1.372357E-01
+5.788404E-01
+8.474398E-02
+2.267322E-01
+2.004576E-02

tests/test_score_total/results_true.dat

@@ -1,11 +1,11 @@
 k-combined:
-9.804685E-01 4.718832E-02
+9.377383E-01 6.215432E-02
 tallies:
 0.000000E+00
 0.000000E+00
-8.782377E+00
-1.555795E+01
-1.844823E+00
-7.029768E-01
-2.652660E+01
-1.423342E+02
+1.882286E+01
+7.203128E+01
+4.035920E+00
+3.309607E+00
+5.615336E+01
+6.414295E+02

tests/test_seed/results_true.dat

@@ -1,2 +1,2 @@
 k-combined:
-3.016555E-01 2.293910E-03
+2.964170E-01 3.478269E-03

tests/test_source_angle_mono/results_true.dat

@@ -1,2 +1,2 @@
 k-combined:
-2.852989E-01 2.631808E-02
+3.029212E-01 3.150748E-03

tests/test_source_energy_maxwell/results_true.dat

@@ -1,2 +1,2 @@
 k-combined:
-2.993466E-01 3.531446E-03
+2.981621E-01 1.215672E-03

tests/test_source_energy_mono/results_true.dat

@@ -1,2 +1,2 @@
 k-combined:
-2.990367E-01 2.555603E-03
+3.054262E-01 2.425992E-03

tests/test_source_point/results_true.dat

@@ -1,2 +1,2 @@
 k-combined:
-2.943736E-01 6.595617E-03
+2.913632E-01 3.559140E-03

tests/test_statepoint_batch/results_true.dat

@@ -1,2 +1,2 @@
 k-combined:
-3.030339E-01 5.090325E-04
+3.019401E-01 4.235654E-03

tests/test_statepoint_interval/results_true.dat

@@ -1,2 +1,2 @@
 k-combined:
-3.040876E-01 8.800801E-04
+3.011353E-01 2.854556E-03

tests/test_statepoint_sourcesep/results_true.dat

@@ -1,2 +1,2 @@
 k-combined:
-3.040876E-01 8.800801E-04
+3.011353E-01 2.854556E-03

tests/test_survival_biasing/results_true.dat

@@ -1,2 +1,2 @@
 k-combined:
-9.688077E-01 6.981246E-02
+9.908896E-01 4.632584E-03

tests/test_tally_assumesep/results_true.dat

@@ -1,11 +1,11 @@
 k-combined:
-9.804685E-01 4.718832E-02
+9.377383E-01 6.215432E-02
 tally 1:
-8.782377E+00
-1.555795E+01
+1.882286E+01
+7.203128E+01
 tally 2:
-1.844823E+00
-7.029768E-01
+4.035920E+00
+3.309607E+00
 tally 3:
-1.844823E+00
-7.029768E-01
+4.035920E+00
+3.309607E+00

tests/test_trace/results_true.dat

@@ -1,2 +1,2 @@
 k-combined:
-3.040876E-01 8.800801E-04
+3.011353E-01 2.854556E-03

tests/test_translation/results_true.dat

@@ -1,2 +1,2 @@
 k-combined:
-3.040876E-01 8.800801E-04
+3.011353E-01 2.854556E-03

tests/test_uniform_fs/results_true.dat

@@ -1,2 +1,2 @@
 k-combined:
-3.603723E-01 4.588585E-03
+3.613416E-01 7.445252E-03

tests/test_universe/results_true.dat

@@ -1,2 +1,2 @@
 k-combined:
-3.040876E-01 8.800801E-04
+3.011353E-01 2.854556E-03

tests/test_void/results_true.dat

@@ -1,2 +1,2 @@
 k-combined:
-1.076665E+00 8.436762E-02
+1.010313E+00 3.162080E-02