Ignore:
Timestamp:
Oct 16, 2017 12:41:56 PM (4 years ago)
Author:
schwenkel
Message:

extended by cloud_droplets option

File:
1 edited

Legend:

Unmodified
Added
Removed
  • palm/trunk/SOURCE/land_surface_model_mod.f90

    r2532 r2547  
    2525! -----------------
    2626! $Id$
     27! extended by cloud_droplets option
     28!
     29! 2532 2017-10-11 16:00:46Z scharf
    2730! bugfixes in data_output_3d
    2831!
     
    281284
    282285    USE control_parameters,                                                    &
    283         ONLY:  cloud_physics, coupling_start_time, dt_3d, end_time, humidity,  &
    284                intermediate_timestep_count,                                    &
     286        ONLY:  cloud_droplets, cloud_physics, coupling_start_time, dt_3d,      &
     287               end_time, humidity, intermediate_timestep_count,                &
    285288               initializing_actions, intermediate_timestep_count_max,          &
    286289               land_surface, max_masks, precipitation, pt_surface,             &
     
    15311534          pt1 = pt(k,j,i) + l_d_cp * pt_d_t(k) * ql(k,j,i)
    15321535          qv1 = q(k,j,i) - ql(k,j,i)
     1536       ELSEIF ( cloud_droplets ) THEN
     1537          pt1 = pt(k,j,i) + l_d_cp * pt_d_t(k) * ql(k,j,i)
     1538          qv1 = q(k,j,i)
    15331539       ELSE
    15341540          pt1 = pt(k,j,i)
     
    19501956!
    19511957!--       Calculate specific humidity at saturation
    1952           q_s = 0.622_wp * e_s / surface_pressure
     1958          q_s = 0.622_wp * e_s / surface_pressure - e_s
    19531959
    19541960          resistance = surf%r_a(m) / ( surf%r_a(m) + surf%r_s(m) )
     
    24912497             ENDIF
    24922498             
    2493              IF ( cloud_physics )  THEN
     2499             IF ( cloud_physics  .OR.  cloud_droplets )  THEN
    24942500                pt1 = pt(k,j,i) + l_d_cp * pt_d_t(k) * ql(k,j,i)
    24952501             ELSE
     
    25852591                k   = surf_lsm_v(l)%k(m)
    25862592
    2587                 IF ( cloud_physics )  THEN
     2593                IF ( cloud_physics  .OR.  cloud_droplets )  THEN
    25882594                   pt1 = pt(k,j,i) + l_d_cp * pt_d_t(k) * ql(k,j,i)
    25892595                ELSE
Note: See TracChangeset for help on using the changeset viewer.