Merge pull request #246 from bonachea/flush-at-stop

issue #245: prif_(error)_stop: Work harder to flush final output

Author: bonachea

src/caffeine/program_termination_s.F90

@@ -14,6 +14,12 @@
 
 contains
 
+  ! Do our best to portably flush anything that might be buffered in the Fortran I/O library
+  subroutine flush_all()
+    flush output_unit
+    flush error_unit
+  end subroutine
+
   module procedure prif_register_stop_callback
     type(callback_entry), pointer :: new_entry
     allocate(new_entry)
@@ -25,6 +31,9 @@
   end procedure
 
   module procedure prif_stop
+
+    call flush_all()
+
     call prif_sync_all
     call run_callbacks(.false._c_bool, quiet, stop_code_int, stop_code_char)
 
@@ -35,7 +44,6 @@
     end if
 
   contains
-
     subroutine prif_stop_integer(quiet, stop_code)
       !! synchronize, stop the executing image, and provide the stop_code, or 0 if not present, as the process exit status
       logical(c_bool), intent(in) :: quiet
@@ -45,17 +53,17 @@ subroutine prif_stop_integer(quiet, stop_code)
       if (present(stop_code)) then
         if (.not. quiet) then
           write(output_unit, *) "STOP ", stop_code
-          flush output_unit
         end if
         exit_code = stop_code
       else
         if (.not. quiet) then
           write(output_unit, *) "STOP"
-          flush output_unit
         end if
         exit_code = 0_c_int
       end if
 
+      call flush_all()
+
       call caf_decaffeinate(exit_code)
 
     end subroutine prif_stop_integer
@@ -67,16 +75,20 @@ subroutine prif_stop_character(quiet, stop_code)
 
       if (.not. quiet) then
         write(output_unit, *) "STOP '" // stop_code // "'"
-        flush output_unit
       end if
 
+      call flush_all()
+
       call caf_decaffeinate(exit_code=0_c_int) ! does not return
 
     end subroutine prif_stop_character
 
   end procedure prif_stop
 
   module procedure prif_error_stop
+      
+    call flush_all()
+
     call run_callbacks(.true._c_bool, quiet, stop_code_int, stop_code_char)
     if (present(stop_code_char)) then
        call prif_error_stop_character(quiet, stop_code_char)
@@ -92,9 +104,10 @@ subroutine prif_error_stop_character(quiet, stop_code)
 
     if (.not. quiet) then
       write(error_unit, *) "ERROR STOP '" // stop_code // "'"
-      flush error_unit
     end if
 
+    call flush_all()
+
     call caf_decaffeinate(1_c_int) ! does not return
   end subroutine
 
@@ -107,17 +120,17 @@ subroutine prif_error_stop_integer(quiet, stop_code)
     if (present(stop_code)) then
       if (.not.quiet) then
         write(error_unit,'(A, I0)') "ERROR STOP ", stop_code
-        flush error_unit
       end if
       exit_code = stop_code
     else
       if (.not.quiet) then
         write(error_unit,'(a)') "ERROR STOP"
-        flush error_unit
       end if
       exit_code = 1_c_int
     end if
 
+    call flush_all()
+
     call caf_decaffeinate(exit_code) ! does not return
   end subroutine