Fixed column titles for cases without Shannon entropy.

This commit is contained in:
Paul Romano 2011-12-14 11:14:55 -06:00
parent 1da3280eba
commit 1a7943c4c8
3 changed files with 14 additions and 6 deletions

View file

@ -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)

View file

@ -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

View file

@ -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)