Changeset 254 for palm/trunk/SOURCE/init_particles.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/init_particles.f90 (modified) (9 diffs)

palm/trunk/SOURCE/init_particles.f90

@@ -2 +2 @@
 
 !------------------------------------------------------------------------------!
-! Actual revisions:
+! Current revisions:
 ! -----------------
+! Output of messages replaced by message handling routine
 ! Bugfix: arrays for tails are allocated with a minimum size of 10 tails if
 ! there is no tail initially
@@ -97 +98 @@
 !-- Check the number of particle groups.
     IF ( number_of_particle_groups > max_number_of_particle_groups )  THEN
-       PRINT*, '+++ WARNING: init_particles: ', &
-                    'max_number_of_particle_groups =', &
-               max_number_of_particle_groups
-       PRINT*, '+++          number_of_particle_groups reset to ', &
-               max_number_of_particle_groups
+       WRITE( message_string, * ) 'max_number_of_particle_groups =', &
+                                  max_number_of_particle_groups , &
+                                  '&number_of_particle_groups reset to ', &
+                                  max_number_of_particle_groups
+       CALL message( 'init_particles', 'PA0213', 0, 1, 0, 6, 0 )
        number_of_particle_groups = max_number_of_particle_groups
     ENDIF
@@ -152 +153 @@
        particle_binary_version = '3.0'
        IF ( TRIM( version_on_file ) /= TRIM( particle_binary_version ) )  THEN
-          IF ( myid == 0 )  THEN
-             PRINT*, '+++ init_particles: version mismatch concerning data ', &
-                     'from prior run'
-             PRINT*, '        version on file    = "', TRIM( version_on_file ),&
-                     '"'
-             PRINT*, '        version in program = "', &
-                     TRIM( particle_binary_version ), '"'
-          ENDIF
-          CALL local_stop
+          message_string = 'version mismatch concerning data from prior run' // &
+                           '&version on file    = "' // TRIM( version_on_file ) // &
+                           '&version in program = "' // &
+                           TRIM( particle_binary_version ) // '"'
+          CALL message( 'init_particles', 'PA0214', 1, 2, 0, 6, 0 )
        ENDIF
 
@@ -234 +231 @@
        DO  i = 1, number_of_particle_groups
           IF ( density_ratio(i) /= 0.0  .AND.  radius(i) == 0 )  THEN
-             IF ( myid == 0 )  THEN
-                PRINT*, '+++ init_particles: particle group #', i, 'has a', &
-                        'density ratio /= 0 but radius = 0'
-             ENDIF
-             CALL local_stop
+             WRITE( message_string, * ) 'particle group #', i, 'has a', &
+                                        'density ratio /= 0 but radius = 0'
+             CALL message( 'init_particles', 'PA0215', 1, 2, 0, 6, 0 )
           ENDIF
           particle_groups(i)%density_ratio = density_ratio(i)
@@ -273 +268 @@
                             n = n + 1
                             IF ( n > maximum_number_of_particles )  THEN
-                               PRINT*,'+++ init_particles: number of initial', &
-                                      ' particles (', n, ') exceeds'
-                               PRINT*,'    maximum_number_of_particles (',     &
-                                      maximum_number_of_particles, ') on PE ', &
-                                      myid
-#if defined( __parallel )
-                               CALL MPI_ABORT( comm2d, 9999, ierr )
-#else
-                               CALL local_stop
-#endif
+                               WRITE( message_string, * ) 'number of initial', &
+                                             'particles (', n, ') exceeds', &
+                                             '&maximum_number_of_particles (', &
+                                             maximum_number_of_particles, ') on PE ', &
+                                             myid
+                               CALL message( 'init_particles', 'PA0216', 2, 2, 0, 6, 0 )
                             ENDIF
                             particles(n)%x             = pos_x
@@ -519 +510 @@
           
        CASE DEFAULT
-          IF ( myid == 0 )  THEN
-             PRINT*,'+++ init_particles: unknown boundary condition ',   &
-                         'bc_par_b = "', TRIM( bc_par_b ), '"'
-          ENDIF
-          CALL local_stop
+          WRITE( message_string, * )  'unknown boundary condition ',   &
+                                       'bc_par_b = "', TRIM( bc_par_b ), '"'
+          CALL message( 'init_particles', 'PA0217', 1, 2, 0, 6, 0 )
           
     END SELECT
@@ -535 +524 @@
           
        CASE DEFAULT
-          IF ( myid == 0 )  THEN
-             PRINT*,'+++ init_particles: unknown boundary condition ',   &
-                         'bc_par_t = "', TRIM( bc_par_t ), '"'
-          ENDIF
-          CALL local_stop
+          WRITE( message_string, * ) 'unknown boundary condition ',   &
+                                     'bc_par_t = "', TRIM( bc_par_t ), '"'
+          CALL message( 'init_particles', 'PA0218', 1, 2, 0, 6, 0 )
           
     END SELECT
@@ -554 +541 @@
           
        CASE DEFAULT
-          IF ( myid == 0 )  THEN
-             PRINT*,'+++ init_particles: unknown boundary condition ',   &
-                         'bc_par_lr = "', TRIM( bc_par_lr ), '"'
-          ENDIF
-          CALL local_stop
+          WRITE( message_string, * ) 'unknown boundary condition ',   &
+                                     'bc_par_lr = "', TRIM( bc_par_lr ), '"'
+          CALL message( 'init_particles', 'PA0219', 1, 2, 0, 6, 0 )
           
     END SELECT
@@ -573 +558 @@
           
        CASE DEFAULT
-          IF ( myid == 0 )  THEN
-             PRINT*,'+++ init_particles: unknown boundary condition ',   &
-                         'bc_par_ns = "', TRIM( bc_par_ns ), '"'
-          ENDIF
-          CALL local_stop
+          WRITE( message_string, * ) 'unknown boundary condition ',   &
+                                     'bc_par_ns = "', TRIM( bc_par_ns ), '"'
+          CALL message( 'init_particles', 'PA0220', 1, 2, 0, 6, 0 )
           
     END SELECT