--- trunk/dyn3d/leapfrog.f 2014/04/25 14:58:31 97 +++ trunk/Sources/dyn3d/leapfrog.f 2015/07/24 14:27:59 161 @@ -4,28 +4,31 @@ contains - SUBROUTINE leapfrog(ucov, vcov, teta, ps, masse, phis, q, time_0) + SUBROUTINE leapfrog(ucov, vcov, teta, ps, masse, phis, q) ! From dyn3d/leapfrog.F, version 1.6, 2005/04/13 08:58:34 revision 616 ! Authors: P. Le Van, L. Fairhead, F. Hourdin - ! Matsuno-leapfrog scheme. + + ! Intégration temporelle du modèle : Matsuno-leapfrog scheme. use addfi_m, only: addfi use bilan_dyn_m, only: bilan_dyn use caladvtrac_m, only: caladvtrac use caldyn_m, only: caldyn USE calfis_m, ONLY: calfis - USE comconst, ONLY: daysec, dtphys, dtvr + USE comconst, ONLY: daysec, dtvr USE comgeom, ONLY: aire_2d, apoln, apols + use covcont_m, only: covcont USE disvert_m, ONLY: ap, bp USE conf_gcm_m, ONLY: day_step, iconser, iperiod, iphysiq, nday, offline, & - iflag_phys, ok_guide, iecri + iflag_phys, iecri + USE conf_guide_m, ONLY: ok_guide USE dimens_m, ONLY: iim, jjm, llm, nqmx use dissip_m, only: dissip USE dynetat0_m, ONLY: day_ini use dynredem1_m, only: dynredem1 USE exner_hyb_m, ONLY: exner_hyb - use filtreg_m, only: filtreg + use filtreg_scal_m, only: filtreg_scal use fluxstokenc_m, only: fluxstokenc use geopot_m, only: geopot USE guide_m, ONLY: guide @@ -51,8 +54,6 @@ REAL, intent(inout):: q(:, :, :, :) ! (iim + 1, jjm + 1, llm, nqmx) ! mass fractions of advected fields - REAL, intent(in):: time_0 - ! Local: ! Variables dynamiques: @@ -86,13 +87,9 @@ REAL dtetafi(iim + 1, jjm + 1, llm), dqfi(iim + 1, jjm + 1, llm, nqmx) ! Variables pour le fichier histoire - INTEGER itau ! index of the time step of the dynamics, starts at 0 INTEGER itaufin - REAL time ! time of day, as a fraction of day length - real finvmaold(iim + 1, jjm + 1, llm) INTEGER l - REAL rdayvrai, rdaym_ini ! Variables test conservation \'energie REAL ecin(iim + 1, jjm + 1, llm), ecin0(iim + 1, jjm + 1, llm) @@ -111,7 +108,9 @@ ! On initialise la pression et la fonction d'Exner : forall (l = 1: llm + 1) p3d(:, :, l) = ap(l) + bp(l) * ps - CALL exner_hyb(ps, p3d, pks, pk, pkf) + CALL exner_hyb(ps, p3d, pks, pk) + pkf = pk + CALL filtreg_scal(pkf, direct = .true., intensive = .true.) time_integration: do itau = 0, itaufin - 1 leapf = mod(itau, iperiod) /= 0 @@ -120,21 +119,18 @@ else ! Matsuno dt = dtvr - if (ok_guide .and. (itaufin - itau - 1) * dtvr > 21600.) & - call guide(itau, ucov, vcov, teta, q, masse, ps) + if (ok_guide) call guide(itau, ucov, vcov, teta, q(:, :, :, 1), ps) vcovm1 = vcov ucovm1 = ucov tetam1 = teta massem1 = masse psm1 = ps - finvmaold = masse - CALL filtreg(finvmaold, jjm + 1, llm, - 2, 2, .TRUE.) end if ! Calcul des tendances dynamiques: CALL geopot(teta, pk, pks, phis, phi) CALL caldyn(itau, ucov, vcov, teta, ps, masse, pk, pkf, phis, phi, & - dudyn, dv, dteta, dp, w, pbaru, pbarv, time_0, & + dudyn, dv, dteta, dp, w, pbaru, pbarv, & conser = MOD(itau, iconser) == 0) CALL caladvtrac(q, pbaru, pbarv, p3d, masse, teta, pk) @@ -145,41 +141,37 @@ ! Int\'egrations dynamique et traceurs: CALL integrd(vcovm1, ucovm1, tetam1, psm1, massem1, dv, dudyn, dteta, & - dp, vcov, ucov, teta, q(:, :, :, :2), ps, masse, finvmaold, dt, & - leapf) + dp, vcov, ucov, teta, q(:, :, :, :2), ps, masse, dt, leapf) forall (l = 1: llm + 1) p3d(:, :, l) = ap(l) + bp(l) * ps - CALL exner_hyb(ps, p3d, pks, pk, pkf) + CALL exner_hyb(ps, p3d, pks, pk) + pkf = pk + CALL filtreg_scal(pkf, direct = .true., intensive = .true.) if (.not. leapf) then ! Matsuno backward ! Calcul des tendances dynamiques: CALL geopot(teta, pk, pks, phis, phi) CALL caldyn(itau + 1, ucov, vcov, teta, ps, masse, pk, pkf, phis, & - phi, dudyn, dv, dteta, dp, w, pbaru, pbarv, time_0, & - conser = .false.) + phi, dudyn, dv, dteta, dp, w, pbaru, pbarv, conser = .false.) ! integrations dynamique et traceurs: CALL integrd(vcovm1, ucovm1, tetam1, psm1, massem1, dv, dudyn, & - dteta, dp, vcov, ucov, teta, q(:, :, :, :2), ps, masse, & - finvmaold, dtvr, leapf=.false.) + dteta, dp, vcov, ucov, teta, q(:, :, :, :2), ps, masse, dtvr, & + leapf=.false.) forall (l = 1: llm + 1) p3d(:, :, l) = ap(l) + bp(l) * ps - CALL exner_hyb(ps, p3d, pks, pk, pkf) + CALL exner_hyb(ps, p3d, pks, pk) + pkf = pk + CALL filtreg_scal(pkf, direct = .true., intensive = .true.) end if IF (MOD(itau + 1, iphysiq) == 0 .AND. iflag_phys /= 0) THEN - ! Calcul des tendances physiques: - - rdaym_ini = itau * dtvr / daysec - rdayvrai = rdaym_ini + day_ini - time = REAL(mod(itau, day_step)) / day_step + time_0 - IF (time > 1.) time = time - 1. - - CALL calfis(rdayvrai, time, ucov, vcov, teta, q, pk, phis, phi, w, & - dufi, dvfi, dtetafi, dqfi, lafin = itau + 1 == itaufin) + CALL calfis(ucov, vcov, teta, q, pk, phis, phi, w, dufi, dvfi, & + dtetafi, dqfi, dayvrai = itau / day_step + day_ini, & + time = REAL(mod(itau, day_step)) / day_step, & + lafin = itau + 1 == itaufin) - ! Ajout des tendances physiques: CALL addfi(ucov, vcov, teta, q, dufi, dvfi, dtetafi, dqfi) ENDIF @@ -221,17 +213,16 @@ IF (MOD(itau + 1, iecri * day_step) == 0) THEN CALL geopot(teta, pk, pks, phis, phi) - CALL writehist(itau, vcov, ucov, teta, phi, q, masse, ps) + CALL writehist(itau, vcov, ucov, teta, phi, masse, ps) END IF end do time_integration - CALL dynredem1("restart.nc", vcov, ucov, teta, q, masse, ps, & - itau = itau_dyn + itaufin) + CALL dynredem1(vcov, ucov, teta, q, masse, ps, itau = itau_dyn + itaufin) ! Calcul des tendances dynamiques: CALL geopot(teta, pk, pks, phis, phi) CALL caldyn(itaufin, ucov, vcov, teta, ps, masse, pk, pkf, phis, phi, & - dudyn, dv, dteta, dp, w, pbaru, pbarv, time_0, & + dudyn, dv, dteta, dp, w, pbaru, pbarv, & conser = MOD(itaufin, iconser) == 0) END SUBROUTINE leapfrog