Changeset 1402 for palm/trunk/SOURCE/message.f90

Timestamp:

May 9, 2014 2:25:13 PM (8 years ago)

Author:

raasch

Message:

output of location messages complemented, output of location bar added
(Makefile, check_parameters, cpulog, init_pegrid, init_3d_model, message, palm, parin, time_integration, new: progress_bar)
preprocessor switch intel_compiler added, -r8 compiler options removed
(.mrun.config.default, .mrun.config.imuk, .mrun.config.kiaps)

batch_job added to envpar-NAMELIST
(mrun, parin)

File:

• palm/trunk/SOURCE/message.f90 (modified) (14 diffs)

palm/trunk/SOURCE/message.f90

@@ -21 +21 @@
 ! Current revisions:
 ! -----------------
-! 
+! formatting of messages modified
 ! 
 ! Former revisions:
@@ -83 +83 @@
     pe_out_of_range = .FALSE.
 
-!    print*, '#1'
 !
 !-- Create the complete output string, starting with the message level
@@ -97 +96 @@
     ENDIF
 
-!    print*, '#2'
 !
 !-- Add the message identifier and the generating routine
@@ -113 +111 @@
     
 
-!    print*, '#3'
 !
 !-- Output the output string and the corresponding message string which had
@@ -124 +121 @@
        do_output = .TRUE.
     ENDIF
-!    print*, '#4'
 #if defined( __parallel )
 !
@@ -132 +128 @@
        IF ( myid == 0 )  do_output = .TRUE.
     ENDIF
-!    print*, '#5'
 #endif
 
@@ -138 +133 @@
 !-- Now do the output
     IF ( do_output )  THEN
-!    print*, '#6'
+
        IF ( file_id == 6 )  THEN
 !
 !--       Output on stdout
           WRITE( *, '(A/)' )  TRIM( header_string )
-!    print*, '#7'
 !
 !--       Cut message string into pieces and output one piece per line.
@@ -155 +149 @@
           ENDDO
           WRITE( *, '(4X,A)' )  TRIM( message_string )
-!    print*, '#8'
           WRITE( *, '(4X,A)' )  ''
           WRITE( *, '(4X,A)' )  TRIM( information_string_1 ) 
@@ -162 +155 @@
 
        ELSE
-!    print*, '#9'
 !
 !--       Output on requested file id (file must have been opened elsewhere!)
@@ -185 +177 @@
           IF ( flush == 1 )  CALL local_flush( file_id )
        ENDIF
-!    print*, '#10'
 
        IF ( pe_out_of_range )  THEN
@@ -195 +186 @@
           WRITE ( *, '(A)' )  '    Output is done on PE0 instead'
        ENDIF
-!    print*, '#11'
 
     ENDIF
@@ -201 +191 @@
 !
 !-- Abort execution, if requested
-!    print*, '#12'
     IF ( requested_action > 0 )  THEN
        abort_mode = requested_action
        CALL local_stop
     ENDIF
-!    print*, '#13'
 
  END SUBROUTINE message
 
 
- SUBROUTINE location_message( location )
+ SUBROUTINE location_message( location, advance )
 
 !------------------------------------------------------------------------------!
@@ -219 +207 @@
 !------------------------------------------------------------------------------!
 
+    USE, INTRINSIC ::  ISO_FORTRAN_ENV,                                        &
+        ONLY :  OUTPUT_UNIT
+
     USE pegrid,                                                                &
         ONLY :  myid
@@ -224 +215 @@
     IMPLICIT NONE
 
-    CHARACTER(LEN=*) ::  location
+    CHARACTER(LEN=*) ::  location !: text to be output on stdout
+    LOGICAL          ::  advance  !: switch for advancing/noadvancing I/O
 
 
     IF ( myid == 0 )  THEN
-       WRITE ( 6, '(6X,''... '',A)' )  TRIM( location )
-       CALL local_flush( 6 )
+       IF ( advance )  THEN
+          WRITE ( OUTPUT_UNIT, '(6X,''--- '',A)' )  TRIM( location )
+       ELSE
+          WRITE ( OUTPUT_UNIT, '(6X,''... '',A)', ADVANCE='NO' )               &
+                TRIM( location )
+       ENDIF
+       CALL local_flush( OUTPUT_UNIT )
     ENDIF