--- trunk/Sources/phylmd/clmain.f 2016/06/08 12:23:41 202 +++ trunk/Sources/phylmd/clmain.f 2016/09/01 10:30:53 207 @@ -4,7 +4,7 @@ contains - SUBROUTINE clmain(dtime, pctsrf, t, q, u, v, jour, rmu0, ts, cdmmax, & + SUBROUTINE clmain(dtime, pctsrf, t, q, u, v, jour, rmu0, ftsol, cdmmax, & cdhmax, ksta, ksta_ter, ok_kzmin, ftsoil, qsol, paprs, pplay, snow, & qsurf, evap, falbe, fluxlat, rain_fall, snow_f, solsw, sollw, fder, & rlat, rugos, agesno, rugoro, d_t, d_q, d_u, d_v, d_ts, flux_t, flux_q, & @@ -54,7 +54,7 @@ REAL, INTENT(IN):: u(klon, klev), v(klon, klev) ! vitesse INTEGER, INTENT(IN):: jour ! jour de l'annee en cours REAL, intent(in):: rmu0(klon) ! cosinus de l'angle solaire zenithal - REAL, INTENT(IN):: ts(klon, nbsrf) ! temperature du sol (en Kelvin) + REAL, INTENT(IN):: ftsol(klon, nbsrf) ! temperature du sol (en Kelvin) REAL, INTENT(IN):: cdmmax, cdhmax ! seuils cdrm, cdrh REAL, INTENT(IN):: ksta, ksta_ter LOGICAL, INTENT(IN):: ok_kzmin @@ -96,16 +96,17 @@ REAL, intent(out):: d_u(klon, klev), d_v(klon, klev) ! changement pour "u" et "v" - REAL, intent(out):: d_ts(klon, nbsrf) ! le changement pour "ts" + REAL, intent(out):: d_ts(klon, nbsrf) ! le changement pour "ftsol" - REAL flux_t(klon, klev, nbsrf), flux_q(klon, klev, nbsrf) - ! flux_t---output-R- flux de chaleur sensible (CpT) J/m**2/s (W/m**2) - ! (orientation positive vers le bas) - ! flux_q---output-R- flux de vapeur d'eau (kg/m**2/s) - - REAL flux_u(klon, klev, nbsrf), flux_v(klon, klev, nbsrf) - ! flux_u---output-R- tension du vent X: (kg m/s)/(m**2 s) ou Pascal - ! flux_v---output-R- tension du vent Y: (kg m/s)/(m**2 s) ou Pascal + REAL, intent(out):: flux_t(klon, nbsrf) + ! flux de chaleur sensible (Cp T) (W/m2) (orientation positive vers + ! le bas) à la surface + + REAL, intent(out):: flux_q(klon, nbsrf) + ! flux de vapeur d'eau (kg/m2/s) à la surface + + REAL, intent(out):: flux_u(klon, nbsrf), flux_v(klon, nbsrf) + ! tension du vent à la surface, en Pa REAL, INTENT(out):: cdragh(klon), cdragm(klon) real q2(klon, klev+1, nbsrf) @@ -154,11 +155,8 @@ REAL y_fqcalving(klon), y_ffonte(klon) real y_run_off_lic_0(klon) - REAL rugmer(klon) - REAL ytsoil(klon, nsoilmx) - REAL yts(klon), yrugos(klon), ypct(klon), yz0_new(klon) REAL yalb(klon) REAL yu1(klon), yv1(klon) @@ -183,8 +181,8 @@ REAL y_d_ts(klon) REAL y_d_t(klon, klev), y_d_q(klon, klev) REAL y_d_u(klon, klev), y_d_v(klon, klev) - REAL y_flux_t(klon, klev), y_flux_q(klon, klev) - REAL y_flux_u(klon, klev), y_flux_v(klon, klev) + 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, klev), coefm(klon, klev) REAL yu(klon, klev), yv(klon, klev) @@ -278,8 +276,6 @@ yv = 0. yt = 0. yq = 0. - y_flux_u = 0. - y_flux_v = 0. y_dflux_t = 0. y_dflux_q = 0. ytsoil = 999999. @@ -329,7 +325,7 @@ DO j = 1, knon i = ni(j) ypct(j) = pctsrf(i, nsrf) - yts(j) = ts(i, nsrf) + yts(j) = ftsol(i, nsrf) ysnow(j) = snow(i, nsrf) yqsurf(j) = qsurf(i, nsrf) yalb(j) = falbe(i, nsrf) @@ -445,18 +441,18 @@ ! calculer la diffusion des vitesses "u" et "v" CALL clvent(knon, dtime, yu1, yv1, coefm(:knon, :), yt, yu, ypaprs, & - ypplay, ydelp, y_d_u, y_flux_u) + ypplay, ydelp, y_d_u, y_flux_u(:knon)) CALL clvent(knon, dtime, yu1, yv1, coefm(:knon, :), yt, yv, ypaprs, & - ypplay, ydelp, y_d_v, y_flux_v) + ypplay, ydelp, y_d_v, y_flux_v(:knon)) ! calculer la diffusion de "q" et de "h" - CALL clqh(dtime, jour, firstcal, rlat, knon, nsrf, ni(:knon), & - ytsoil, yqsol, rmu0, yrugos, yrugoro, yu1, yv1, & - coefh(:knon, :), yt, yq, yts, ypaprs, ypplay, ydelp, yrads, & - yalb(:knon), ysnow, yqsurf, yrain_f, ysnow_f, yfder, yfluxlat, & + CALL clqh(dtime, jour, firstcal, rlat, nsrf, ni(:knon), ytsoil, & + yqsol, rmu0, yrugos, yrugoro, yu1, yv1, coefh(:knon, :), yt, & + yq, yts(:knon), ypaprs, ypplay, ydelp, yrads, yalb(:knon), & + ysnow, yqsurf, yrain_f, ysnow_f, yfder, yfluxlat, & pctsrf_new_sic, yagesno(:knon), y_d_t, y_d_q, y_d_ts(:knon), & - yz0_new, y_flux_t, y_flux_q, y_dflux_t, y_dflux_q, & - y_fqcalving, y_ffonte, y_run_off_lic_0) + yz0_new, y_flux_t(:knon), y_flux_q(:knon), y_dflux_t, & + y_dflux_q, y_fqcalving, y_ffonte, y_run_off_lic_0) ! calculer la longueur de rugosite sur ocean yrugm = 0. @@ -481,16 +477,20 @@ coefm(j, k) = coefm(j, k)*ypct(j) y_d_t(j, k) = y_d_t(j, k)*ypct(j) y_d_q(j, k) = y_d_q(j, k)*ypct(j) - flux_t(i, k, nsrf) = y_flux_t(j, k) - flux_q(i, k, nsrf) = y_flux_q(j, k) - flux_u(i, k, nsrf) = y_flux_u(j, k) - flux_v(i, k, nsrf) = y_flux_v(j, k) y_d_u(j, k) = y_d_u(j, k)*ypct(j) y_d_v(j, k) = y_d_v(j, k)*ypct(j) END DO END DO - evap(:, nsrf) = -flux_q(:, 1, nsrf) + DO j = 1, knon + i = ni(j) + flux_t(i, nsrf) = y_flux_t(j) + flux_q(i, nsrf) = y_flux_q(j) + flux_u(i, nsrf) = y_flux_u(j) + flux_v(i, nsrf) = y_flux_v(j) + END DO + + evap(:, nsrf) = -flux_q(:, nsrf) falbe(:, nsrf) = 0. snow(:, nsrf) = 0. @@ -583,9 +583,9 @@ END DO - CALL hbtm(knon, ypaprs, ypplay, yt2m, yq2m, yustar, y_flux_t, & - y_flux_q, yu, yv, yt, yq, ypblh(:knon), ycapcl, yoliqcl, & - ycteicl, ypblt, ytherm, ytrmb1, ytrmb2, ytrmb3, ylcl) + CALL hbtm(ypaprs, ypplay, yt2m, yq2m, yustar, y_flux_t(:knon), & + y_flux_q(:knon), yu, yv, yt, yq, ypblh(:knon), ycapcl, & + yoliqcl, ycteicl, ypblt, ytherm, ytrmb1, ytrmb2, ytrmb3, ylcl) DO j = 1, knon i = ni(j)