--- trunk/phylmd/pbl_surface.f 2018/07/20 16:28:36 281 +++ trunk/phylmd/pbl_surface.f 2018/07/20 17:08:44 283 @@ -142,7 +142,7 @@ REAL rugmer(klon) REAL ytsoil(klon, nsoilmx) REAL yts(klon), ypct(klon), yz0_new(klon) - real yrugos(klon) ! longeur de rugosite (en m) + real yrugos(klon) ! longueur de rugosite (en m) REAL yalb(klon) REAL snow(klon), yqsurf(klon), yagesno(klon) real yqsol(klon) ! column-density of water in soil, in kg m-2 @@ -217,8 +217,6 @@ yv = 0. yt = 0. yq = 0. - y_dflux_t = 0. - y_dflux_q = 0. yrugoro = 0. d_ts = 0. flux_t = 0. @@ -350,18 +348,21 @@ ! calculer la diffusion de "q" et de "h" 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(: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(:knon, :), & - y_d_q(:knon, :), 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) + ytsoil(:knon, :), yqsol(:knon), mu0, yrugos(:knon), & + yrugoro(:knon), yu(:knon, 1), yv(:knon, 1), ycoefh(:knon, :), & + ycdragh(:knon), yt(:knon, :), yq(:knon, :), yts(:knon), & + ypaprs(:knon, :), ypplay(:knon, :), ydelp(:knon, :), & + yrads(:knon), yalb(:knon), snow(:knon), yqsurf(:knon), yrain_f, & + ysnow_f, yfluxlat(:knon), pctsrf_new_sic, yagesno(:knon), & + y_d_t(:knon, :), y_d_q(:knon, :), y_d_ts(:knon), & + yz0_new(:knon), 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. + IF (nsrf == is_oce) THEN DO j = 1, knon yrugm(j) = 0.018 * ycdragm(j) * (yu(j, 1)**2 + yv(j, 1)**2) & @@ -370,10 +371,6 @@ yrugm(j) = max(1.5E-05, yrugm(j)) END DO END IF - DO j = 1, knon - y_dflux_t(j) = y_dflux_t(j) * ypct(j) - y_dflux_q(j) = y_dflux_q(j) * ypct(j) - END DO DO k = 1, klev DO j = 1, knon @@ -413,8 +410,8 @@ ffonte(i, nsrf) = y_ffonte(j) cdragh(i) = cdragh(i) + ycdragh(j) * ypct(j) cdragm(i) = cdragm(i) + ycdragm(j) * ypct(j) - dflux_t(i) = dflux_t(i) + y_dflux_t(j) - dflux_q(i) = dflux_q(i) + y_dflux_q(j) + dflux_t(i) = dflux_t(i) + y_dflux_t(j) * ypct(j) + dflux_q(i) = dflux_q(i) + y_dflux_q(j) * ypct(j) END DO IF (nsrf == is_ter) THEN qsol(ni(:knon)) = yqsol(:knon)