Ignore:
Timestamp:
May 9, 2014 2:25:13 PM (7 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:
1 edited

Legend:

Unmodified
Added
Removed
  • palm/trunk/SOURCE/message.f90

    r1385 r1402  
    2121! Current revisions:
    2222! -----------------
    23 !
     23! formatting of messages modified
    2424!
    2525! Former revisions:
     
    8383    pe_out_of_range = .FALSE.
    8484
    85 !    print*, '#1'
    8685!
    8786!-- Create the complete output string, starting with the message level
     
    9796    ENDIF
    9897
    99 !    print*, '#2'
    10098!
    10199!-- Add the message identifier and the generating routine
     
    113111   
    114112
    115 !    print*, '#3'
    116113!
    117114!-- Output the output string and the corresponding message string which had
     
    124121       do_output = .TRUE.
    125122    ENDIF
    126 !    print*, '#4'
    127123#if defined( __parallel )
    128124!
     
    132128       IF ( myid == 0 )  do_output = .TRUE.
    133129    ENDIF
    134 !    print*, '#5'
    135130#endif
    136131
     
    138133!-- Now do the output
    139134    IF ( do_output )  THEN
    140 !    print*, '#6'
     135
    141136       IF ( file_id == 6 )  THEN
    142137!
    143138!--       Output on stdout
    144139          WRITE( *, '(A/)' )  TRIM( header_string )
    145 !    print*, '#7'
    146140!
    147141!--       Cut message string into pieces and output one piece per line.
     
    155149          ENDDO
    156150          WRITE( *, '(4X,A)' )  TRIM( message_string )
    157 !    print*, '#8'
    158151          WRITE( *, '(4X,A)' )  ''
    159152          WRITE( *, '(4X,A)' )  TRIM( information_string_1 )
     
    162155
    163156       ELSE
    164 !    print*, '#9'
    165157!
    166158!--       Output on requested file id (file must have been opened elsewhere!)
     
    185177          IF ( flush == 1 )  CALL local_flush( file_id )
    186178       ENDIF
    187 !    print*, '#10'
    188179
    189180       IF ( pe_out_of_range )  THEN
     
    195186          WRITE ( *, '(A)' )  '    Output is done on PE0 instead'
    196187       ENDIF
    197 !    print*, '#11'
    198188
    199189    ENDIF
     
    201191!
    202192!-- Abort execution, if requested
    203 !    print*, '#12'
    204193    IF ( requested_action > 0 )  THEN
    205194       abort_mode = requested_action
    206195       CALL local_stop
    207196    ENDIF
    208 !    print*, '#13'
    209197
    210198 END SUBROUTINE message
    211199
    212200
    213  SUBROUTINE location_message( location )
     201 SUBROUTINE location_message( location, advance )
    214202
    215203!------------------------------------------------------------------------------!
     
    219207!------------------------------------------------------------------------------!
    220208
     209    USE, INTRINSIC ::  ISO_FORTRAN_ENV,                                        &
     210        ONLY :  OUTPUT_UNIT
     211
    221212    USE pegrid,                                                                &
    222213        ONLY :  myid
     
    224215    IMPLICIT NONE
    225216
    226     CHARACTER(LEN=*) ::  location
     217    CHARACTER(LEN=*) ::  location !: text to be output on stdout
     218    LOGICAL          ::  advance  !: switch for advancing/noadvancing I/O
    227219
    228220
    229221    IF ( myid == 0 )  THEN
    230        WRITE ( 6, '(6X,''... '',A)' )  TRIM( location )
    231        CALL local_flush( 6 )
     222       IF ( advance )  THEN
     223          WRITE ( OUTPUT_UNIT, '(6X,''--- '',A)' )  TRIM( location )
     224       ELSE
     225          WRITE ( OUTPUT_UNIT, '(6X,''... '',A)', ADVANCE='NO' )               &
     226                TRIM( location )
     227       ENDIF
     228       CALL local_flush( OUTPUT_UNIT )
    232229    ENDIF
    233230
Note: See TracChangeset for help on using the changeset viewer.