Changeset 336 for palm/trunk/SOURCE/header.f90

Timestamp:

Jun 10, 2009 11:19:35 AM (15 years ago)

Author:

raasch

Message:

several small bugfixes; some more dvrp changes

File:

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

palm/trunk/SOURCE/header.f90

@@ -7 +7 @@
 ! Coupling with independent precursor runs.
 ! Output of messages replaced by message handling routine.
-! Output of cluster_size
+! Output of several additional dvr parameters
 ! +canyon_height, canyon_width_x, canyon_width_y, canyon_wall_left,
 ! canyon_wall_south, conserve_volume_flow_mode, dp_external, dp_level_b, 
@@ -108 +108 @@
 
     INTEGER ::  av, bh, blx, bly, bxl, bxr, byn, bys, ch, cwx, cwy, cxl, cxr, &
-                cyn, cys, i, ihost, io, j, l, ll, mpi_type
+                cyn, cys, i, ihost, io, j, l, ll, m, mpi_type
     REAL    ::  cpuseconds_per_simulated_second
 
@@ -1019 +1019 @@
        i = 1
        l = 0
+       m = 0
        DO WHILE ( mode_dvrp(i) /= ' ' )
           IF ( mode_dvrp(i)(1:10) == 'isosurface' )  THEN
@@ -1024 +1025 @@
              l = l + 1
              IF ( do3d(0,j) /= ' ' )  THEN
-                WRITE ( io, 361 )  TRIM( do3d(0,j) ), threshold(l)
+                WRITE ( io, 361 )  TRIM( do3d(0,j) ), threshold(l), &
+                                   isosurface_color(:,l)
              ENDIF
           ELSEIF ( mode_dvrp(i)(1:6) == 'slicer' )  THEN
              READ ( mode_dvrp(i), '(6X,I2)' )  j
-             IF ( do2d(0,j) /= ' ' )  WRITE ( io, 362 )  TRIM( do2d(0,j) )
+             m = m + 1
+             IF ( do2d(0,j) /= ' ' )  THEN
+                WRITE ( io, 362 )  TRIM( do2d(0,j) ), &
+                                   slicer_range_limits_dvrp(:,m)
+             ENDIF
           ELSEIF ( mode_dvrp(i)(1:9) == 'particles' )  THEN
-             WRITE ( io, 363 )
+             WRITE ( io, 363 )  dvrp_psize
+             IF ( particle_dvrpsize /= 'none' )  THEN
+                WRITE ( io, 364 )  'size', TRIM( particle_dvrpsize ), &
+                                   dvrpsize_interval
+             ENDIF
+             IF ( particle_color /= 'none' )  THEN
+                WRITE ( io, 364 )  'color', TRIM( particle_color ), &
+                                   color_interval
+             ENDIF
           ENDIF
           i = i + 1
        ENDDO
 
-       IF ( TRIM( topography ) /= 'flat'  .AND.  cluster_size > 1 )  THEN
-          WRITE ( io, 364 )  cluster_size
+       WRITE ( io, 365 )  groundplate_color, superelevation_x, &
+                          superelevation_y, superelevation, clip_dvrp_l, &
+                          clip_dvrp_r, clip_dvrp_s, clip_dvrp_n
+
+       IF ( TRIM( topography ) /= 'flat' )  THEN
+          WRITE ( io, 366 )  topography_color
+          IF ( cluster_size > 1 )  THEN
+             WRITE ( io, 367 )  cluster_size
+          ENDIF
        ENDIF
 
@@ -1301 +1322 @@
        IF ( particles_per_point > 1 )  WRITE ( io, 489 )  particles_per_point
        WRITE ( io, 495 )  total_number_of_particles
-       IF ( .NOT. vertical_particle_advection )  WRITE ( io, 482 )
        IF ( maximum_number_of_tailpoints /= 0 )  THEN
           WRITE ( io, 483 )  maximum_number_of_tailpoints
@@ -1343 +1363 @@
           WRITE ( io, 493 )  psl(i), psr(i), pss(i), psn(i), psb(i), pst(i), &
                              pdx(i), pdy(i), pdz(i)
+          IF ( .NOT. vertical_particle_advection(i) )  WRITE ( io, 482 )
        ENDDO
 
@@ -1602 +1623 @@
             '       Directory:        ',A// &
             '       The sequence contains:')
-361 FORMAT ('       Isosurface of ',A,'  Threshold value: ', E12.3)
-362 FORMAT ('       Sectional plane ',A)
-363 FORMAT ('       Particles')
-364 FORMAT (/'       Polygon reduction for topography: cluster_size = ', I1)
+361 FORMAT ('       Isosurface of ',A,'  Threshold value: ', E12.3/ &
+            '       Isosurface color: (',F4.2,',',F4,2,',',F4.2,') (R,G,B)')
+362 FORMAT ('       Slicer plane ',A/ &
+            '       Slicer limits: [',F6.2,',',F6.2,']')
+363 FORMAT ('       Particles'/ &
+            '          particle size:  ',F7.2,' m')
+364 FORMAT ('          particle ',A,' controlled by "',A,'" with interval [', &
+                       F6.2,',',F6.2,']')
+365 FORMAT (/'       Groundplate color: (',F4.2,',',F4,2,',',F4.2,') (R,G,B)'/ &
+            '       Superelevation along (x,y,z): (',F4.1,',',F4.1,',',F4.1, &
+                     ')'/ &
+            '       Clipping limits: from x = ',F9.1,' m to x = ',F9.1,' m'/ &
+            '                        from y = ',F9.1,' m to y = ',F9.1,' m')
+366 FORMAT (/'       Topography color: (',F4.2,',',F4,2,',',F4.2,') (R,G,B)')
+367 FORMAT ('       Polygon reduction for topography: cluster_size = ', I1)
 #endif
 #if defined( __spectra )
@@ -1715 +1747 @@
             '       Particles are sorted every ',F9.1,' s'/)
 481 FORMAT ('       Particles have random start positions'/)
-482 FORMAT ('       Particles are advected only horizontally'/)
+482 FORMAT ('          Particles are advected only horizontally'/)
 483 FORMAT ('       Particles have tails with a maximum of ',I3,' points')
 484 FORMAT ('            Number of tails of the total domain: ',I10/ &