--- trunk/dyn3d/leapfrog.f90 2014/02/05 17:51:07 78 +++ 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,21 +54,19 @@ REAL, intent(inout):: q(:, :, :, :) ! (iim + 1, jjm + 1, llm, nqmx) ! mass fractions of advected fields - REAL, intent(in):: time_0 - - ! Variables local to the procedure: + ! Local: ! Variables dynamiques: REAL pks(iim + 1, jjm + 1) ! exner au sol REAL pk(iim + 1, jjm + 1, llm) ! exner au milieu des couches - REAL pkf(iim + 1, jjm + 1, llm) ! exner filtré au milieu des couches + REAL pkf(iim + 1, jjm + 1, llm) ! exner filtr\'e au milieu des couches REAL phi(iim + 1, jjm + 1, llm) ! geopotential - REAL w((iim + 1) * (jjm + 1), llm) ! vitesse verticale + REAL w(iim + 1, jjm + 1, llm) ! vitesse verticale ! Variables dynamiques intermediaire pour le transport ! Flux de masse : - REAL pbaru((iim + 1) * (jjm + 1), llm), pbarv((iim + 1) * jjm, llm) + REAL pbaru(iim + 1, jjm + 1, llm), pbarv(iim + 1, jjm, llm) ! Variables dynamiques au pas - 1 REAL vcovm1(iim + 1, jjm, llm), ucovm1(iim + 1, jjm + 1, llm) @@ -73,7 +74,7 @@ REAL massem1(iim + 1, jjm + 1, llm) ! Tendances dynamiques - REAL dv((iim + 1) * jjm, llm), dudyn((iim + 1) * (jjm + 1), llm) + REAL dv((iim + 1) * jjm, llm), dudyn(iim + 1, jjm + 1, llm) REAL dteta(iim + 1, jjm + 1, llm) real dp((iim + 1) * (jjm + 1)) @@ -82,25 +83,20 @@ REAL dtetadis(iim + 1, jjm + 1, llm) ! Tendances physiques - REAL dvfi((iim + 1) * jjm, llm), dufi((iim + 1) * (jjm + 1), llm) - REAL dtetafi(iim + 1, jjm + 1, llm), dqfi((iim + 1) * (jjm + 1), llm, nqmx) - real dpfi((iim + 1) * (jjm + 1)) + REAL dvfi(iim + 1, jjm, llm), dufi(iim + 1, jjm + 1, llm) + 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 énergie + ! Variables test conservation \'energie REAL ecin(iim + 1, jjm + 1, llm), ecin0(iim + 1, jjm + 1, llm) REAL vcont((iim + 1) * jjm, llm), ucont((iim + 1) * (jjm + 1), llm) logical leapf - real dt + real dt ! time step, in s !--------------------------------------------------- @@ -112,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 @@ -121,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) @@ -144,54 +139,46 @@ IF (offline) CALL fluxstokenc(pbaru, pbarv, masse, teta, phi, phis, & dtvr, itau) - ! Intégrations dynamique et traceurs: + ! 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 = pk + CALL filtreg_scal(pkf, direct = .true., intensive = .true.) if (.not. leapf) then ! Matsuno backward - forall (l = 1: llm + 1) p3d(:, :, l) = ap(l) + bp(l) * ps - CALL exner_hyb(ps, p3d, pks, pk, pkf) - ! 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.) - end if - - IF (MOD(itau + 1, iphysiq) == 0 .AND. iflag_phys /= 0) THEN - ! Calcul des tendances physiques: + 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) - - 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 exner_hyb(ps, p3d, pks, pk) + pkf = pk + CALL filtreg_scal(pkf, direct = .true., intensive = .true.) + end if - CALL calfis(rdayvrai, time, ucov, vcov, teta, q, ps, pk, phis, phi, & - dudyn, dv, w, dufi, dvfi, dtetafi, dqfi, dpfi, & + IF (MOD(itau + 1, iphysiq) == 0 .AND. iflag_phys /= 0) THEN + 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, ps, dufi, dvfi, dtetafi, dqfi, dpfi) + CALL addfi(ucov, vcov, teta, q, dufi, dvfi, dtetafi, dqfi) ENDIF - forall (l = 1: llm + 1) p3d(:, :, l) = ap(l) + bp(l) * ps - CALL exner_hyb(ps, p3d, pks, pk, pkf) - IF (MOD(itau + 1, idissip) == 0) THEN - ! Dissipation horizontale et verticale des petites échelles + ! Dissipation horizontale et verticale des petites \'echelles - ! calcul de l'énergie cinétique avant dissipation + ! calcul de l'\'energie cin\'etique avant dissipation call covcont(llm, ucov, vcov, ucont, vcont) call enercin(vcov, ucov, vcont, ucont, ecin0) @@ -200,28 +187,24 @@ ucov = ucov + dudis vcov = vcov + dvdis - ! On ajoute la tendance due à la transformation énergie - ! cinétique en énergie thermique par la dissipation + ! On ajoute la tendance due \`a la transformation \'energie + ! cin\'etique en \'energie thermique par la dissipation call covcont(llm, ucov, vcov, ucont, vcont) call enercin(vcov, ucov, vcont, ucont, ecin) dtetadis = dtetadis + (ecin0 - ecin) / pk teta = teta + dtetadis - ! Calcul de la valeur moyenne aux pôles : + ! Calcul de la valeur moyenne aux p\^oles : forall (l = 1: llm) teta(:, 1, l) = SUM(aire_2d(:iim, 1) * teta(:iim, 1, l)) & / apoln teta(:, jjm + 1, l) = SUM(aire_2d(:iim, jjm+1) & * teta(:iim, jjm + 1, l)) / apols END forall - - ps(:, 1) = SUM(aire_2d(:iim, 1) * ps(:iim, 1)) / apoln - ps(:, jjm + 1) = SUM(aire_2d(:iim, jjm+1) * ps(:iim, jjm + 1)) & - / apols END IF IF (MOD(itau + 1, iperiod) == 0) THEN - ! Écriture du fichier histoire moyenne: + ! \'Ecriture du fichier histoire moyenne: 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, & @@ -230,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