--- trunk/Sources/phylmd/phyetat0.f 2016/06/08 15:10:12 203 +++ trunk/Sources/phylmd/phyetat0.f 2017/03/28 12:46:28 215 @@ -14,7 +14,7 @@ contains - SUBROUTINE phyetat0(pctsrf, tsol, tsoil, qsurf, qsol, snow, albe, evap, & + SUBROUTINE phyetat0(pctsrf, ftsol, ftsoil, qsurf, qsol, snow, albe, evap, & rain_fall, snow_fall, solsw, sollw, fder, radsol, frugs, agesno, zmea, & zstd, zsig, zgam, zthe, zpic, zval, t_ancien, q_ancien, ancien_ok, & rnebcon, ratqs, clwcon, run_off_lic_0, sig1, w01, ncid_startphy) @@ -33,10 +33,13 @@ nf95_inquire_variable, NF95_OPEN REAL, intent(out):: pctsrf(klon, nbsrf) - REAL, intent(out):: tsol(klon, nbsrf) - REAL, intent(out):: tsoil(klon, nsoilmx, nbsrf) + REAL, intent(out):: ftsol(klon, nbsrf) + REAL, intent(out):: ftsoil(klon, nsoilmx, nbsrf) REAL, intent(out):: qsurf(klon, nbsrf) - REAL, intent(out):: qsol(:) ! (klon) + + REAL, intent(out):: qsol(:) + ! (klon) column-density of water in soil, in kg m-2 + REAL, intent(out):: snow(klon, nbsrf) REAL, intent(out):: albe(klon, nbsrf) REAL, intent(out):: evap(klon, nbsrf) @@ -162,25 +165,23 @@ call NF95_INQ_VARID(ncid_startphy, "TS", varid) call nf95_inquire_variable(ncid_startphy, varid, ndims = ndims) if (ndims == 2) then - call NF95_GET_VAR(ncid_startphy, varid, tsol) + call NF95_GET_VAR(ncid_startphy, varid, ftsol) else print *, "Found only one surface type for soil temperature." - call nf95_get_var(ncid_startphy, varid, tsol(:, 1)) - tsol(:, 2:nbsrf) = spread(tsol(:, 1), dim = 2, ncopies = nbsrf - 1) + call nf95_get_var(ncid_startphy, varid, ftsol(:, 1)) + ftsol(:, 2:nbsrf) = spread(ftsol(:, 1), dim = 2, ncopies = nbsrf - 1) end if ! Lecture des temperatures du sol profond: call NF95_INQ_VARID(ncid_startphy, 'Tsoil', varid) - call NF95_GET_VAR(ncid_startphy, varid, tsoil) + call NF95_GET_VAR(ncid_startphy, varid, ftsoil) ! Lecture de l'humidite de l'air juste au dessus du sol: call NF95_INQ_VARID(ncid_startphy, "QS", varid) call nf95_get_var(ncid_startphy, varid, qsurf) - ! Eau dans le sol (pour le modele de sol "bucket") - ierr = NF90_INQ_VARID(ncid_startphy, "QSOL", varid) IF (ierr == NF90_NOERR) THEN call nf95_get_var(ncid_startphy, varid, qsol)