--- trunk/Sources/phylmd/phyredem.f 2015/07/20 16:01:49 157 +++ trunk/phylmd/phyredem.f 2018/09/06 15:51:09 304 @@ -4,10 +4,10 @@ contains - SUBROUTINE phyredem(pctsrf, tsol, tsoil, tslab, seaice, qsurf, qsol, snow, & - albedo, evap, rain_fall, snow_fall, solsw, sollw, fder, radsol, frugs, & - agesno, zmea, zstd, zsig, zgam, zthe, zpic, zval, t_ancien, q_ancien, & - rnebcon, ratqs, clwcon, run_off_lic_0, sig1, w01) + SUBROUTINE phyredem(pctsrf, ftsol, ftsoil, qsurf, qsol, snow, albedo, & + rain_fall, snow_fall, solsw, sollw, fder, radsol, frugs, agesno, zmea, & + zstd, zsig, zgam, zthe, zpic, zval, t_ancien, q_ancien, rnebcon, & + ratqs, clwcon, run_off_lic_0, sig1, w01) ! From phylmd/phyredem.F, version 1.3, 2005/05/25 13:10:09 ! Author: Z. X. Li (LMD/CNRS) @@ -16,15 +16,15 @@ ! Objet : \'ecriture de l'\'etat de d\'emarrage ou red\'emarrage ! pour la physique - USE dimphy, ONLY: klev, klon, zmasq + USE dimphy, ONLY: klev, klon USE indicesol, ONLY: is_lic, is_oce, is_sic, is_ter, nbsrf USE netcdf95, ONLY: nf95_inq_varid, nf95_put_var, nf95_close + use phyetat0_m, only: zmasq use phyredem0_m, only: ncid_restartphy REAL, INTENT(IN):: pctsrf(:, :) ! (klon, nbsrf) - REAL, INTENT(IN):: tsol(:, :) ! (klon, nbsrf) - REAL, INTENT(IN):: tsoil(:, :, :) ! (klon, nsoilmx, nbsrf) - REAL, INTENT(IN):: tslab(:), seaice(:) ! (klon) slab ocean + REAL, INTENT(IN):: ftsol(:, :) ! (klon, nbsrf) + REAL, INTENT(IN):: ftsoil(:, :, :) ! (klon, nsoilmx, nbsrf) REAL, INTENT(IN):: qsurf(:, :) ! (klon, nbsrf) REAL, intent(in):: qsol(:) ! (klon) @@ -32,7 +32,6 @@ REAL, INTENT(IN):: snow(klon, nbsrf) REAL, INTENT(IN):: albedo(klon, nbsrf) - REAL, INTENT(IN):: evap(klon, nbsrf) REAL, INTENT(IN):: rain_fall(klon) REAL, INTENT(IN):: snow_fall(klon) REAL, INTENT(IN):: solsw(klon) @@ -80,16 +79,10 @@ call nf95_put_var(ncid_restartphy, varid, pctsrf(:, is_sic)) call nf95_inq_varid(ncid_restartphy, "TS", varid) - call nf95_put_var(ncid_restartphy, varid, tsol) + call nf95_put_var(ncid_restartphy, varid, ftsol) call nf95_inq_varid(ncid_restartphy, "Tsoil", varid) - call nf95_put_var(ncid_restartphy, varid, tsoil) - - call nf95_inq_varid(ncid_restartphy, "TSLAB", varid) - call nf95_put_var(ncid_restartphy, varid, tslab) - - call nf95_inq_varid(ncid_restartphy, "SEAICE", varid) - call nf95_put_var(ncid_restartphy, varid, seaice) + call nf95_put_var(ncid_restartphy, varid, ftsoil) call nf95_inq_varid(ncid_restartphy, "QS", varid) call nf95_put_var(ncid_restartphy, varid, qsurf) @@ -100,9 +93,6 @@ call nf95_inq_varid(ncid_restartphy, "ALBE", varid) call nf95_put_var(ncid_restartphy, varid, albedo) - call nf95_inq_varid(ncid_restartphy, "EVAP", varid) - call nf95_put_var(ncid_restartphy, varid, evap) - call nf95_inq_varid(ncid_restartphy, "SNOW", varid) call nf95_put_var(ncid_restartphy, varid, snow)