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

Timestamp:

Aug 9, 2012 8:28:32 AM (12 years ago)

Author:

fricke

Message:

merge fricke branch back into trunk

Location:

palm/trunk

Files:

• . (modified) (1 prop)
• SOURCE (modified) (1 prop)
• SOURCE/header.f90 (modified) (5 diffs)

palm/trunk/SOURCE/header.f90

@@ -4 +4 @@
 ! Current revisions:
 ! -----------------
-!
+! -km_damp_max, outflow_damping_width
+! +pt_damping_factor, pt_damping_width
+! +z0h
 !
 ! Former revisions:
@@ -704 +706 @@
 
     IF ( prandtl_layer )  THEN
-       WRITE ( io, 305 )  (zu(1)-zu(0)), roughness_length, kappa, &
+       WRITE ( io, 305 )  (zu(1)-zu(0)), roughness_length, &
+                          z0h_factor*roughness_length, kappa, &
                           rif_min, rif_max
        IF ( .NOT. constant_heatflux )  WRITE ( io, 308 )
@@ -721 +724 @@
     WRITE ( io, 317 )  bc_lr, bc_ns
     IF ( .NOT. bc_lr_cyc  .OR.  .NOT. bc_ns_cyc )  THEN
-       WRITE ( io, 318 )  outflow_damping_width, km_damp_max
+       WRITE ( io, 318 )  pt_damping_width, pt_damping_factor       
        IF ( turbulent_inflow )  THEN
           WRITE ( io, 319 )  recycling_width, recycling_plane, &
@@ -1779 +1782 @@
 305 FORMAT (//'    Prandtl-Layer between bottom surface and first ', &
                'computational u,v-level:'// &
-             '       zp = ',F6.2,' m   z0 = ',F6.4,' m   kappa = ',F4.2/ &
+             '       zp = ',F6.2,' m   z0 = ',F6.4,' m   z0h = ',F7.5,&
+             ' m   kappa = ',F4.2/ &
              '       Rif value range:   ',F6.2,' <= rif <=',F6.2)
 306 FORMAT ('       Predefined constant heatflux:   ',F9.6,' K m/s')
@@ -1797 +1801 @@
             '       left/right:  ',A/    &
             '       north/south: ',A)
-318 FORMAT (/'       outflow damping layer width: ',I3,' gridpoints with km_', &
-                    'max =',F5.1,' m**2/s')
+318 FORMAT (/'       pt damping layer width = ',F7.2,' m, pt ', &
+                    'damping factor = ',F6.4)
 319 FORMAT ('       turbulence recycling at inflow switched on'/ &
             '       width of recycling domain: ',F7.1,' m   grid index: ',I4/ &