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

palm/trunk/SOURCE/init_1d_model.f90

@@ -4 +4 @@
 ! Current revisions:
 ! -----------------
-! 
+! roughness length for scalar quantities z0h1d added
 !
 ! Former revisions:
@@ -149 +149 @@
     vsws1d = 0.0; vsws1d_m = 0.0
     z01d = roughness_length
+    z0h1d = z0h_factor * z01d 
     IF ( humidity .OR. passive_scalar )  qs1d = 0.0
 
@@ -445 +446 @@
 !--                Stable stratification
                    ts1d = kappa * ( pt_init(nzb+1) - pt_init(nzb) ) /      &
-                          ( LOG( zu(nzb+1) / z01d ) + 5.0 * rif1d(nzb+1) * &
-                                          ( zu(nzb+1) - z01d ) / zu(nzb+1) &
+                          ( LOG( zu(nzb+1) / z0h1d ) + 5.0 * rif1d(nzb+1) * &
+                                          ( zu(nzb+1) - z0h1d ) / zu(nzb+1) &
                           )
                 ELSE
@@ -452 +453 @@
 !--                Unstable stratification
                    a = SQRT( 1.0 - 16.0 * rif1d(nzb+1) )
-                   b = SQRT( 1.0 - 16.0 * rif1d(nzb+1) / zu(nzb+1) * z01d )
+                   b = SQRT( 1.0 - 16.0 * rif1d(nzb+1) / zu(nzb+1) * z0h1d )
 !
 !--                In the borderline case the formula for stable stratification 
@@ -459 +460 @@
                    IF ( a == 0.0  .OR.  b == 0.0 )  THEN
                       ts1d = kappa * ( pt_init(nzb+1) - pt_init(nzb) ) /      &
-                             ( LOG( zu(nzb+1) / z01d ) + 5.0 * rif1d(nzb+1) * &
-                                             ( zu(nzb+1) - z01d ) / zu(nzb+1) &
+                             ( LOG( zu(nzb+1) / z0h1d ) + 5.0 * rif1d(nzb+1) * &
+                                             ( zu(nzb+1) - z0h1d ) / zu(nzb+1) &
                              )
                    ELSE
@@ -578 +579 @@
 !--                Stable stratification
                    qs1d = kappa * ( q_init(nzb+1) - q_init(nzb) ) /        &
-                          ( LOG( zu(nzb+1) / z01d ) + 5.0 * rif1d(nzb+1) * &
-                                          ( zu(nzb+1) - z01d ) / zu(nzb+1) &
+                          ( LOG( zu(nzb+1) / z0h1d ) + 5.0 * rif1d(nzb+1) * &
+                                          ( zu(nzb+1) - z0h1d ) / zu(nzb+1) &
                           )
                 ELSE
@@ -585 +586 @@
 !--                Unstable stratification
                    a = SQRT( 1.0 - 16.0 * rif1d(nzb+1) )
-                   b = SQRT( 1.0 - 16.0 * rif1d(nzb+1) / zu(nzb+1) * z01d )
+                   b = SQRT( 1.0 - 16.0 * rif1d(nzb+1) / zu(nzb+1) * z0h1d )
 !
 !--                In the borderline case the formula for stable stratification 
@@ -592 +593 @@
                    IF ( a == 1.0  .OR.  b == 1.0 )  THEN
                       qs1d = kappa * ( q_init(nzb+1) - q_init(nzb) ) /        &
-                             ( LOG( zu(nzb+1) / z01d ) + 5.0 * rif1d(nzb+1) * &
-                                             ( zu(nzb+1) - z01d ) / zu(nzb+1) &
+                             ( LOG( zu(nzb+1) / z0h1d ) + 5.0 * rif1d(nzb+1) * &
+                                             ( zu(nzb+1) - z0h1d ) / zu(nzb+1) &
                              )
                    ELSE