--- trunk/Sources/phylmd/clmain.f 2017/11/09 14:11:39 238 +++ trunk/Sources/phylmd/clmain.f 2017/11/15 13:56:45 246 @@ -8,7 +8,7 @@ cdhmax, ksta, ksta_ter, ok_kzmin, 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, ycoefh, t2m, q2m, & + 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) @@ -106,9 +106,9 @@ ! dflux_q derive du flux latent ! IM "slab" ocean - REAL, intent(out):: ycoefh(:, :) ! (klon, klev) + REAL, intent(out):: coefh(:, 2:) ! (klon, 2:klev) ! Pour pouvoir extraire les coefficients d'\'echange, le champ - ! "ycoefh" a \'et\'e cr\'e\'e. Nous avons moyenn\'e les valeurs de + ! "coefh" a \'et\'e cr\'e\'e. Nous avons moyenn\'e les valeurs de ! ce champ sur les quatre sous-surfaces du mod\`ele. REAL, INTENT(inout):: t2m(klon, nbsrf), q2m(klon, nbsrf) @@ -164,14 +164,13 @@ REAL y_flux_t(klon), y_flux_q(klon) REAL y_flux_u(klon), y_flux_v(klon) REAL y_dflux_t(klon), y_dflux_q(klon) - REAL coefh(klon, 2:klev), coefm(klon, 2:klev) + REAL ycoefh(klon, 2:klev), ycoefm(klon, 2:klev) real ycdragh(klon), ycdragm(klon) REAL yu(klon, klev), yv(klon, klev) REAL yt(klon, klev), yq(klon, klev) REAL ypaprs(klon, klev + 1), ypplay(klon, klev), ydelp(klon, klev) - REAL ycoefm0(klon, klev), ycoefh0(klon, klev) + REAL ycoefm0(klon, 2:klev), ycoefh0(klon, 2:klev) REAL yzlay(klon, klev), zlev(klon, klev + 1), yteta(klon, klev) - REAL ykmm(klon, klev + 1), ykmn(klon, klev + 1) REAL yq2(klon, klev + 1) REAL delp(klon, klev) INTEGER i, k, nsrf @@ -243,7 +242,7 @@ d_q = 0. d_u = 0. d_v = 0. - ycoefh = 0. + coefh = 0. ! Initialisation des "pourcentages potentiels". On consid\`ere ici qu'on ! peut avoir potentiellement de la glace sur tout le domaine oc\'eanique @@ -310,18 +309,15 @@ END DO END DO - ! calculer Cdrag et les coefficients d'echange CALL coefkz(nsrf, ypaprs, ypplay, ksta, ksta_ter, yts(:knon), & - yrugos, yu, yv, yt, yq, yqsurf(:knon), coefm(:knon, :), & - coefh(:knon, :), ycdragm(:knon), ycdragh(:knon)) + yrugos, yu, yv, yt, yq, yqsurf(:knon), ycoefm(:knon, :), & + ycoefh(:knon, :), ycdragm(:knon), ycdragh(:knon)) IF (iflag_pbl == 1) THEN - CALL coefkz2(nsrf, knon, ypaprs, ypplay, yt, ycoefm0(:knon, 2:), & - ycoefh0(:knon, 2:)) - ycoefm0(:knon, 1) = 0. - ycoefh0(:knon, 1) = 0. - coefm(:knon, :) = max(coefm(:knon, :), ycoefm0(:knon, 2:)) - coefh(:knon, :) = max(coefh(:knon, :), ycoefh0(:knon, 2:)) + CALL coefkz2(nsrf, knon, ypaprs, ypplay, yt, ycoefm0(:knon, :), & + ycoefh0(:knon, :)) + ycoefm(:knon, :) = max(ycoefm(:knon, :), ycoefm0(:knon, :)) + ycoefh(:knon, :) = max(ycoefh(:knon, :), ycoefh0(:knon, :)) ycdragm(:knon) = max(ycdragm(:knon), 0.) ycdragh(:knon) = max(ycdragh(:knon), 0.) END IF @@ -335,11 +331,10 @@ IF (ok_kzmin) THEN ! Calcul d'une diffusion minimale pour les conditions tres stables CALL coefkzmin(knon, ypaprs, ypplay, yu, yv, yt, yq, & - ycdragm(:knon), ycoefm0(:knon, 2:), ycoefh0(:knon, 2:)) - coefm(:knon, :) = max(coefm(:knon, :), ycoefm0(:knon, 2:)) - coefh(:knon, :) = max(coefh(:knon, :), ycoefh0(:knon, 2:)) - ycdragm(:knon) = max(ycdragm(:knon), ycoefm0(:knon, 1)) - ycdragh(:knon) = max(ycdragh(:knon), ycoefh0(:knon, 1)) + ycdragm(:knon), ycoefh0(:knon, :)) + ycoefm0(:knon, :) = ycoefh0(:knon, :) + ycoefm(:knon, :) = max(ycoefm(:knon, :), ycoefm0(:knon, :)) + ycoefh(:knon, :) = max(ycoefh(:knon, :), ycoefh0(:knon, :)) END IF IF (iflag_pbl >= 6) THEN @@ -379,16 +374,14 @@ ustar(:knon) = ustarhb(yu(:knon, 1), yv(:knon, 1), ycdragm(:knon)) CALL yamada4(dtime, rg, zlev(:knon, :), yzlay(:knon, :), & yu(:knon, :), yv(:knon, :), yteta(:knon, :), yq2(:knon, :), & - ykmm(:knon, :), ykmn(:knon, :), ustar(:knon)) - coefm(:knon, :) = ykmm(:knon, 2:klev) - coefh(:knon, :) = ykmn(:knon, 2:klev) + ycoefm(:knon, :), ycoefh(:knon, :), ustar(:knon)) END IF - CALL clvent(dtime, yu(:knon, 1), yv(:knon, 1), coefm(:knon, :), & + CALL clvent(dtime, yu(:knon, 1), yv(:knon, 1), ycoefm(:knon, :), & ycdragm(:knon), yt(:knon, :), yu(:knon, :), ypaprs(:knon, :), & ypplay(:knon, :), ydelp(:knon, :), y_d_u(:knon, :), & y_flux_u(:knon)) - CALL clvent(dtime, yu(:knon, 1), yv(:knon, 1), coefm(:knon, :), & + CALL clvent(dtime, yu(:knon, 1), yv(:knon, 1), ycoefm(:knon, :), & ycdragm(:knon), yt(:knon, :), yv(:knon, :), ypaprs(:knon, :), & ypplay(:knon, :), ydelp(:knon, :), y_d_v(:knon, :), & y_flux_v(:knon)) @@ -396,7 +389,7 @@ ! 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), coefh(:knon, :), ycdragh(:knon), & + 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, & @@ -419,18 +412,6 @@ y_dflux_q(j) = y_dflux_q(j) * ypct(j) END DO - DO k = 2, klev - DO j = 1, knon - i = ni(j) - coefh(j, k) = coefh(j, k) * ypct(j) - coefm(j, k) = coefm(j, k) * ypct(j) - END DO - END DO - DO j = 1, knon - i = ni(j) - ycdragh(j) = ycdragh(j) * ypct(j) - ycdragm(j) = ycdragm(j) * ypct(j) - END DO DO k = 1, klev DO j = 1, knon i = ni(j) @@ -467,8 +448,8 @@ agesno(i, nsrf) = yagesno(j) fqcalving(i, nsrf) = y_fqcalving(j) ffonte(i, nsrf) = y_ffonte(j) - cdragh(i) = cdragh(i) + ycdragh(j) - cdragm(i) = cdragm(i) + ycdragm(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) END DO @@ -493,18 +474,9 @@ d_v(i, k) = d_v(i, k) + y_d_v(j, k) END DO END DO - - DO j = 1, knon - i = ni(j) - DO k = 2, klev - ycoefh(i, k) = ycoefh(i, k) + coefh(j, k) - END DO - END DO - DO j = 1, knon - i = ni(j) - ycoefh(i, 1) = ycoefh(i, 1) + ycdragh(j) - END DO + forall (k = 2:klev) coefh(ni(:knon), k) & + = coefh(ni(:knon), k) + ycoefh(:knon, k) * ypct(:knon) ! diagnostic t, q a 2m et u, v a 10m @@ -529,7 +501,7 @@ 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) + yq2m, yt10m, yq10m, wind10m(:knon), ustar(:knon)) DO j = 1, knon i = ni(j)