--- trunk/phylmd/pbl_surface.f 2018/07/11 13:22:39 271 +++ trunk/phylmd/pbl_surface.f 2018/07/12 14:49:20 276 @@ -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, sqrt(yu(:knon, 1)**2 + yv(:knon, 1)**2), & - 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)