Changeset 1960 for palm/trunk/SOURCE/init_1d_model.f90

Timestamp:

Jul 12, 2016 4:34:24 PM (9 years ago)

Author:

suehring

Message:

Separate balance equations for humidity and passive_scalar

File:

• palm/trunk/SOURCE/init_1d_model.f90 (modified) (5 diffs)

palm/trunk/SOURCE/init_1d_model.f90

@@ -19 +19 @@
 ! Current revisions:
 ! -----------------
-! 
+! Remove passive_scalar from IF-statements, as 1D-scalar profile is effectively
+! not used.
+! Formatting adjustment
 !
 ! Former revisions:
@@ -108 +110 @@
     USE control_parameters,                                                    &
         ONLY:  constant_diffusion, constant_flux_layer, f, humidity, kappa,    &
-               km_constant, mixing_length_1d, passive_scalar, prandtl_number,  &
+               km_constant, mixing_length_1d, prandtl_number,                  &
                roughness_length, simulated_time_chr, z0h_factor
 
@@ -194 +196 @@
     z01d  = roughness_length
     z0h1d = z0h_factor * z01d 
-    IF ( humidity .OR. passive_scalar )  qs1d = 0.0_wp
+    IF ( humidity )  qs1d = 0.0_wp
 
 !
@@ -232 +234 @@
                humidity, intermediate_timestep_count,                          &
                intermediate_timestep_count_max, f, g, ibc_e_b, kappa,          &  
-               mixing_length_1d, passive_scalar,                               &
+               mixing_length_1d,                                               &
                simulated_time_chr, timestep_scheme, tsc, zeta_max, zeta_min
                 
@@ -619 +621 @@
                 e1d(nzb) = e1d(nzb+1)
 
-                IF ( humidity .OR. passive_scalar ) THEN
+                IF ( humidity ) THEN
 !
 !--                Compute q* 
                    IF ( rif1d(1) >= 0.0_wp )  THEN
 !
-!--                Stable stratification
-                   qs1d = kappa * ( q_init(nzb+1) - q_init(nzb) ) /            &
+!--                   Stable stratification
+                      qs1d = kappa * ( q_init(nzb+1) - q_init(nzb) ) /         &
                           ( LOG( zu(nzb+1) / z0h1d ) + 5.0_wp * rif1d(nzb+1) * &
                                           ( zu(nzb+1) - z0h1d ) / zu(nzb+1)    &
                           )
-                ELSE
-!
-!--                Unstable stratification
-                   a = SQRT( 1.0_wp - 16.0_wp * rif1d(nzb+1) )
-                   b = SQRT( 1.0_wp - 16.0_wp * rif1d(nzb+1) /                 &
-                                      zu(nzb+1) * z0h1d )
-!
-!--                In the borderline case the formula for stable stratification 
-!--                must be applied, because otherwise a zero division would
-!--                occur in the argument of the logarithm.
-                   IF ( a == 1.0_wp  .OR.  b == 1.0_wp )  THEN
-                      qs1d = kappa * ( q_init(nzb+1) - q_init(nzb) ) /         &
-                             ( LOG( zu(nzb+1) / z0h1d ) +                      &
-                               5.0_wp * rif1d(nzb+1) *                         &
-                               ( zu(nzb+1) - z0h1d ) / zu(nzb+1)               &
-                             )
                    ELSE
-                      qs1d = kappa * ( q_init(nzb+1) - q_init(nzb) ) /         &
-                             LOG( (a-1.0_wp) / (a+1.0_wp) *                    &
-                                  (b+1.0_wp) / (b-1.0_wp) )
-                   ENDIF
-                ENDIF                
+!
+!--                   Unstable stratification
+                      a = SQRT( 1.0_wp - 16.0_wp * rif1d(nzb+1) )
+                      b = SQRT( 1.0_wp - 16.0_wp * rif1d(nzb+1) /              &
+                                         zu(nzb+1) * z0h1d )
+!
+!--                   In the borderline case the formula for stable stratification 
+!--                   must be applied, because otherwise a zero division would
+!--                   occur in the argument of the logarithm.
+                      IF ( a == 1.0_wp  .OR.  b == 1.0_wp )  THEN
+                         qs1d = kappa * ( q_init(nzb+1) - q_init(nzb) ) /      &
+                                ( LOG( zu(nzb+1) / z0h1d ) +                   &
+                                  5.0_wp * rif1d(nzb+1) *                      &
+                                  ( zu(nzb+1) - z0h1d ) / zu(nzb+1)            &
+                                )
+                      ELSE
+                         qs1d = kappa * ( q_init(nzb+1) - q_init(nzb) ) /      &
+                                LOG( (a-1.0_wp) / (a+1.0_wp) *                 &
+                                     (b+1.0_wp) / (b-1.0_wp) )
+                      ENDIF
+                   ENDIF                
                 ELSE
                    qs1d = 0.0_wp