Changeset 978 for palm/trunk/SOURCE/prandtl_fluxes.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/prandtl_fluxes.f90 (modified) (5 diffs)

palm/trunk/SOURCE/prandtl_fluxes.f90

@@ -4 +4 @@
 ! Current revisions:
 ! -----------------
-! 
+! roughness length for scalar quantities z0h added
 !
 ! Former revisions:
@@ -96 +96 @@
 !
 !--             Stable stratification
-                ts(j,i) = kappa * ( pt(k+1,j,i) - pt(k,j,i) ) / (          &
-                                  LOG( z_p / z0(j,i) ) +                   &
-                                  5.0 * rif(j,i) * ( z_p - z0(j,i) ) / z_p &
+                ts(j,i) = kappa * ( pt(k+1,j,i) - pt(k,j,i) ) / (           &
+                                  LOG( z_p / z0h(j,i) ) +                   &
+                                  5.0 * rif(j,i) * ( z_p - z0h(j,i) ) / z_p &
                                                                 )
              ELSE
@@ -104 +104 @@
 !--             Unstable stratification
                 a = SQRT( 1.0 - 16.0 * rif(j,i) )
-                b = SQRT( 1.0 - 16.0 * rif(j,i) * z0(j,i) / z_p )
-
-                ts(j,i) = kappa * ( pt(k+1,j,i) - pt(k,j,i) ) /  (         &
-                          LOG( z_p / z0(j,i) ) -                           &
+                b = SQRT( 1.0 - 16.0 * rif(j,i) * z0h(j,i) / z_p )
+
+                ts(j,i) = kappa * ( pt(k+1,j,i) - pt(k,j,i) ) /  (          &
+                          LOG( z_p / z0h(j,i) ) -                           &
                           2.0 * LOG( ( 1.0 + a ) / ( 1.0 + b ) ) )
              ENDIF
@@ -308 +308 @@
 !
 !--                Stable stratification
-                   qs(j,i) = kappa * ( q(k+1,j,i) - q(k,j,i) ) / (         &
-                                  LOG( z_p / z0(j,i) ) +                   &
-                                  5.0 * rif(j,i) * ( z_p - z0(j,i) ) / z_p &
+                   qs(j,i) = kappa * ( q(k+1,j,i) - q(k,j,i) ) / (          &
+                                  LOG( z_p / z0h(j,i) ) +                   &
+                                  5.0 * rif(j,i) * ( z_p - z0h(j,i) ) / z_p &
                                                                  )
                 ELSE
@@ -316 +316 @@
 !--                Unstable stratification
                    a = SQRT( 1.0 - 16.0 * rif(j,i) ) 
-                   b = SQRT( 1.0 - 16.0 * rif(j,i) * z0(j,i) / z_p ) 
+                   b = SQRT( 1.0 - 16.0 * rif(j,i) * z0h(j,i) / z_p ) 
  
-                   qs(j,i) = kappa * ( q(k+1,j,i) - q(k,j,i) ) /   (   &
-                             LOG( z_p / z0(j,i) ) -                    &
+                   qs(j,i) = kappa * ( q(k+1,j,i) - q(k,j,i) ) /   (        &
+                             LOG( z_p / z0h(j,i) ) -                        &
                               2.0 * LOG( (1.0 + a ) / ( 1.0 + b ) ) )
                 ENDIF