--- trunk/phylmd/clmain.f	2018/02/05 10:39:38	254
+++ trunk/phylmd/pbl_surface.f	2018/07/12 14:49:20	276
@@ -1,14 +1,14 @@
-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, &
+  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
@@ -20,17 +20,18 @@
     ! 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
     USE conf_gcm_m, ONLY: lmt_pas
     USE conf_phys_m, ONLY: iflag_pbl
-    USE dimphy, ONLY: klev, klon, zmasq
+    USE dimphy, ONLY: klev, klon
     USE dimsoil, ONLY: nsoilmx
     use hbtm_m, only: hbtm
     USE indicesol, ONLY: epsfra, is_lic, is_oce, is_sic, is_ter, nbsrf
     USE interfoce_lim_m, ONLY: interfoce_lim
+    use phyetat0_m, only: zmasq
     use stdlevvar_m, only: stdlevvar
     USE suphec_m, ONLY: rd, rg
     use time_phylmdz, only: itap
@@ -305,9 +306,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.)
@@ -456,9 +458,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)
@@ -504,6 +506,6 @@
 
     firstcal = .false.
 
-  END SUBROUTINE clmain
+  END SUBROUTINE pbl_surface
 
-end module clmain_m
+end module pbl_surface_m