--- trunk/phylmd/Conflx/conflx.f	2014/03/05 14:57:53	82
+++ trunk/phylmd/Conflx/conflx.f	2014/08/29 13:00:05	103
@@ -4,7 +4,7 @@
 
 contains
 
-  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, &
        d_t, d_q, rain, snow, mfu, mfd, pen_u, pde_u, pen_d, pde_d, kcbot, &
        kctop, kdtop, pmflxr, pmflxs)
 
@@ -117,8 +117,8 @@
           zcvgt(i, k) = con_t(i, klev-k + 1)
           zcvgq(i, k) = con_q(i, klev-k + 1)
 
-          zqsat = MIN(0.5, R2ES * FOEEW(t(i, k), &
-               merge(0., 1., rtt < t(i, k))) / paprsf(i, k))
+          zqsat = MIN(0.5, R2ES * FOEEW(t(i, k), rtt >= t(i, k)) &
+               / paprsf(i, k))
           qsen(i, k) = zqsat / (1. - RETV * zqsat)
        ENDDO
     ENDDO