From 2e660bd89f1a2e0f25fb39016753fed0e7217338 Mon Sep 17 00:00:00 2001
From: Sterling Harper <smharper@mit.edu>
Date: Thu, 16 Aug 2018 10:52:05 -0400
Subject: [PATCH] Move tally deactivation to simulation_finalize

---
 src/simulation.F90           | 7 +++++++
 src/tallies/tally_header.F90 | 1 -
 2 files changed, 7 insertions(+), 1 deletion(-)

diff --git a/src/simulation.F90 b/src/simulation.F90
index 41af5b2ba..89c7b1f68 100644
--- a/src/simulation.F90
+++ b/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()
diff --git a/src/tallies/tally_header.F90 b/src/tallies/tally_header.F90
index 4c78fd6da..6442d5800 100644
--- a/src/tallies/tally_header.F90
+++ b/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