From 1a7943c4c81bfcb8d6276cadcef637bd9da9d171 Mon Sep 17 00:00:00 2001 From: Paul Romano Date: Wed, 14 Dec 2011 11:14:55 -0600 Subject: [PATCH] Fixed column titles for cases without Shannon entropy. --- src/intercycle.F90 | 2 +- src/main.F90 | 15 +++++++++++---- src/mpi_routines.F90 | 3 ++- 3 files changed, 14 insertions(+), 6 deletions(-) diff --git a/src/intercycle.F90 b/src/intercycle.F90 index 95dcd7003e..3ec77bf6e0 100644 --- a/src/intercycle.F90 +++ b/src/intercycle.F90 @@ -183,7 +183,7 @@ contains #endif 100 format (2X,I5,2X,F8.5) -101 format (2X,I5,2X,F8.5,9X,F8.5," +/-",F8.5) +101 format (2X,I5,2X,F8.5,5X,F8.5," +/-",F8.5) 102 format (2X,I5,2X,F8.5,3X,F8.5) 103 format (2X,I5,2X,F8.5,3X,F8.5,3X,F8.5," +/-",F8.5) diff --git a/src/main.F90 b/src/main.F90 index c9534c09e1..ca0094b140 100644 --- a/src/main.F90 +++ b/src/main.F90 @@ -65,10 +65,17 @@ contains call timer_start(time_inactive) ! Display column titles - message = " Cycle k(cycle) Entropy Average k" - call write_message(1) - message = " ===== ======== ======= ===================" - call write_message(1) + if (entropy_on) then + message = " Cycle k(cycle) Entropy Average k" + call write_message(1) + message = " ===== ======== ======= ===================" + call write_message(1) + else + message = " Cycle k(cycle) Average k" + call write_message(1) + message = " ===== ======== ===================" + call write_message(1) + end if ! ========================================================================== ! LOOP OVER CYCLES diff --git a/src/mpi_routines.F90 b/src/mpi_routines.F90 index a523694772..3729fc98f4 100644 --- a/src/mpi_routines.F90 +++ b/src/mpi_routines.F90 @@ -386,7 +386,8 @@ contains tally_temp = t % scores(:,:) % val_history if (master) then - ! Description of MPI_IN_PLANE + ! The MPI_IN_PLACE specifier allows the master to copy values into a + ! receive buffer without having a temporary variable call MPI_REDUCE(MPI_IN_PLACE, tally_temp, n_bins, MPI_REAL8, MPI_SUM, & 0, MPI_COMM_WORLD, mpi_err)