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

Timestamp:

Feb 28, 2016 12:45:19 PM (8 years ago)

Author:

raasch

Message:

update of the nested domain system + some bugfixes

File:

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

palm/trunk/SOURCE/message.f90

@@ -19 +19 @@
 ! Current revisions:
 ! -----------------
-! 
+! nest id added to header string, add linefeed to stdout to get messages better
+! seperatedvfrom the location messages,
+! in case of nested runs, location messages are given only by the root domain
 ! 
 ! Former revisions:
@@ -55 +57 @@
 !> Meaning of formal parameters:
 !> requested_action: 0 - continue, 1 - abort by stop, 2 - abort by mpi_abort
+!>                   3 - abort by mpi_abort using MPI_COMM_WORLD
 !> message_level: 0 - informative, 1 - warning, 2 - error
 !> output_on_pe: -1 - all, else - output on specified PE
@@ -63 +66 @@
                      message_level, output_on_pe, file_id, flush )
  
-
     USE control_parameters,                                                    &
         ONLY:  abort_mode, message_string
@@ -71 +73 @@
     USE pegrid
 
+    USE pmc_interface,                                                         &
+        ONLY:  cpl_id, nested_run
+
     IMPLICIT NONE
 
     CHARACTER(LEN=6)   ::  message_identifier            !<
+    CHARACTER(LEN=20)  ::  nest_string                   !< nest id information
     CHARACTER(LEN=*)   ::  routine_name                  !<
     CHARACTER(LEN=200) ::  header_string                 !<
@@ -94 +100 @@
 
 !
+!-- In case of nested runs create the nest id informations
+    IF ( nested_run )  THEN
+       WRITE( nest_string, '(1X,A,I2.2)' )  'from nest-id ', cpl_id
+    ELSE
+       nest_string = ''
+    ENDIF
+!
 !-- Create the complete output string, starting with the message level
     IF ( message_level == 0 )  THEN
-       header_string = '--- informative message ---  ID:'
+       header_string = '--- informative message' // TRIM(nest_string) //       &
+                       ' ---  ID:'
     ELSEIF ( message_level == 1 )  THEN
-       header_string = '+++ warning message ---  ID:'
+       header_string = '+++ warning message' // TRIM(nest_string) // ' ---  ID:'
     ELSEIF ( message_level == 2 )  THEN
-       header_string = '+++ error message ---  ID:'
+       header_string = '+++ error message' // TRIM(nest_string) // ' ---  ID:'
     ELSE
-       WRITE( header_string,'(A,I2)' )  '+++ unknown message level: ', &
+       WRITE( header_string,'(A,I2)' )  '+++ unknown message level' //         &
+                                        TRIM(nest_string) // ': ',             &
                                         message_level
     ENDIF
@@ -118 +133 @@
        information_string_2 = 'http://palm.muk.uni-hannover.de/trac/wiki/doc' // &
                               '/app/errmsg#' // message_identifier
-    END IF
+    ENDIF
     
 
@@ -147 +162 @@
 !
 !--       Output on stdout
-          WRITE( *, '(A/)' )  TRIM( header_string )
+          WRITE( *, '(//A/)' )  TRIM( header_string )
 !
 !--       Cut message string into pieces and output one piece per line.
@@ -219 +234 @@
 
     USE, INTRINSIC ::  ISO_FORTRAN_ENV,                                        &
-        ONLY :  OUTPUT_UNIT
+        ONLY:  OUTPUT_UNIT
 
     USE pegrid,                                                                &
-        ONLY :  myid
+        ONLY:  myid
+
+    USE pmc_interface,                                                         &
+        ONLY:  cpl_id
 
     IMPLICIT NONE
@@ -229 +247 @@
     LOGICAL          ::  advance  !< switch for advancing/noadvancing I/O
 
+!
+!-- Output for nested runs only on the root domain
+    IF ( cpl_id /= 1 )  RETURN
 
     IF ( myid == 0 )  THEN