--- trunk/libf/dyn3d/leapfrog.f90 2012/01/10 19:02:02 56 +++ trunk/libf/dyn3d/leapfrog.f90 2012/07/26 14:37:37 62 @@ -18,7 +18,8 @@ USE comconst, ONLY: daysec, dtphys, dtvr USE comgeom, ONLY: aire_2d, apoln, apols USE comvert, ONLY: ap, bp - USE conf_gcm_m, ONLY: day_step, iconser, iperiod, iphysiq, nday, offline + USE conf_gcm_m, ONLY: day_step, iconser, iperiod, iphysiq, nday, offline, & + iflag_phys, ok_guide USE dimens_m, ONLY: iim, jjm, llm, nqmx use dissip_m, only: dissip USE dynetat0_m, ONLY: day_ini @@ -29,7 +30,6 @@ USE guide_m, ONLY: guide use inidissip_m, only: idissip use integrd_m, only: integrd - USE logic, ONLY: iflag_phys, ok_guide use nr_util, only: assert USE pressure_var, ONLY: p3d USE temps, ONLY: itau_dyn @@ -106,7 +106,7 @@ call assert(shape(ucov) == (/iim + 1, jjm + 1, llm/), "leapfrog") itaufin = nday * day_step - ! "day_step" is a multiple of "iperiod", therefore "itaufin" is one too + ! "day_step" is a multiple of "iperiod", therefore so is "itaufin". dq = 0. @@ -224,10 +224,10 @@ IF (MOD(itau + 1, iperiod) == 0) THEN ! Écriture du fichier histoire moyenne: - CALL writedynav(nqmx, itau + 1, vcov, ucov, teta, pk, phi, q, & - masse, ps, phis) + CALL writedynav(vcov, ucov, teta, pk, phi, q, masse, ps, phis, & + time = itau + 1) call bilan_dyn(ps, masse, pk, pbaru, pbarv, teta, phi, ucov, vcov, & - q(:, :, :, 1), dt_app = dtvr * iperiod) + q(:, :, :, 1)) ENDIF end do time_integration