From 4aae63ff770d9db1d70b175ada41e24a867b3737 Mon Sep 17 00:00:00 2001
From: Shikhar Kumar <shikhark@mit.edu>
Date: Tue, 20 Feb 2018 14:38:45 -0500
Subject: [PATCH] Reorder printing calls to output CMFD data correctly

---
 src/output.F90     | 16 ++++++++++++----
 src/simulation.F90 |  4 +++-
 2 files changed, 15 insertions(+), 5 deletions(-)

diff --git a/src/output.F90 b/src/output.F90
index 9a144721dc..11366b5c03 100644
--- a/src/output.F90
+++ b/src/output.F90
@@ -368,7 +368,7 @@ contains
     ! write out entropy info
     if (entropy_on) write(UNIT=OUTPUT_UNIT, FMT='(3X, F8.5)', ADVANCE='NO') &
          entropy % data(i)
-
+    
     ! write out accumulated k-effective if after first active batch
     if (n > 1) then
       write(UNIT=OUTPUT_UNIT, FMT='(3X, F8.5," +/-",F8.5)', ADVANCE='NO') &
@@ -376,6 +376,15 @@ contains
     else
       write(UNIT=OUTPUT_UNIT, FMT='(23X)', ADVANCE='NO')
     end if
+      
+  end subroutine print_batch_keff
+
+!===============================================================================
+! PRINT_BATCH_KEFF displays the last batch's tallied value of the neutron
+! multiplication factor as well as the average value if we're in active batches
+!===============================================================================
+
+  subroutine print_cmfd()
 
     ! write out cmfd keff if it is active and other display info
     if (cmfd_on) then
@@ -396,11 +405,10 @@ contains
                cmfd % dom(current_batch)
       end select
     end if
-
     ! next line
     write(UNIT=OUTPUT_UNIT, FMT=*)
-
-  end subroutine print_batch_keff
+      
+  end subroutine print_cmfd
 
 !===============================================================================
 ! PRINT_PLOT displays selected options for plotting
diff --git a/src/simulation.F90 b/src/simulation.F90
index ef29e7832b..91c176b995 100644
--- a/src/simulation.F90
+++ b/src/simulation.F90
@@ -24,7 +24,8 @@ 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_results, print_overlap_check, write_tallies, &
+                             print_cmfd
   use particle_header, only: Particle
   use random_lcg,      only: set_particle_seed
   use settings
@@ -338,6 +339,7 @@ contains
     if (run_mode == MODE_EIGENVALUE) then
       ! Perform CMFD calculation if on
       if (cmfd_on) call execute_cmfd()
+      call print_cmfd()
     end if
 
     ! Check_triggers