--- trunk/Sources/phylmd/clmain.f	2018/01/22 15:02:56	252
+++ trunk/phylmd/pbl_surface.f	2018/07/20 15:47:57	280
@@ -1,18 +1,18 @@
-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
-    ! Author: Z. X. Li (LMD/CNRS), date: 1993/08/18
+    ! Author: Z. X. Li (LMD/CNRS), date: 1993 Aug. 18th
     ! Objet : interface de couche limite (diffusion verticale)
 
     ! Tout ce qui a trait aux traceurs est dans "phytrac". Le calcul
@@ -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
@@ -73,9 +74,8 @@
     real agesno(klon, nbsrf)
     REAL, INTENT(IN):: rugoro(klon)
 
-    REAL d_t(klon, klev), d_q(klon, klev)
-    ! d_t------output-R- le changement pour "t"
-    ! d_q------output-R- le changement pour "q"
+    REAL, intent(out):: d_t(klon, klev), d_q(klon, klev)
+    ! changement pour t et q
 
     REAL, intent(out):: d_u(klon, klev), d_v(klon, klev)
     ! changement pour "u" et "v"
@@ -120,10 +120,13 @@
     REAL, INTENT(inout):: pblt(klon, nbsrf) ! T au nveau HCL
     REAL therm(klon, nbsrf)
     REAL plcl(klon, nbsrf)
-    REAL fqcalving(klon, nbsrf), ffonte(klon, nbsrf)
+
+    REAL, intent(out):: fqcalving(klon, nbsrf)
+    ! flux d'eau "perdue" par la surface et necessaire pour limiter la
+    ! hauteur de neige, en kg / m2 / s
+
+    real ffonte(klon, nbsrf)
     ! ffonte----Flux thermique utilise pour fondre la neige
-    ! fqcalving-Flux d'eau "perdue" par la surface et necessaire pour limiter la
-    !           hauteur de neige, en kg / m2 / s
     REAL run_off_lic_0(klon)
 
     ! Local:
@@ -228,6 +231,7 @@
     d_u = 0.
     d_v = 0.
     coefh = 0.
+    fqcalving = 0.
 
     ! Initialisation des "pourcentages potentiels". On consid\`ere ici qu'on
     ! peut avoir potentiellement de la glace sur tout le domaine oc\'eanique
@@ -305,9 +309,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.)
@@ -347,12 +352,12 @@
           CALL clqh(dtime, julien, firstcal, nsrf, ni(:knon), &
                ytsoil(:knon, :), yqsol(:knon), mu0, yrugos, yrugoro, &
                yu(:knon, 1), yv(:knon, 1), ycoefh(:knon, :), ycdragh(:knon), &
-               yt, yq, yts(:knon), ypaprs, ypplay, ydelp, yrads(:knon), &
-               yalb(:knon), snow(:knon), yqsurf, yrain_f, ysnow_f, &
-               yfluxlat(:knon), pctsrf_new_sic, yagesno(:knon), y_d_t, y_d_q, &
-               y_d_ts(:knon), yz0_new, y_flux_t(:knon), y_flux_q(:knon), &
-               y_dflux_t(:knon), y_dflux_q(:knon), y_fqcalving, y_ffonte, &
-               y_run_off_lic_0)
+               yt(:knon, :), yq(:knon, :), yts(:knon), ypaprs(:knon, :), &
+               ypplay(:knon, :), ydelp, yrads(:knon), yalb(:knon), &
+               snow(:knon), yqsurf, yrain_f, ysnow_f, yfluxlat(:knon), &
+               pctsrf_new_sic, yagesno(:knon), y_d_t, y_d_q, y_d_ts(:knon), &
+               yz0_new, y_flux_t(:knon), y_flux_q(:knon), y_dflux_t(:knon), &
+               y_dflux_q(:knon), y_fqcalving(:knon), y_ffonte, y_run_off_lic_0)
 
           ! calculer la longueur de rugosite sur ocean
           yrugm = 0.
@@ -456,9 +461,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 +509,6 @@
 
     firstcal = .false.
 
-  END SUBROUTINE clmain
+  END SUBROUTINE pbl_surface
 
-end module clmain_m
+end module pbl_surface_m