--- trunk/Sources/phylmd/clmain.f	2018/01/05 18:18:53	250
+++ trunk/phylmd/pbl_surface.f	2018/07/11 17:06:09	275
@@ -1,16 +1,15 @@
-module clmain_m
+module pbl_surface_m
 
   IMPLICIT NONE
 
 contains
 
-  SUBROUTINE clmain(dtime, pctsrf, t, q, u, v, julien, mu0, ftsol, cdmmax, &
-       cdhmax, ftsoil, qsol, paprs, pplay, fsnow, qsurf, evap, falbe, fluxlat, &
-       rain_fall, snow_f, fsolsw, fsollw, frugs, agesno, rugoro, d_t, d_q, &
-       d_u, d_v, d_ts, flux_t, flux_q, flux_u, flux_v, cdragh, cdragm, q2, &
-       dflux_t, dflux_q, coefh, t2m, q2m, u10m_srf, v10m_srf, pblh, capcl, &
-       oliqcl, cteicl, pblt, therm, trmb1, trmb2, trmb3, plcl, fqcalving, &
-       ffonte, run_off_lic_0)
+  SUBROUTINE pbl_surface(dtime, pctsrf, t, q, u, v, julien, mu0, ftsol, &
+       cdmmax, cdhmax, ftsoil, qsol, paprs, pplay, fsnow, qsurf, evap, falbe, &
+       fluxlat, rain_fall, snow_f, fsolsw, fsollw, frugs, agesno, rugoro, d_t, &
+       d_q, d_u, d_v, d_ts, flux_t, flux_q, flux_u, flux_v, cdragh, cdragm, &
+       q2, dflux_t, dflux_q, coefh, t2m, q2m, u10m_srf, v10m_srf, pblh, capcl, &
+       oliqcl, cteicl, pblt, therm, plcl, fqcalving, ffonte, run_off_lic_0)
 
     ! From phylmd/clmain.F, version 1.6, 2005/11/16 14:47:19
     ! Author: Z. X. Li (LMD/CNRS), date: 1993/08/18
@@ -21,7 +20,7 @@
     ! ne tient pas compte de la diff\'erentiation des sous-fractions
     ! de sol.
 
-    use clcdrag_m, only: clcdrag
+    use cdrag_m, only: cdrag
     use clqh_m, only: clqh
     use clvent_m, only: clvent
     use coef_diff_turb_m, only: coef_diff_turb
@@ -120,12 +119,6 @@
     REAL cteicl(klon, nbsrf)
     REAL, INTENT(inout):: pblt(klon, nbsrf) ! T au nveau HCL
     REAL therm(klon, nbsrf)
-    REAL trmb1(klon, nbsrf)
-    ! trmb1-------deep_cape
-    REAL trmb2(klon, nbsrf)
-    ! trmb2--------inhibition
-    REAL trmb3(klon, nbsrf)
-    ! trmb3-------Point Omega
     REAL plcl(klon, nbsrf)
     REAL fqcalving(klon, nbsrf), ffonte(klon, nbsrf)
     ! ffonte----Flux thermique utilise pour fondre la neige
@@ -185,9 +178,6 @@
     REAL ycteicl(klon)
     REAL ypblt(klon)
     REAL ytherm(klon)
-    REAL ytrmb1(klon)
-    REAL ytrmb2(klon)
-    REAL ytrmb3(klon)
     REAL u1(klon), v1(klon)
     REAL tair1(klon), qair1(klon), tairsol(klon)
     REAL psfce(klon), patm(klon)
@@ -315,9 +305,10 @@
                   * (ypplay(:knon, k - 1) - ypplay(:knon, k))
           ENDDO
 
-          CALL clcdrag(nsrf, yu(:knon, 1), yv(:knon, 1), yt(:knon, 1), &
-               yq(:knon, 1), zgeop(:knon, 1), yts(:knon), yqsurf(:knon), &
-               yrugos(:knon), ycdragm(:knon), ycdragh(:knon)) 
+          CALL cdrag(nsrf, sqrt(yu(:knon, 1)**2 + yv(:knon, 1)**2), &
+               yt(:knon, 1), yq(:knon, 1), zgeop(:knon, 1), ypaprs(:knon, 1), &
+               yts(:knon), yqsurf(:knon), yrugos(:knon), ycdragm(:knon), &
+               ycdragh(:knon)) 
 
           IF (iflag_pbl == 1) THEN
              ycdragm(:knon) = max(ycdragm(:knon), 0.)
@@ -339,9 +330,10 @@
              END DO
           end IF
 
-          call coef_diff_turb(dtime, nsrf, ni(:knon), ypaprs, ypplay, yu, yv, &
-               yq, yt, yts, ycdragm, zgeop(:knon, :), ycoefm(:knon, :), &
-               ycoefh(:knon, :), yq2)
+          call coef_diff_turb(dtime, nsrf, ni(:knon), ypaprs(:knon, :), &
+               ypplay(:knon, :), yu(:knon, :), yv(:knon, :), yq(:knon, :), &
+               yt(:knon, :), yts(:knon), ycdragm(:knon), zgeop(:knon, :), &
+               ycoefm(:knon, :), ycoefh(:knon, :), yq2(:knon, :))
 
           CALL clvent(dtime, yu(:knon, 1), yv(:knon, 1), ycoefm(:knon, :), &
                ycdragm(:knon), yt(:knon, :), yu(:knon, :), ypaprs(:knon, :), &
@@ -465,9 +457,9 @@
              qairsol(j) = yqsurf(j)
           END DO
 
-          CALL stdlevvar(klon, knon, nsrf, u1(:knon), v1(:knon), tair1(:knon), &
-               qair1, zgeo1, tairsol, qairsol, rugo1, psfce, patm, yt2m, &
-               yq2m, yt10m, yq10m, wind10m(:knon), ustar(:knon))
+          CALL stdlevvar(nsrf, u1(:knon), v1(:knon), tair1(:knon), qair1, &
+               zgeo1, tairsol, qairsol, rugo1, psfce, patm, yt2m, yq2m, yt10m, &
+               yq10m, wind10m(:knon), ustar(:knon))
 
           DO j = 1, knon
              i = ni(j)
@@ -482,7 +474,7 @@
 
           CALL hbtm(ypaprs, ypplay, yt2m, yq2m, ustar(:knon), y_flux_t(:knon), &
                y_flux_q(:knon), yu, yv, yt, yq, ypblh(:knon), ycapcl, &
-               yoliqcl, ycteicl, ypblt, ytherm, ytrmb1, ytrmb2, ytrmb3, ylcl)
+               yoliqcl, ycteicl, ypblt, ytherm, ylcl)
 
           DO j = 1, knon
              i = ni(j)
@@ -493,9 +485,6 @@
              cteicl(i, nsrf) = ycteicl(j)
              pblt(i, nsrf) = ypblt(j)
              therm(i, nsrf) = ytherm(j)
-             trmb1(i, nsrf) = ytrmb1(j)
-             trmb2(i, nsrf) = ytrmb2(j)
-             trmb3(i, nsrf) = ytrmb3(j)
           END DO
 
           DO j = 1, knon
@@ -516,6 +505,6 @@
 
     firstcal = .false.
 
-  END SUBROUTINE clmain
+  END SUBROUTINE pbl_surface
 
-end module clmain_m
+end module pbl_surface_m