Merge branch 'develop' into xml

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

@@ -752,7 +752,7 @@ contains
     else
       ! count number of source sites in each ufs mesh cell
       call count_bank_sites(ufs_mesh, source_bank, source_frac, &
-           sites_outside=sites_outside)
+           sites_outside=sites_outside, size_bank=work)
 
       ! Check for sites outside of the mesh
       if (master .and. sites_outside) then

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/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
 
@@ -432,22 +435,22 @@ contains
     pair_list => universe_dict % keys()
     current => pair_list
     do while (associated(current))
-      ! find index of universe in universes array
+      ! Find index of universe in universes array
       i_univ = current % value
       univ => universes(i_univ)
       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
+      ! Move to next universe
       next => current % next
       deallocate(current)
       current => next
@@ -462,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
 
@@ -129,6 +130,7 @@ contains
     this % n_bank        = 0
     this % wgt_bank      = ZERO
     this % n_collision   = 0
+    this % fission       = .false.
 
     ! Set up base level coordinates
     allocate(this % coord0)

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:
-0.30408759 0.00088008
+0.30113528 0.00285456

tests/test_confidence_intervals/results_true.dat

@@ -1,5 +1,5 @@
 k-combined:
-0.29432037 0.01265543
+0.29371031 0.00739160
 tallies:
-65.39238423
-539.83246478
+62.67770579
+492.80295648

tests/test_density_atombcm/results_true.dat

@@ -1,2 +1,2 @@
 k-combined:
-1.75925969 0.02728159
+1.73961429 0.01281892

tests/test_density_atomcm3/results_true.dat

@@ -1,2 +1,2 @@
 k-combined:
-1.12562497 0.01475256
+1.08146351 0.02283652

tests/test_density_kgm3/results_true.dat

@@ -1,2 +1,2 @@
 k-combined:
-0.77607961 0.02228188
+0.80588796 0.00512148

tests/test_density_sum/results_true.dat

@@ -1,2 +1,2 @@
 k-combined:
-0.32600067 0.01356562
+0.31665691 0.00636741

tests/test_eigenvalue_genperbatch/results_true.dat

@@ -1,2 +1,2 @@
 k-combined:
-0.28402818 0.02273104
+0.30043746 0.00230870

tests/test_eigenvalue_no_inactive/results_true.dat

@@ -1,2 +1,2 @@
 k-combined:
-0.30896828 0.01118024
+0.31185079 0.00676453

tests/test_energy_grid/results_true.dat

@@ -1,2 +1,2 @@
 k-combined:
-0.31522753 0.00509959
+0.32430182 0.00096736

tests/test_entropy/results_true.dat

@@ -1,13 +1,13 @@
 k-combined:
-0.30408759 0.00088008
+0.30113528 0.00285456
 entropy:
-6.22453002
-7.34335892
-7.76336209
-7.76885034
-7.78607726
-7.72581193
-7.76121795
-7.84101403
-7.92560054
-7.86038189
+7.11451332
+8.05560155
+8.23397277
+8.23557155
+8.28448354
+8.28984841
+8.42007985
+8.27943150
+8.29999736
+8.36396839

tests/test_filter_cell/results_true.dat

@@ -1,11 +1,11 @@
 k-combined:
-0.98046852 0.04718832
+0.93773827 0.06215432
 tallies:
 0.00000000
 0.00000000
-8.78237650
-15.55794571
-1.84482312
-0.70297682
-26.52660205
-142.33423161
+18.82286226
+72.03127513
+4.03592017
+3.30960729
+56.15335982
+641.42946960

tests/test_filter_cellborn/results_true.dat

@@ -1,10 +1,10 @@
 k-combined:
-0.98046852 0.04718832
+0.93773827 0.06215432
 tallies:
 0.00000000
 0.00000000
-43.50660698
-385.10698472
+91.12132788
+1691.91742599
 0.00000000
 0.00000000
 0.00000000

tests/test_filter_energy/results_true.dat

@@ -1,11 +1,11 @@
 k-combined:
-0.98046852 0.04718832
+0.93773827 0.06215432
 tallies:
-25.67612478
-135.06234071
-43.69328739
-384.31331185
-53.66385216
-577.08087569
-9.12440078
-17.45738591
+32.64739927
+215.66831301
+43.90484994
+388.17393630
+50.74294368
+516.93670081
+10.05233017
+20.30524675

tests/test_filter_energyout/results_true.dat

@@ -1,11 +1,11 @@
 k-combined:
-0.98046852 0.04718832
+0.93773827 0.06215432
 tallies:
-25.59000000
-133.54390000
-42.96000000
-370.54460000
-51.41000000
-529.20190000
-6.14000000
-7.84340000
+32.68000000
+216.39020000
+43.50000000
+380.24020000
+51.33000000
+528.74330000
+6.62000000
+8.82700000

tests/test_filter_group_transfer/results_true.dat

@@ -1,12 +1,54 @@
 k-combined:
-0.98046852 0.04718832
+0.93773827 0.06215432
 tallies:
-22.97000000
-108.08230000
+30.03000000
+183.35510000
 0.00000000
 0.00000000
-0.06000000
-0.00140000
+0.04000000
+0.00040000
+0.00000000
+0.00000000
+0.00000000
+0.00000000
+0.77446136
+0.12571254
+0.00000000
+0.00000000
+2.15557882
+0.96830054
+2.65000000
+1.41390000
+0.00000000
+0.00000000
+38.97000000
+305.38850000
+0.00000000
+0.00000000
+0.00000000
+0.00000000
+0.27919994
+0.01768291
+0.00000000
+0.00000000
+0.67147652
+0.09169556
+0.00000000
+0.00000000
+0.00000000
+0.00000000
+4.49000000
+4.03650000
+0.00000000
+0.00000000
+47.94000000
+461.47120000
+0.01733787
+0.00030060
+0.00000000
+0.00000000
+0.08687216
+0.00220468
 0.00000000
 0.00000000
 0.00000000
@@ -15,53 +57,11 @@ tallies:
 0.00000000
 0.00000000
 0.00000000
-0.00000000
-0.00000000
-2.62000000
-1.37720000
-0.00000000
-0.00000000
-38.33000000
-295.26630000
-0.00000000
-0.00000000
-0.00000000
-0.00000000
-0.00000000
-0.00000000
-0.00000000
-0.00000000
-0.00000000
-0.00000000
-0.00000000
-0.00000000
-0.00000000
-0.00000000
-4.56000000
-4.15920000
-0.00000000
-0.00000000
-48.48000000
-470.68580000
-0.00000000
-0.00000000
-0.00000000
-0.00000000
-0.00000000
-0.00000000
-0.00000000
-0.00000000
-0.00000000
-0.00000000
-0.01000000
-0.00010000
-0.00000000
-0.00000000
-2.93000000
-1.78470000
-0.00000000
-0.00000000
-6.14000000
-7.84340000
-0.00000000
-0.00000000
+3.39000000
+2.31650000
+0.12897774
+0.00405715
+6.62000000
+8.82700000
+0.31877323
+0.02168587

tests/test_filter_material/results_true.dat

@@ -1,11 +1,11 @@
 k-combined:
-0.98046852 0.04718832
+0.93773827 0.06215432
 tallies:
-28.88595756
-167.70454782
-6.68679307
-8.94919165
-35.19283765
-254.25938930
-60.96487727
-750.99609930
+27.75440762
+154.83131712
+6.47809111
+8.42933435
+66.33549411
+889.14780763
+28.94858797
+172.85306981

tests/test_filter_mesh_2d/results_true.dat

@@ -1,5 +1,5 @@
 k-combined:
-0.98046852 0.04718832
+0.93773827 0.06215432
 tallies:
 0.00000000
 0.00000000
@@ -15,20 +15,16 @@ tallies:
 0.00000000
 0.00000000
 0.00000000
-0.08588844
-0.00737682
-1.29395418
-0.61345354
-3.17605552
-2.84377280
-2.97221609
-2.28098649
-2.26795333
-1.83191774
 0.00000000
 0.00000000
 0.00000000
 0.00000000
+0.26439941
+0.06990705
+0.11892463
+0.01272422
+0.19500845
+0.03802830
 0.00000000
 0.00000000
 0.00000000
@@ -39,28 +35,10 @@ tallies:
 0.00000000
 0.00000000
 0.00000000
-0.21020517
-0.04418622
 0.00000000
 0.00000000
 0.00000000
 0.00000000
-0.75237153
-0.28460845
-0.12767750
-0.01563459
-1.09635635
-0.81124602
-1.31009450
-0.78424448
-4.48862660
-4.40176027
-2.61476684
-2.29263337
-2.73483247
-2.44147576
-0.00222491
-0.00000495
 0.00000000
 0.00000000
 0.00000000
@@ -71,28 +49,18 @@ tallies:
 0.00000000
 0.00000000
 0.00000000
-0.09474020
-0.00897571
-0.49862162
-0.24862352
 0.00000000
 0.00000000
+0.98124660
+0.35088826
+0.77463439
+0.14943562
+1.16735630
+0.57690208
+0.07011661
+0.00491634
 0.00000000
 0.00000000
-0.18606180
-0.03461899
-0.06427301
-0.00413102
-1.19911234
-0.45648739
-1.42142705
-0.53678749
-3.60239192
-2.89778626
-0.13297308
-0.01768184
-1.12151012
-0.32281932
 0.00000000
 0.00000000
 0.00000000
@@ -111,24 +79,20 @@ tallies:
 0.00000000
 0.00000000
 0.00000000
-0.00273377
-0.00000747
-0.87406271
-0.30888052
-0.39960895
-0.08005836
-2.30080722
-2.04968651
-1.66625586
-0.78412054
-0.26891589
-0.03246764
 0.00000000
 0.00000000
 0.00000000
 0.00000000
 0.00000000
 0.00000000
+1.84198648
+0.91453846
+3.30404834
+2.37055143
+2.22375313
+2.43270199
+1.19580203
+0.44688205
 0.00000000
 0.00000000
 0.00000000
@@ -143,34 +107,28 @@ tallies:
 0.00000000
 0.00000000
 0.00000000
-0.24152882
-0.05833617
-0.25632992
-0.03814006
-4.65349777
-5.94071891
-2.10515795
-1.52728004
-2.58079707
-1.55536111
-3.50569432
-2.61321114
-2.11589300
-2.23703372
+0.39681556
+0.15746259
+0.07654730
+0.00585949
 0.00000000
 0.00000000
 0.00000000
 0.00000000
 0.00000000
 0.00000000
-0.58991041
-0.34799429
+0.04503383
+0.00202805
+1.33189285
+0.44744817
+0.34702564
+0.09728546
+0.50201440
+0.07010055
+1.05709515
+0.34748565
 0.00000000
 0.00000000
-0.15104665
-0.02281509
-0.42889841
-0.18395384
 0.00000000
 0.00000000
 0.00000000
@@ -181,60 +139,34 @@ tallies:
 0.00000000
 0.00000000
 0.00000000
-0.35426490
-0.12550362
-0.75912683
-0.15788880
-1.49035861
-0.65263822
-1.54069090
-1.58982707
-0.05440226
-0.00295961
 0.00000000
 0.00000000
-0.06189472
-0.00383096
-0.07567228
-0.00572629
-0.76895320
-0.55973718
-1.82808885
-1.17843830
-0.31960577
-0.10214785
-0.04014117
-0.00161131
 0.00000000
 0.00000000
 0.00000000
 0.00000000
 0.00000000
 0.00000000
+0.86068136
+0.38858850
 0.00000000
 0.00000000
+0.04424723
+0.00195782
+1.11242271
+0.36306553
 0.00000000
 0.00000000
-0.00869849
-0.00007566
-0.19463946
-0.03788452
-0.19061650
-0.03633465
-0.35525829
-0.12620845
+0.61431746
+0.23117955
+2.14699871
+1.24644926
+1.39691597
+0.65274198
 0.00000000
 0.00000000
 0.00000000
 0.00000000
-0.14948493
-0.02234575
-0.26642025
-0.04919614
-0.18119903
-0.01648042
-0.33066766
-0.04503538
 0.00000000
 0.00000000
 0.00000000
@@ -247,164 +179,126 @@ tallies:
 0.00000000
 0.00000000
 0.00000000
-0.10984979
-0.01206698
-0.30039876
-0.05912935
-0.04004197
-0.00160336
-0.17230860
-0.02969025
-0.57320487
-0.17068193
+0.78818378
+0.23270646
+0.08250109
+0.00615764
 0.00000000
 0.00000000
+0.17731491
+0.03144058
+0.37381933
+0.13974089
+0.01956153
+0.00038265
+0.58950252
+0.28650785
+3.23383512
+3.33947077
+0.52614766
+0.14096109
 0.00000000
 0.00000000
-0.04772221
-0.00227741
-0.01276581
-0.00009446
-1.37698488
-0.71236268
-0.11787532
-0.01389459
-0.00849153
-0.00007211
 0.00000000
 0.00000000
 0.00000000
 0.00000000
 0.00000000
 0.00000000
-0.02731512
-0.00074612
-0.67798922
-0.21862908
-0.56975986
-0.07959617
-0.90520028
-0.37868800
-3.15953485
-3.14097026
-1.22452698
-0.53508531
-0.03235360
-0.00104676
 0.00000000
 0.00000000
 0.00000000
 0.00000000
 0.00000000
 0.00000000
+0.18653447
+0.03479511
+1.19597237
+0.83903168
+2.57159733
+2.35083567
+1.29373348
+0.50619129
+1.13440510
+0.45669811
+0.89259272
+0.37923215
+0.01676313
+0.00028100
+0.00095448
+0.00000091
+0.03520981
+0.00123973
 0.00000000
 0.00000000
-1.67247656
-0.94402049
-0.32669397
-0.03903995
-0.22350340
-0.04995377
 0.00000000
 0.00000000
 0.00000000
 0.00000000
 0.00000000
 0.00000000
-0.24456194
-0.05981054
-3.90325239
-4.14221991
-3.08364316
-2.45517354
-2.32748465
-1.52115323
-4.52477924
-5.12896423
-2.64295725
-1.74944646
-0.66721965
-0.14668973
 0.00000000
 0.00000000
 0.00000000
 0.00000000
-1.43623311
-0.70640842
-0.25035386
-0.03446661
-1.24322754
-0.52709506
-1.75784221
-1.65092830
 0.00000000
 0.00000000
+0.14705171
+0.01195363
+0.71769721
+0.13992449
+1.23322836
+0.55902765
+2.03942796
+1.38319911
+1.57073791
+0.55288265
+3.00636951
+2.13639477
+1.30137777
+0.45523341
+2.27534759
+2.46231270
+1.44852177
+0.77143271
+0.35466295
+0.07240100
 0.00000000
 0.00000000
 0.00000000
 0.00000000
 0.00000000
 0.00000000
-0.03373481
-0.00113804
-1.57605576
-0.80561508
-2.47246255
-1.77773457
-2.60036982
-1.55878535
-3.21120690
-2.33678026
-4.24458477
-4.44119713
-0.91438183
-0.33422901
-0.60473444
-0.18557226
 0.00000000
 0.00000000
-1.44569376
-0.75022322
-0.99247413
-0.31036171
-0.84162339
-0.28807337
-0.00270497
-0.00000732
 0.00000000
 0.00000000
 0.00000000
 0.00000000
 0.00000000
 0.00000000
+0.34191276
+0.11690434
+2.76641617
+1.96379596
+1.28238772
+0.43654899
+0.12377388
+0.00877748
+0.80043185
+0.17087345
+1.70933995
+0.97257289
+1.58582636
+0.74148714
+1.85026386
+1.13680144
+0.77438960
+0.17735603
 0.00000000
 0.00000000
-0.06002436
-0.00360292
-1.01351346
-0.54569143
-0.20762778
-0.01641673
-0.57527086
-0.22871026
-0.18057558
-0.03011038
-1.00598096
-0.45972185
-0.88036591
-0.37710745
-0.53086453
-0.14090904
-0.17632445
-0.03109031
 0.00000000
 0.00000000
-0.78089598
-0.32633537
-2.81720674
-2.43564074
-0.00942578
-0.00008885
 0.00000000
 0.00000000
 0.00000000
@@ -419,28 +313,48 @@ tallies:
 0.00000000
 0.00000000
 0.00000000
+0.57352317
+0.11428068
+0.27315699
+0.07461474
+0.43418803
+0.07516877
+0.74712153
+0.23739951
+0.19277573
+0.02528469
+0.01531168
+0.00023445
+0.18595487
+0.03457921
+0.08129822
+0.00660940
+0.01792745
+0.00032139
+0.04546455
+0.00206703
+0.30255066
+0.09153690
 0.00000000
 0.00000000
 0.00000000
 0.00000000
 0.00000000
 0.00000000
-0.56039932
-0.31404739
-0.00450316
-0.00002028
 0.00000000
 0.00000000
 0.00000000
 0.00000000
-0.52140618
-0.11042605
-1.91904108
-1.34050514
-0.10411834
-0.00745036
 0.00000000
 0.00000000
+0.09831689
+0.00659577
+0.20748166
+0.03027131
+2.28664040
+1.46524103
+0.83773796
+0.23851467
 0.00000000
 0.00000000
 0.00000000
@@ -453,32 +367,48 @@ tallies:
 0.00000000
 0.00000000
 0.00000000
+0.18336416
+0.01713921
 0.00000000
 0.00000000
 0.00000000
 0.00000000
+0.10574416
+0.01118183
 0.00000000
 0.00000000
 0.00000000
 0.00000000
 0.00000000
 0.00000000
+0.08868035
+0.00786420
 0.00000000
 0.00000000
+0.23916327
+0.05719907
+0.63114449
+0.20985760
 0.00000000
 0.00000000
-0.02751492
-0.00075707
-0.99249418
-0.32868074
-0.00856223
-0.00007331
 0.00000000
 0.00000000
 0.00000000
 0.00000000
 0.00000000
 0.00000000
+0.69109904
+0.37198741
+1.39273953
+0.69721999
+1.88759129
+0.80047114
+0.58150073
+0.16106948
+0.60342828
+0.18212074
+0.95610176
+0.49047988
 0.00000000
 0.00000000
 0.00000000
@@ -489,38 +419,42 @@ tallies:
 0.00000000
 0.00000000
 0.00000000
+0.01887054
+0.00035610
+0.20510659
+0.04206871
 0.00000000
 0.00000000
 0.00000000
 0.00000000
 0.00000000
 0.00000000
+0.29772019
+0.06763321
+1.73016726
+1.07112911
+5.63623913
+8.27073151
+2.95976824
+2.04982862
+2.33520433
+1.55495064
+0.14408095
+0.02075932
 0.00000000
 0.00000000
 0.00000000
 0.00000000
+0.24534043
+0.03089846
+0.01025745
+0.00010522
 0.00000000
 0.00000000
-0.00000000
-0.00000000
-0.38273195
-0.10389392
-0.01182298
-0.00013978
-0.00000000
-0.00000000
-0.00000000
-0.00000000
-0.00000000
-0.00000000
-0.00000000
-0.00000000
-0.00000000
-0.00000000
-0.00000000
-0.00000000
-0.00000000
-0.00000000
+0.50758858
+0.16185918
+1.96652801
+1.13297980
 0.00000000
 0.00000000
 0.00000000
@@ -529,16 +463,50 @@ tallies:
 0.00000000
 0.00000000
 0.00000000
+0.83949134
+0.39179629
+2.60678734
+2.57285990
+3.46399412
+3.99663146
+3.15475687
+2.35083739
+0.77613605
+0.21224201
+0.16278567
+0.02649918
 0.00000000
 0.00000000
 0.00000000
 0.00000000
 0.00000000
 0.00000000
+0.02871640
+0.00082463
+0.01186222
+0.00014071
+0.96141582
+0.24207337
+2.01290068
+1.65454316
 0.00000000
 0.00000000
 0.00000000
 0.00000000
+0.02779386
+0.00077250
+0.81449198
+0.38410603
+1.72817607
+0.81276778
+4.87337670
+4.97362776
+5.56325619
+10.27708886
+4.27833142
+4.02236089
+0.48682558
+0.12831101
 0.00000000
 0.00000000
 0.00000000
@@ -547,10 +515,34 @@ tallies:
 0.00000000
 0.00000000
 0.00000000
+0.29176617
+0.07251729
+0.25144824
+0.06088181
+0.24306181
+0.02898423
+0.12857863
+0.01493176
 0.00000000
 0.00000000
 0.00000000
 0.00000000
+0.11994718
+0.01438733
+2.01537933
+1.21566499
+1.95249780
+1.47484769
+2.41125714
+1.77738291
+1.56862366
+0.90855079
+0.73344323
+0.19805860
+0.16936801
+0.01751072
+0.22267784
+0.04958542
 0.00000000
 0.00000000
 0.00000000
@@ -571,6 +563,14 @@ tallies:
 0.00000000
 0.00000000
 0.00000000
+0.26528543
+0.04012687
+1.54885579
+1.40282503
+0.84326243
+0.24326012
+0.63878656
+0.40804827
 0.00000000
 0.00000000
 0.00000000

tests/test_filter_universe/results_true.dat

@@ -1,11 +1,11 @@
 k-combined:
-0.98046852 0.04718832
+0.93773827 0.06215432
 tallies:
-36.02063446
-262.67869132
-4.68789690
-4.50704437
-74.02502234
-1111.88560685
-8.53811818
-14.72177988
+76.34206724
+1184.75098610
+9.28488884
+17.65553583
+33.12780146
+225.26612084
+3.62384871
+2.75301569

tests/test_lattice/results_true.dat

@@ -1,2 +1,2 @@
 k-combined:
-0.91525327 0.06208235
+1.09426709 0.07838238

tests/test_lattice_multiple/results_true.dat

@@ -1,2 +1,2 @@
 k-combined:
-0.98046852 0.04718832
+0.93773827 0.06215432

tests/test_natural_element/results_true.dat

@@ -1,2 +1,2 @@
 k-combined:
-0.96912628 0.04173669
+1.01244319 0.02162448

tests/test_output/results_true.dat

@@ -1,2 +1,2 @@
 k-combined:
-0.30408759 0.00088008
+0.30113528 0.00285456

tests/test_particle_restart/results.py

@@ -7,7 +7,7 @@ sys.path.append('../../src/utils')
 import particle_restart as pr
 
 # read in particle restart file
-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.00000000
 particle id:
-903.00000000
+394.00000000
 particle weight:
 1.00000000
 particle energy:
-4.05657055
+2.15463975
 particle xyz:
--15.93841321 24.03836865 48.92880257
+13.20547715 -26.77009496 -66.17908254
 particle uvw:
--0.17761482 0.97467032 0.13590711
+0.34615091 -0.88471641 -0.31218012

tests/test_particle_restart/test_particle_restart.py

@@ -17,7 +17,7 @@ def test_run():
     assert stderr != ''
 
 def test_created_restart():
-    assert os.path.exists(pwd + '/particle_10_903.binary')
+    assert os.path.exists(pwd + '/particle_10_394.binary')
 
 def test_results():
     os.system('python results.py')
@@ -27,7 +27,7 @@ def test_results():
     assert compare
 
 def test_run_restart():
-    proc = Popen([pwd + '/../../src/openmc -r particle_10_903.binary'], 
+    proc = Popen([pwd + '/../../src/openmc -r particle_10_394.binary'], 
            stderr=PIPE, stdout=PIPE, shell=True)
     stdout, stderr = proc.communicate()
     assert stderr == ''

tests/test_ptables_off/results_true.dat

@@ -1,2 +1,2 @@
 k-combined:
-0.30360946 0.00279271
+0.30419239 0.00500179

tests/test_reflective_cone/results_true.dat

@@ -1,2 +1,2 @@
 k-combined:
-2.28423621 0.00686033
+2.26014706 0.00670709

tests/test_reflective_cylinder/results_true.dat

@@ -1,2 +1,2 @@
 k-combined:
-2.27230443 0.00340049
+2.28062250 0.00624835

tests/test_reflective_plane/results_true.dat

@@ -1,2 +1,2 @@
 k-combined:
-2.26967362 0.00896221
+2.27515043 0.00457409

tests/test_reflective_sphere/results_true.dat

@@ -1,2 +1,2 @@
 k-combined:
-2.29368643 0.00532865
+2.27419343 0.01434689

tests/test_rotation/results_true.dat

@@ -1,2 +1,2 @@
 k-combined:
-0.30408759 0.00088008
+0.30113528 0.00285456

tests/test_salphabeta/results_true.dat

@@ -1,2 +1,2 @@
 k-combined:
-0.83997725 0.02336172
+0.83759658 0.01499621

tests/test_salphabeta_multiple/results_true.dat

@@ -1,2 +1,2 @@
 k-combined:
-1.01833778 0.04898906
+1.01374686 0.03067630

tests/test_score_MT/results_true.dat

@@ -1,5 +1,5 @@
 k-combined:
-0.98046852 0.04718832
+0.93773827 0.06215432
 tallies:
 0.00000000
 0.00000000
@@ -9,27 +9,27 @@ tallies:
 0.00000000
 0.00000000
 0.00000000
-0.00000999
-0.00000000
-0.00000999
-0.00000000
-0.21087220
-0.00917268
-0.73494541
-0.11133353
+0.00622197
+0.00001807
+0.00622197
+0.00001807
+0.44141880
+0.03925779
+1.50409518
+0.46240145
+0.00016315
+0.00000002
+0.00016315
+0.00000002
+0.03411837
+0.00023871
+0.02451779
+0.00015159
 0.00000000
 0.00000000
 0.00000000
 0.00000000
-0.01386040
-0.00004269
-0.01123359
-0.00002709
+0.00007025
 0.00000000
-0.00000000
-0.00000000
-0.00000000
-0.00001666
-0.00000000
-0.04302898
-0.00037069
+0.08782799
+0.00157200

tests/test_score_absorption/results_true.dat

@@ -1,20 +1,20 @@
 k-combined:
-0.98046852 0.04718832
+0.93773827 0.06215432
 tally 1:
 0.00000000
 0.00000000
-1.38403954
-0.38795574
-0.01124864
-0.00002715
-0.20585652
-0.00848355
+2.85105485
+1.67326901
+0.02453376
+0.00015158
+0.42210756
+0.03628443
 tally 2:
 0.00000000
 0.00000000
-1.29000000
-0.34930000
-0.01000000
-0.00010000
-0.29000000
-0.01890000
+2.85000000
+1.63350000
+0.02000000
+0.00020000
+0.42000000
+0.04040000

tests/test_score_events/results_true.dat

@@ -1,12 +1,12 @@
 k-combined:
-0.98046852 0.04718832
+0.93773827 0.06215432
 tally 1:
-32.11000000
-209.71810000
-73.39000000
-1096.36910000
+70.99000000
+1023.51630000
+33.11000000
+226.46810000
 tally 2:
-8.35000000
-14.14870000
-19.58000000
-77.70300000
+19.06000000
+73.66360000
+8.98000000
+16.81740000

tests/test_score_fission/results_true.dat

@@ -1,20 +1,20 @@
 k-combined:
-0.98046852 0.04718832
+0.93773827 0.06215432
 tally 1:
-0.64776968
-0.08434925
+1.34207339
+0.37700497
 0.00000000
 0.00000000
 0.00000000
 0.00000000
-1.28044244
-0.33521026
+0.58925949
+0.07043773
 tally 2:
+1.85000000
+0.68670000
 0.00000000
 0.00000000
 0.00000000
 0.00000000
-0.00000000
-0.00000000
-0.00000000
-0.00000000
+0.85000000
+0.14670000

tests/test_score_flux/results_true.dat

@@ -1,15 +1,15 @@
 k-combined:
-0.98046852 0.04718832
+0.93773827 0.06215432
 tallies:
-19.26122972
-75.54613096
-6.73652906
-9.36673113
-31.86041974
-208.41096895
-44.30984076
-401.45119385
-14.80519869
-44.65616635
-72.13983866
-1064.07936529
+41.83911096
+355.59296457
+14.63597955
+43.41569306
+69.76992065
+988.77383544
+19.91437907
+82.42734347
+6.60008352
+8.94697721
+32.57985017
+216.75381932

tests/test_score_kappafission/results_true.dat

@@ -1,11 +1,11 @@
 k-combined:
-0.98046852 0.04718832
+0.93773827 0.06215432
 tallies:
-126.94081234
-3239.28231696
+262.96153427
+14473.43928742
 0.00000000
 0.00000000
 0.00000000
 0.00000000
-251.05021427
-12885.65557182
+115.46024826
+2703.98040689

tests/test_score_nufission/results_true.dat

@@ -1,11 +1,11 @@
 k-combined:
-0.98046852 0.04718832
+0.93773827 0.06215432
 tallies:
-1.70263677
-0.58270937
+3.52732803
+2.60255289
 0.00000000
 0.00000000
 0.00000000
 0.00000000
-3.36809105
-2.32023393
+1.54529005
+0.48422451

tests/test_score_nuscatter/results_true.dat

@@ -1,11 +1,11 @@
 k-combined:
-0.98046852 0.04718832
+0.93773827 0.06215432
 tallies:
 0.00000000
 0.00000000
-7.06000000
-10.07900000
-2.17000000
-1.03550000
-26.62000000
-144.17900000
+16.30000000
+54.04060000
+4.37000000
+3.87270000
+56.35000000
+646.16830000

tests/test_score_scatter/results_true.dat

@@ -1,11 +1,11 @@
 k-combined:
-0.98046852 0.04718832
+0.93773827 0.06215432
 tallies:
 0.00000000
 0.00000000
-7.39833696
-11.05882445
-1.83357448
-0.69443493
-26.32074554
-140.15855722
+15.97180741
+51.76957926
+4.01138641
+3.26848930
+55.73125227
+631.82772267

tests/test_score_scatter_n/results_true.dat

@@ -1,33 +1,33 @@
 k-combined:
-0.98046852 0.04718832
+0.93773827 0.06215432
 tallies:
-7.06000000
-10.07900000
-0.57628500
-0.09057735
-0.16393312
-0.00710897
-0.10812742
-0.01738566
--0.05518860
-0.01170613
-2.17000000
-1.03550000
-0.15627688
-0.01347659
-0.07161707
-0.01004427
--0.04113472
-0.00491929
-0.00147404
-0.00304207
-26.62000000
-144.17900000
-13.17579549
-35.62860351
-4.47692962
-4.13563188
-0.05339990
-0.01603587
--0.68933362
-0.13685298
+16.29000000
+53.96710000
+2.08313942
+0.92747108
+0.75815260
+0.13723571
+0.57884042
+0.08474398
+0.22673224
+0.02004576
+4.37000000
+3.87270000
+0.45873212
+0.08870902
+0.16569697
+0.00903157
+0.10589589
+0.00510752
+0.02954694
+0.00434665
+56.35000000
+646.16830000
+28.38721647
+164.33414732
+10.48195658
+22.67831329
+0.93396528
+0.38105724
+-1.14015557
+0.34388184

tests/test_score_scatter_pn/results_true.dat

@@ -1,24 +1,24 @@
 k-combined:
-0.98046852 0.04718832
+0.93773827 0.06215432
 tally 1:
-7.06000000
-10.07900000
-0.57628500
-0.09057735
-0.16393312
-0.00710897
-0.10812742
-0.01738566
--0.05518860
-0.01170613
+16.29000000
+53.96710000
+2.08313942
+0.92747108
+0.75815260
+0.13723571
+0.57884042
+0.08474398
+0.22673224
+0.02004576
 tally 2:
-7.06000000
-10.07900000
-0.57628500
-0.09057735
-0.16393312
-0.00710897
-0.10812742
-0.01738566
--0.05518860
-0.01170613
+16.29000000
+53.96710000
+2.08313942
+0.92747108
+0.75815260
+0.13723571
+0.57884042
+0.08474398
+0.22673224
+0.02004576

tests/test_score_total/results_true.dat

@@ -1,11 +1,11 @@
 k-combined:
-0.98046852 0.04718832
+0.93773827 0.06215432
 tallies:
 0.00000000
 0.00000000
-8.78237650
-15.55794571
-1.84482312
-0.70297682
-26.52660205
-142.33423161
+18.82286226
+72.03127513
+4.03592017
+3.30960729
+56.15335982
+641.42946960

tests/test_seed/results_true.dat

@@ -1,2 +1,2 @@
 k-combined:
-0.30165553 0.00229391
+0.29641703 0.00347827

tests/test_source_angle_mono/results_true.dat

@@ -1,2 +1,2 @@
 k-combined:
-0.28529893 0.02631808
+0.30292117 0.00315075

tests/test_source_energy_maxwell/results_true.dat

@@ -1,2 +1,2 @@
 k-combined:
-0.29934658 0.00353145
+0.29816210 0.00121567

tests/test_source_energy_mono/results_true.dat

@@ -1,2 +1,2 @@
 k-combined:
-0.29903670 0.00255560
+0.30542623 0.00242599

tests/test_source_point/results_true.dat

@@ -1,2 +1,2 @@
 k-combined:
-0.29437360 0.00659562
+0.29136321 0.00355914

tests/test_statepoint_batch/results_true.dat

@@ -1,2 +1,2 @@
 k-combined:
-0.30303393 0.00050903
+0.30194014 0.00423565

tests/test_statepoint_interval/results_true.dat

@@ -1,2 +1,2 @@
 k-combined:
-0.30408759 0.00088008
+0.30113528 0.00285456

tests/test_statepoint_sourcesep/results_true.dat

@@ -1,2 +1,2 @@
 k-combined:
-0.30408759 0.00088008
+0.30113528 0.00285456

tests/test_survival_biasing/results_true.dat

@@ -1,2 +1,2 @@
 k-combined:
-0.96880768 0.06981246
+0.99088962 0.00463258

tests/test_tally_assumesep/results_true.dat

@@ -1,11 +1,11 @@
 k-combined:
-0.98046852 0.04718832
+0.93773827 0.06215432
 tally 1:
-8.78237650
-15.55794571
+18.82286226
+72.03127513
 tally 2:
-1.84482312
-0.70297682
+4.03592017
+3.30960729
 tally 3:
-1.84482312
-0.70297682
+4.03592017
+3.30960729

tests/test_trace/results_true.dat

@@ -1,2 +1,2 @@
 k-combined:
-0.30408759 0.00088008
+0.30113528 0.00285456

tests/test_translation/results_true.dat

@@ -1,2 +1,2 @@
 k-combined:
-0.30408759 0.00088008
+0.30113528 0.00285456

tests/test_uniform_fs/results_true.dat

@@ -1,2 +1,2 @@
 k-combined:
-0.36037232 0.00458859
+0.36134159 0.00744525

tests/test_universe/results_true.dat

@@ -1,2 +1,2 @@
 k-combined:
-0.30408759 0.00088008
+0.30113528 0.00285456

tests/test_void/results_true.dat

@@ -1,2 +1,2 @@
 k-combined:
-1.07666475 0.08436762
+1.01031305 0.03162080