Move tally deactivation to simulation_finalize

src/simulation.F90

@@ -573,6 +573,13 @@ contains
     ! Write tally results to tallies.out
     if (output_tallies .and. master) call write_tallies()
 
+    ! Deactivate all tallies
+    if (allocated(tallies)) then
+      do i = 1, n_tallies
+        tallies(i) % obj % active = .false.
+      end do
+    end if
+
     ! Stop timers and show timing statistics
     call time_finalize%stop()
     call time_total%stop()

src/tallies/tally_header.F90

@@ -388,7 +388,6 @@ contains
 
     do i = 1, n_tallies
       call tallies(i) % obj % allocate_results()
-      tallies(i) % obj % active = .false.
     end do
 
   end subroutine configure_tallies