Changeset 1468 for palm/trunk/SOURCE/progress_bar.f90

Timestamp:

Sep 24, 2014 2:06:57 PM (10 years ago)

Author:

maronga

Message:

New flag files allow to force unscheduled termination/restarts of batch jobs, progress output is made for batch runs, small adjustments for lxce6 and lccrayh/lccrayb

File:

• palm/trunk/SOURCE/progress_bar.f90 (modified) (6 diffs)

palm/trunk/SOURCE/progress_bar.f90

@@ -20 +20 @@
 ! Current revisions:
 ! -----------------
-! 
+! Added support for progress file PROGRESS which is used in case of batch jobs
 !
 ! Former revisions:
@@ -28 +28 @@
 ! Description:
 ! ------------
-! CPU-time measurements for any program part whatever. Results of the
+! This routine prints either a progress bar on the standard output in case of
+! interactive runs, or it prints the progress in a separate file called
+! PROGRESS.
 !------------------------------------------------------------------------------!
 
     USE control_parameters,                                                    &
-        ONLY : end_time, simulated_time, simulated_time_at_begin, time_restart
+        ONLY : end_time, run_identifier, simulated_time,                       &
+               simulated_time_at_begin, time_restart
 
-    USE, INTRINSIC ::  ISO_FORTRAN_ENV,                                     &
+    USE, INTRINSIC ::  ISO_FORTRAN_ENV,                                        &
         ONLY :  OUTPUT_UNIT
 
@@ -60 +63 @@
 
     SUBROUTINE init_progress_bar
+!------------------------------------------------------------------------------!
+! Description:
+! ------------
+! Initialize the progress bar/file
+!------------------------------------------------------------------------------!
 
        IMPLICIT NONE
@@ -74 +82 @@
        ENDIF
 
-       bar = '____________________________________________________________'
-       crosses = 'XXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXX'
+       IF ( batch_job )  THEN
+
+          CALL check_open ( 117 )
+          WRITE ( 117, FMT='(A20,/)' ) run_identifier
+
+       ELSE
+          bar = '____________________________________________________________'
+          crosses = 'XXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXX'
 !
-!--    Line feed on stdout to seperate the progress bar from previous messages
-       WRITE ( OUTPUT_UNIT, '(1X)' )
+!--       Line feed on stdout to seperate the progress bar from previous messages
+          WRITE ( OUTPUT_UNIT, '(1X)' )
 #if defined( __intel_compiler )
 !
-!--    The Intel compiler does not allow to immediately flush the output buffer
-!--    in case that option ADVANCE='NO' is used in the write statement.
-!--    A workaround is to set a special carriage control feature and use "+" as
-!--    first output character, but this non-standard and only available with the
-!--    Intel compiler
-       OPEN ( OUTPUT_UNIT, CARRIAGECONTROL='FORTRAN' )
+!--       The Intel compiler does not allow to immediately flush the output buffer
+!--       in case that option ADVANCE='NO' is used in the write statement.
+!--       A workaround is to set a special carriage control feature and use "+" as
+!--       first output character, but this non-standard and only available with the
+!--       Intel compiler
+          OPEN ( OUTPUT_UNIT, CARRIAGECONTROL='FORTRAN' )
 #endif
+
+       ENDIF
+
        initialized = .TRUE.
 
@@ -97 +114 @@
 ! Description:
 ! ------------
-!
+! Print progress data to standard output (interactive) or to file (batch jobs)
 !------------------------------------------------------------------------------!
 
@@ -104 +121 @@
        REAL(wp) ::  remaining_time_in_percent  !: remaining time to be simulated
                                                !: in the job
+       REAL(wp) ::  remaining_time_in_percent_total !: total remaining time of
+                                                    !: the job chain
+
+       IF ( .NOT. initialized )  CALL init_progress_bar
+
+
+       remaining_time_in_percent =                                             &
+          ( simulated_time - simulated_time_at_begin ) / time_to_be_simulated
+
+       remaining_time_in_percent_total = ( simulated_time / end_time )
 
 !
-!--    Porgress bar does not make sense in batch mode (and also ADVANCE=no does
-!--    not properly work in batch mode on Cray XC30)
-       IF ( batch_job )  RETURN
+!--    In batch mode, use a file (PROGRESS), otherwise use progress bar
+       IF ( batch_job )  THEN
 
-       IF ( .NOT. initialized )  CALL init_progress_bar
+          BACKSPACE ( 117 )
+          WRITE ( 117, FMT='(F5.2,1X,F5.2)' ) remaining_time_in_percent,       &
+                                              remaining_time_in_percent_total
+          CALL local_flush( 117 )
+
+       ELSE
+
 !
-!--    Calculate length of progress bar
-       remaining_time_in_percent =                                             &
-             ( simulated_time - simulated_time_at_begin ) / time_to_be_simulated
+!--       Calculate length of progress bar
+          ilength = remaining_time_in_percent * 60.0_wp
+          ilength = MIN( ilength, 60 )
 
-       ilength = remaining_time_in_percent * 60.0_wp
-       ilength = MIN( ilength, 60 )
-
-       bar(1:ilength) = crosses(1:ilength)
+          bar(1:ilength) = crosses(1:ilength)
 
 #if defined( __intel_compiler )
-       WRITE ( OUTPUT_UNIT, '(A,6X,''['',A,''] '',F5.1,'' left'')' )           &
-               '+', bar,                                                       &
-                MAX( 0.0_wp, ( 1.0_wp - remaining_time_in_percent ) * 100.0_wp )
+          WRITE ( OUTPUT_UNIT, '(A,6X,''['',A,''] '',F5.1,'' left'')' )        &
+                  '+', bar,                                                    &
+                   MAX( 0.0_wp, ( 1.0_wp - remaining_time_in_percent ) *       &
+                                  100.0_wp )
 #else
-       WRITE ( OUTPUT_UNIT, '(A,6X,''['',A,''] '',F5.1,'' left'')',            &
-               ADVANCE='NO' )  CHAR( 13 ), bar,                                &
-                MAX( 0.0_wp, ( 1.0_wp - remaining_time_in_percent ) * 100.0_wp )
+          WRITE ( OUTPUT_UNIT, '(A,6X,''['',A,''] '',F5.1,'' left'')',         &
+                  ADVANCE='NO' )  CHAR( 13 ), bar,                             &
+                   MAX( 0.0_wp, ( 1.0_wp - remaining_time_in_percent ) *       &
+                                  100.0_wp )
 #endif
-       CALL local_flush( OUTPUT_UNIT )
+          CALL local_flush( OUTPUT_UNIT )
+
+       ENDIF
 
     END SUBROUTINE output_progress_bar
 
     SUBROUTINE finish_progress_bar
+!------------------------------------------------------------------------------!
+! Description:
+! ------------
+! Finalization of the progress bar/file
+!------------------------------------------------------------------------------!
 
        IMPLICIT NONE
 
-       IF ( batch_job )  RETURN
+       IF ( batch_job )  THEN
 
+          CALL close_file ( 117 )
+
+       ELSE
+       
 #if defined( __intel_compiler )
 !
-!--    Reset to the default carriage control
-       OPEN ( OUTPUT_UNIT, CARRIAGECONTROL='LIST' )
+!--       Reset to the default carriage control
+          OPEN ( OUTPUT_UNIT, CARRIAGECONTROL='LIST' )
 #endif
 !
-!--    Line feed when simulation has finished
-       WRITE ( OUTPUT_UNIT, '(1X)' )
+!--       Line feed when simulation has finished
+          WRITE ( OUTPUT_UNIT, '(1X)' )
+
+       ENDIF
 
     END SUBROUTINE finish_progress_bar
 
+
  END MODULE progress_bar