--- trunk/phylmd/phyredem.f 2018/02/05 10:39:38 254 +++ trunk/phylmd/phyredem.f90 2019/06/13 14:40:06 328 @@ -4,7 +4,7 @@ contains - SUBROUTINE phyredem(pctsrf, ftsol, ftsoil, qsurf, qsol, snow, albedo, evap, & + 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) @@ -16,9 +16,10 @@ ! Objet : \'ecriture de l'\'etat de d\'emarrage ou red\'emarrage ! pour la physique - USE dimphy, ONLY: klev, klon, zmasq - USE indicesol, ONLY: is_lic, is_oce, is_sic, is_ter, nbsrf + USE dimphy, ONLY: klev, klon + USE indicesol, ONLY: is_oce, nbsrf USE netcdf95, ONLY: nf95_inq_varid, nf95_put_var, nf95_close + use phyetat0_m, only: masque use phyredem0_m, only: ncid_restartphy REAL, INTENT(IN):: pctsrf(:, :) ! (klon, nbsrf) @@ -31,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) @@ -64,19 +64,10 @@ PRINT *, 'Call sequence information: phyredem' call nf95_inq_varid(ncid_restartphy, "masque", varid) - call nf95_put_var(ncid_restartphy, varid, zmasq) + call nf95_put_var(ncid_restartphy, varid, masque) - call nf95_inq_varid(ncid_restartphy, "FTER", varid) - call nf95_put_var(ncid_restartphy, varid, pctsrf(:, is_ter)) - - call nf95_inq_varid(ncid_restartphy, "FLIC", varid) - call nf95_put_var(ncid_restartphy, varid, pctsrf(:, is_lic)) - - call nf95_inq_varid(ncid_restartphy, "FOCE", varid) - call nf95_put_var(ncid_restartphy, varid, pctsrf(:, is_oce)) - - call nf95_inq_varid(ncid_restartphy, "FSIC", varid) - call nf95_put_var(ncid_restartphy, varid, pctsrf(:, is_sic)) + call nf95_inq_varid(ncid_restartphy, "pctsrf", varid) + call nf95_put_var(ncid_restartphy, varid, pctsrf) call nf95_inq_varid(ncid_restartphy, "TS", varid) call nf95_put_var(ncid_restartphy, varid, ftsol) @@ -93,9 +84,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)