/[lmdze]/trunk/Sources/phylmd/Conflx/conflx.f
ViewVC logotype

Diff of /trunk/Sources/phylmd/Conflx/conflx.f

Parent Directory Parent Directory | Revision Log Revision Log | View Patch Patch

revision 82 by guez, Wed Mar 5 14:57:53 2014 UTC revision 103 by guez, Fri Aug 29 13:00:05 2014 UTC
# Line 4  module conflx_m Line 4  module conflx_m
4    
5  contains  contains
6    
7    SUBROUTINE conflx (dtime, pres_h, pres_f, t, q, con_t, con_q, qhfl, w, &    SUBROUTINE conflx(dtime, pres_h, pres_f, t, q, con_t, con_q, qhfl, w, &
8         d_t, d_q, rain, snow, mfu, mfd, pen_u, pde_u, pen_d, pde_d, kcbot, &         d_t, d_q, rain, snow, mfu, mfd, pen_u, pde_u, pen_d, pde_d, kcbot, &
9         kctop, kdtop, pmflxr, pmflxs)         kctop, kdtop, pmflxr, pmflxs)
10    
# Line 117  contains Line 117  contains
117            zcvgt(i, k) = con_t(i, klev-k + 1)            zcvgt(i, k) = con_t(i, klev-k + 1)
118            zcvgq(i, k) = con_q(i, klev-k + 1)            zcvgq(i, k) = con_q(i, klev-k + 1)
119    
120            zqsat = MIN(0.5, R2ES * FOEEW(t(i, k), &            zqsat = MIN(0.5, R2ES * FOEEW(t(i, k), rtt >= t(i, k)) &
121                 merge(0., 1., rtt < t(i, k))) / paprsf(i, k))                 / paprsf(i, k))
122            qsen(i, k) = zqsat / (1. - RETV * zqsat)            qsen(i, k) = zqsat / (1. - RETV * zqsat)
123         ENDDO         ENDDO
124      ENDDO      ENDDO

Legend:
Removed from v.82  
changed lines
  Added in v.103

  ViewVC Help
Powered by ViewVC 1.1.21