Changeset 2547 for palm/trunk/SOURCE/land_surface_model_mod.f90

Timestamp:

Oct 16, 2017 12:41:56 PM (7 years ago)

Author:

schwenkel

Message:

extended by cloud_droplets option

File:

• palm/trunk/SOURCE/land_surface_model_mod.f90 (modified) (6 diffs)

palm/trunk/SOURCE/land_surface_model_mod.f90

@@ -25 +25 @@
 ! -----------------
 ! $Id$
+! extended by cloud_droplets option
+! 
+! 2532 2017-10-11 16:00:46Z scharf
 ! bugfixes in data_output_3d
 ! 
@@ -281 +284 @@
 
     USE control_parameters,                                                    &
-        ONLY:  cloud_physics, coupling_start_time, dt_3d, end_time, humidity,  &
-               intermediate_timestep_count,                                    &
+        ONLY:  cloud_droplets, cloud_physics, coupling_start_time, dt_3d,      &
+               end_time, humidity, intermediate_timestep_count,                &
                initializing_actions, intermediate_timestep_count_max,          &
                land_surface, max_masks, precipitation, pt_surface,             &
@@ -1531 +1534 @@
           pt1 = pt(k,j,i) + l_d_cp * pt_d_t(k) * ql(k,j,i)
           qv1 = q(k,j,i) - ql(k,j,i)
+       ELSEIF ( cloud_droplets ) THEN
+          pt1 = pt(k,j,i) + l_d_cp * pt_d_t(k) * ql(k,j,i)
+          qv1 = q(k,j,i) 
        ELSE
           pt1 = pt(k,j,i)
@@ -1950 +1956 @@
 !
 !--       Calculate specific humidity at saturation
-          q_s = 0.622_wp * e_s / surface_pressure
+          q_s = 0.622_wp * e_s / surface_pressure - e_s 
 
           resistance = surf%r_a(m) / ( surf%r_a(m) + surf%r_s(m) )
@@ -2491 +2497 @@
              ENDIF
              
-             IF ( cloud_physics )  THEN
+             IF ( cloud_physics  .OR.  cloud_droplets )  THEN
                 pt1 = pt(k,j,i) + l_d_cp * pt_d_t(k) * ql(k,j,i)
              ELSE
@@ -2585 +2591 @@
                 k   = surf_lsm_v(l)%k(m)
 
-                IF ( cloud_physics )  THEN
+                IF ( cloud_physics  .OR.  cloud_droplets )  THEN
                    pt1 = pt(k,j,i) + l_d_cp * pt_d_t(k) * ql(k,j,i)
                 ELSE