From bedf99d2fea7f92b5558119b1ebc4a6602e2c920 Mon Sep 17 00:00:00 2001
From: Shikhar Kumar <shikhark@mit.edu>
Date: Thu, 1 Mar 2018 15:56:24 -0500
Subject: [PATCH] remove print_cmfd and change order in which print_batch_keff
 is called

---
 src/output.F90     | 16 +++-------------
 src/simulation.F90 |  8 +++-----
 2 files changed, 6 insertions(+), 18 deletions(-)

diff --git a/src/output.F90 b/src/output.F90
index 643a28b671..6e21d9143a 100644
--- a/src/output.F90
+++ b/src/output.F90
@@ -356,9 +356,9 @@ contains
     integer :: n  ! number of active generations
 
     ! Determine overall generation and number of active generations
-    i = overall_generation()
+    i = overall_generation() - 1
     n = i - n_inactive*gen_per_batch
-
+    
     ! write out information batch and option independent output
     write(UNIT=OUTPUT_UNIT, FMT='(2X,A9)', ADVANCE='NO') &
          trim(to_str(current_batch)) // "/" // trim(to_str(gen_per_batch))
@@ -377,16 +377,6 @@ contains
       write(UNIT=OUTPUT_UNIT, FMT='(23X)', ADVANCE='NO')
     end if
       
-  end subroutine print_batch_keff
-
-!===============================================================================
-! PRINT_CMFD displays the CMFD related information to output after CMFD is 
-! executed. Will print blank line if CMFD is not on, to ensure consistent 
-! formatting of output columns
-!===============================================================================
-
-  subroutine print_cmfd()
-
     ! write out cmfd keff if it is active and other display info
     if (cmfd_on) then
       write(UNIT=OUTPUT_UNIT, FMT='(3X, F8.5)', ADVANCE='NO') &
@@ -410,7 +400,7 @@ contains
     ! next line
     write(UNIT=OUTPUT_UNIT, FMT=*)
 
-  end subroutine print_cmfd
+  end subroutine print_batch_keff
 
 !===============================================================================
 ! PRINT_PLOT displays selected options for plotting
diff --git a/src/simulation.F90 b/src/simulation.F90
index 91c176b995..701cd191b7 100644
--- a/src/simulation.F90
+++ b/src/simulation.F90
@@ -24,8 +24,7 @@ module simulation
   use nuclide_header,  only: micro_xs, n_nuclides
   use output,          only: header, print_columns, &
                              print_batch_keff, print_generation, print_runtime, &
-                             print_results, print_overlap_check, write_tallies, &
-                             print_cmfd
+                             print_results, print_overlap_check, write_tallies
   use particle_header, only: Particle
   use random_lcg,      only: set_particle_seed
   use settings
@@ -295,8 +294,6 @@ contains
       if (master .and. verbosity >= 7) then
         if (current_gen /= gen_per_batch) then
           call print_generation()
-        else
-          call print_batch_keff()
         end if
       end if
 
@@ -339,7 +336,8 @@ contains
     if (run_mode == MODE_EIGENVALUE) then
       ! Perform CMFD calculation if on
       if (cmfd_on) call execute_cmfd()
-      call print_cmfd()
+      ! Write batch output
+      if (master .and. verbosity >= 7) call print_batch_keff()
     end if
 
     ! Check_triggers