Changeset 2547 for palm/trunk/SOURCE/surface_layer_fluxes_mod.f90
- Timestamp:
- Oct 16, 2017 12:41:56 PM (7 years ago)
- File:
-
- 1 edited
Legend:
- Unmodified
- Added
- Removed
-
palm/trunk/SOURCE/surface_layer_fluxes_mod.f90
r2321 r2547 25 25 ! ----------------- 26 26 ! $Id$ 27 ! extended by cloud_droplets option 28 ! 29 ! 2321 2017-07-24 15:57:07Z schwenkel 27 30 ! Bugfix: Correct index in lookup table for Obukhov length 28 31 ! … … 201 204 202 205 USE control_parameters, & 203 ONLY: cloud_ physics, constant_heatflux, constant_scalarflux,&204 constant_ waterflux, coupling_mode, g, humidity, ibc_e_b,&205 ibc_pt_b, initializing_actions, kappa,&206 ONLY: cloud_droplets, cloud_physics, constant_heatflux, & 207 constant_scalarflux, constant_waterflux, coupling_mode, g, & 208 humidity, ibc_e_b, ibc_pt_b, initializing_actions, kappa, & 206 209 intermediate_timestep_count, intermediate_timestep_count_max, & 207 210 land_surface, large_scale_forcing, lsf_surf, & … … 291 294 !-- temperature and specific humidity at first grid level from the fields pt 292 295 !-- and q 293 IF ( cloud_physics ) THEN296 IF ( cloud_physics .OR. cloud_droplets ) THEN 294 297 ! 295 298 !-- First call for horizontal default-type surfaces (l=0 - upward facing, … … 1396 1399 1397 1400 ENDDO 1398 ELSEIF ( cloud_physics ) THEN1401 ELSEIF ( cloud_physics .OR. cloud_droplets ) THEN 1399 1402 !$OMP PARALLEL DO PRIVATE( i, j, k, z_mo ) 1400 1403 DO m = 1, surf%ns … … 1529 1532 k = surf%k(m) 1530 1533 1531 surf%pt1(m) = pt(k,j,i) + l_d_cp * pt_d_t(k) * ql(k,j,i) 1532 surf%qv1(m) = q(k,j,i) - ql(k,j,i) 1534 IF ( cloud_physics ) THEN 1535 surf%pt1(m) = pt(k,j,i) + l_d_cp * pt_d_t(k) * ql(k,j,i) 1536 surf%qv1(m) = q(k,j,i) - ql(k,j,i) 1537 ELSEIF( cloud_droplets ) THEN 1538 surf%pt1(m) = pt(k,j,i) + l_d_cp * pt_d_t(k) * ql(k,j,i) 1539 surf%qv1(m) = q(k,j,i) 1540 ENDIF 1533 1541 1534 1542 ENDDO … … 1584 1592 ENDIF 1585 1593 1586 IF ( cloud_physics ) THEN1594 IF ( cloud_physics .OR. cloud_droplets ) THEN 1587 1595 !$OMP PARALLEL DO PRIVATE( i, j, k, z_mo ) 1588 1596 DO m = 1, surf%ns … … 1685 1693 ENDIF 1686 1694 1687 IF ( cloud_physics ) THEN1695 IF ( cloud_physics .OR. cloud_droplets ) THEN 1688 1696 !$OMP PARALLEL DO PRIVATE( i, j, k, z_mo ) 1689 1697 DO m = 1, surf%ns
Note: See TracChangeset
for help on using the changeset viewer.