Changeset 254 for palm/trunk/SOURCE/cpu_log.f90

Timestamp:

Mar 5, 2009 3:33:42 PM (15 years ago)

Author:

heinze

Message:

Output of messages replaced by message handling routine.

File:

• palm/trunk/SOURCE/cpu_log.f90 (modified) (8 diffs)

palm/trunk/SOURCE/cpu_log.f90

@@ -2 +2 @@
 
 !------------------------------------------------------------------------------!
-! Actual revisions:
+! Current revisions:
 ! -----------------
+! Output of messages replaced by message handling routine.
 ! Type of count and count_rate changed to default INTEGER on NEC machines
 !
@@ -31 +32 @@
 !------------------------------------------------------------------------------!
 
+    USE control_parameters
     USE cpulog
     USE pegrid
@@ -56 +58 @@
        log_event%place = place
     ELSEIF ( log_event%place /= place )  THEN
-       IF ( myid == 0 )  THEN
-          PRINT*,'+++ cpu_log: wrong argument'
-          PRINT*,'    expected: ',log_event%place,'  given: ', place
-       ENDIF
-       CALL local_stop
+       WRITE( message_string, * ) 'wrong argument & expected: ', &
+                         TRIM(log_event%place), '  given: ',  TRIM( place )
+       CALL message( 'cpu_log', 'PA0174', 1, 2, 0, 6, 0 )
     ENDIF
 
@@ -71 +71 @@
     mtime = IRTC( ) * 1E-9
 #else
-    IF ( myid == 0 )  THEN
-       PRINT*, '+++ cpu_log: no time measurement defined on this host'
-    ENDIF
-    CALL local_stop
+    message_string = 'no time measurement defined on this host'
+    CALL message( 'cpu_log', 'PA0175', 1, 2, 0, 6, 0 )
 #endif
 
@@ -84 +82 @@
     ELSEIF ( modus == 'pause' )  THEN
        IF ( ( mtime - log_event%mtime ) < 0.0  .AND.  first )  THEN
-          PRINT*,'+++ WARNING: cpu_log: negative time interval occured'
-          PRINT*,'+++ PE',myid,' L=PAUSE "',TRIM(log_event%place),'" new=', &
-                 mtime,' last=',log_event%mtime
+          WRITE( message_string, * ) 'negative time interval occured', &
+                                     ' &PE',myid,' L=PAUSE "',TRIM(log_event%place),'" new=', &
+                                      mtime,' last=',log_event%mtime
+          CALL message( 'cpu_log', 'PA0176', 0, 1, -1, 6, 0 )
           first = .FALSE.
        ENDIF
@@ -94 +93 @@
        IF ( ( mtime - log_event%mtime + log_event%isum ) < 0.0  .AND. &
             first )  THEN
-          PRINT*,'+++ WARNING: cpu_log: negative time interval occured'
-          PRINT*,'+++ PE',myid,' L=STOP "',TRIM(log_event%place),'" new=', &
-                 mtime,' last=',log_event%mtime,' isum=',log_event%isum
+          WRITE( message_string, * ) 'negative time interval occured', &
+                                     ' &PE',myid,' L=STOP "',TRIM(log_event%place),'" new=', &
+                                      mtime,' last=',log_event%mtime,' isum=',log_event%isum
+          CALL message( 'cpu_log', 'PA0177', 0, 1, -1, 6, 0 )
           first = .FALSE.
        ENDIF
@@ -103 +103 @@
        log_event%sum      = log_event%sum  + log_event%mtime
        IF ( log_event%sum < 0.0  .AND.  first )  THEN
-          PRINT*,'+++ WARNING: cpu_log: negative time interval occured'
-          PRINT*,'+++ PE',myid,' L=STOP "',TRIM(log_event%place),'" sum=', &
-                 log_event%sum,' mtime=',log_event%mtime
+          WRITE( message_string, * ) 'negative time interval occured',&
+                                     ' &PE',myid,' L=STOP "',TRIM(log_event%place),'" sum=', &
+                                      log_event%sum,' mtime=',log_event%mtime
+          CALL message( 'cpu_log', 'PA0178', 0, 1, -1, 6, 0 )
           first = .FALSE.
        ENDIF
@@ -113 +114 @@
        log_event%ivect    = 0.0
     ELSE
-       PRINT*, '+++ unknown modus of time measurement: ', modus
+       message_string = 'unknown modus of time measurement: ' // TRIM( modus )
+       CALL message( 'cpu_log', 'PA0179', 0, 1, -1, 6, 0 )
     ENDIF