--- trunk/Sources/phylmd/clmain.f 2016/12/07 16:44:53 208 +++ trunk/Sources/phylmd/clmain.f 2017/03/28 12:46:28 215 @@ -4,10 +4,10 @@ contains - SUBROUTINE clmain(dtime, pctsrf, t, q, u, v, jour, rmu0, ftsol, cdmmax, & - cdhmax, ksta, ksta_ter, ok_kzmin, ftsoil, qsol, paprs, pplay, snow, & + SUBROUTINE clmain(dtime, pctsrf, t, q, u, v, jour, mu0, ftsol, cdmmax, & + cdhmax, ksta, ksta_ter, ok_kzmin, ftsoil, qsol, paprs, pplay, fsnow, & 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, & + rugos, 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, zu1, & zv1, t2m, q2m, u10m, v10m, pblh, capcl, oliqcl, cteicl, pblt, therm, & trmb1, trmb2, trmb3, plcl, fqcalving, ffonte, run_off_lic_0) @@ -53,7 +53,7 @@ REAL, INTENT(IN):: q(klon, klev) ! vapeur d'eau (kg/kg) 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):: mu0(klon) ! cosinus de l'angle solaire zenithal REAL, INTENT(IN):: ftsol(klon, nbsrf) ! temp\'erature du sol (en K) REAL, INTENT(IN):: cdmmax, cdhmax ! seuils cdrm, cdrh REAL, INTENT(IN):: ksta, ksta_ter @@ -67,12 +67,11 @@ REAL, INTENT(IN):: paprs(klon, klev+1) ! pression a intercouche (Pa) REAL, INTENT(IN):: pplay(klon, klev) ! pression au milieu de couche (Pa) - REAL, INTENT(inout):: snow(klon, nbsrf) + REAL, INTENT(inout):: fsnow(:, :) ! (klon, nbsrf) \'epaisseur neigeuse REAL qsurf(klon, nbsrf) REAL evap(klon, nbsrf) REAL, intent(inout):: falbe(klon, nbsrf) - - REAL fluxlat(klon, nbsrf) + REAL, intent(out):: fluxlat(:, :) ! (klon, nbsrf) REAL, intent(in):: rain_fall(klon) ! liquid water mass flux (kg/m2/s), positive down @@ -82,10 +81,7 @@ REAL, INTENT(IN):: solsw(klon, nbsrf), sollw(klon, nbsrf) REAL, intent(in):: fder(klon) - REAL, INTENT(IN):: rlat(klon) ! latitude en degr\'es - REAL, intent(inout):: rugos(klon, nbsrf) ! longueur de rugosit\'e (en m) - real agesno(klon, nbsrf) REAL, INTENT(IN):: rugoro(klon) @@ -159,10 +155,12 @@ REAL ytsoil(klon, nsoilmx) REAL yts(klon), yrugos(klon), ypct(klon), yz0_new(klon) REAL yalb(klon) + REAL yu1(klon), yv1(klon) - ! on rajoute en output yu1 et yv1 qui sont les vents dans - ! la premiere couche - REAL ysnow(klon), yqsurf(klon), yagesno(klon) + ! On ajoute en output yu1 et yv1 qui sont les vents dans + ! la premi\`ere couche. + + REAL snow(klon), yqsurf(klon), yagesno(klon) real yqsol(klon) ! column-density of water in soil, in kg m-2 @@ -175,9 +173,7 @@ REAL yfder(klon) REAL yrugm(klon), yrads(klon), yrugoro(klon) - REAL yfluxlat(klon) - 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) @@ -260,7 +256,6 @@ zv1 = 0. ypct = 0. yts = 0. - ysnow = 0. yqsurf = 0. yrain_f = 0. ysnow_f = 0. @@ -280,11 +275,11 @@ y_dflux_q = 0. yrugoro = 0. d_ts = 0. - yfluxlat = 0. flux_t = 0. flux_q = 0. flux_u = 0. flux_v = 0. + fluxlat = 0. d_t = 0. d_q = 0. d_u = 0. @@ -325,7 +320,7 @@ i = ni(j) ypct(j) = pctsrf(i, nsrf) yts(j) = ftsol(i, nsrf) - ysnow(j) = snow(i, nsrf) + snow(j) = fsnow(i, nsrf) yqsurf(j) = qsurf(i, nsrf) yalb(j) = falbe(i, nsrf) yrain_f(j) = rain_fall(i) @@ -440,13 +435,13 @@ ypplay, ydelp, y_d_v, y_flux_v(:knon)) ! calculer la diffusion de "q" et de "h" - CALL clqh(dtime, jour, firstcal, rlat, nsrf, ni(:knon), & - ytsoil(:knon, :), 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(:knon), y_flux_q(:knon), & - y_dflux_t, y_dflux_q, y_fqcalving, y_ffonte, y_run_off_lic_0) + CALL clqh(dtime, jour, firstcal, nsrf, ni(:knon), ytsoil(:knon, :), & + yqsol, mu0, yrugos, yrugoro, yu1, yv1, coefh(:knon, :), yt, & + yq, yts(:knon), ypaprs, ypplay, ydelp, yrads, yalb(:knon), & + snow(:knon), yqsurf, yrain_f, ysnow_f, yfder, 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, & + y_dflux_q, y_fqcalving, y_ffonte, y_run_off_lic_0) ! calculer la longueur de rugosite sur ocean yrugm = 0. @@ -476,26 +471,22 @@ END DO END DO - 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 + flux_t(ni(:knon), nsrf) = y_flux_t(:knon) + flux_q(ni(:knon), nsrf) = y_flux_q(:knon) + flux_u(ni(:knon), nsrf) = y_flux_u(:knon) + flux_v(ni(:knon), nsrf) = y_flux_v(:knon) evap(:, nsrf) = -flux_q(:, nsrf) falbe(:, nsrf) = 0. - snow(:, nsrf) = 0. + fsnow(:, nsrf) = 0. qsurf(:, nsrf) = 0. rugos(:, nsrf) = 0. - fluxlat(:, nsrf) = 0. DO j = 1, knon i = ni(j) d_ts(i, nsrf) = y_d_ts(j) falbe(i, nsrf) = yalb(j) - snow(i, nsrf) = ysnow(j) + fsnow(i, nsrf) = snow(j) qsurf(i, nsrf) = yqsurf(j) rugos(i, nsrf) = yz0_new(j) fluxlat(i, nsrf) = yfluxlat(j) @@ -595,6 +586,8 @@ q2(i, k, nsrf) = yq2(j, k) END DO END DO + else + fsnow(:, nsrf) = 0. end IF if_knon END DO loop_surface