--- trunk/Sources/phylmd/physiq.f 2015/04/29 15:47:56 134 +++ trunk/Sources/phylmd/physiq.f 2015/06/23 15:14:20 151 @@ -25,7 +25,7 @@ ok_orodr, ok_orolf USE clmain_m, ONLY: clmain use clouds_gno_m, only: clouds_gno - USE comgeomphy, ONLY: airephy, cuphy, cvphy + USE comgeomphy, ONLY: airephy USE concvl_m, ONLY: concvl USE conf_gcm_m, ONLY: offline, raz_date USE conf_phys_m, ONLY: conf_phys @@ -503,7 +503,6 @@ REAL ue_lay(klon, llm) ! transport zonal de l'energie a chaque niveau vert. REAL uq_lay(klon, llm) ! transport zonal de l'eau a chaque niveau vert. - REAL zsto real date0 ! Variables li\'ees au bilan d'\'energie et d'enthalpie : @@ -1325,8 +1324,8 @@ ENDDO CALL drag_noro(klon, llm, dtphys, paprs, play, zmea, zstd, zsig, zgam, & - zthe, zpic, zval, igwd, idx, itest, t_seri, u_seri, v_seri, & - zulow, zvlow, zustrdr, zvstrdr, d_t_oro, d_u_oro, d_v_oro) + zthe, zpic, zval, itest, t_seri, u_seri, v_seri, zulow, zvlow, & + zustrdr, zvstrdr, d_t_oro, d_u_oro, d_v_oro) ! ajout des tendances DO k = 1, llm @@ -1475,11 +1474,11 @@ ! Si c'est la fin, il faut conserver l'etat de redemarrage IF (lafin) THEN itau_phy = itau_phy + itap - CALL phyredem("restartphy.nc", rlat, rlon, pctsrf, ftsol, ftsoil, & - tslab, seaice, fqsurf, qsol, fsnow, falbe, falblw, fevap, & - rain_fall, snow_fall, solsw, sollw, dlw, radsol, frugs, & - agesno, zmea, zstd, zsig, zgam, zthe, zpic, zval, t_ancien, & - q_ancien, rnebcon, ratqs, clwcon, run_off_lic_0, sig1, w01) + CALL phyredem("restartphy.nc", pctsrf, ftsol, ftsoil, tslab, seaice, & + fqsurf, qsol, fsnow, falbe, falblw, fevap, rain_fall, snow_fall, & + solsw, sollw, dlw, radsol, frugs, agesno, zmea, zstd, zsig, zgam, & + zthe, zpic, zval, t_ancien, q_ancien, rnebcon, ratqs, clwcon, & + run_off_lic_0, sig1, w01) ENDIF firstcal = .FALSE. @@ -1494,8 +1493,7 @@ USE histsync_m, ONLY: histsync USE histwrite_m, ONLY: histwrite - real zout - integer itau_w ! pas de temps ecriture + integer i, itau_w ! pas de temps ecriture REAL zx_tmp_2d(iim, jjm + 1), zx_tmp_3d(iim, jjm + 1, llm) !-------------------------------------------------- @@ -1503,15 +1501,11 @@ IF (ok_instan) THEN ! Champs 2D: - zsto = dtphys * ecrit_ins - zout = dtphys * ecrit_ins itau_w = itau_phy + itap - i = NINT(zout/zsto) CALL gr_fi_ecrit(1, klon, iim, jjm + 1, pphis, zx_tmp_2d) CALL histwrite(nid_ins, "phis", itau_w, zx_tmp_2d) - i = NINT(zout/zsto) CALL gr_fi_ecrit(1, klon, iim, jjm + 1, airephy, zx_tmp_2d) CALL histwrite(nid_ins, "aire", itau_w, zx_tmp_2d)