--- trunk/libf/dyn3d/leapfrog.f90 2010/04/09 10:56:14 33 +++ trunk/libf/dyn3d/leapfrog.f90 2011/04/08 12:43:31 43 @@ -8,8 +8,12 @@ ! From dyn3d/leapfrog.F, version 1.6, 2005/04/13 08:58:34 ! Authors: P. Le Van, L. Fairhead, F. Hourdin - ! schema matsuno + leapfrog + ! 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 com_io_dyn, ONLY: histaveid USE comconst, ONLY: daysec, dtphys, dtvr @@ -22,24 +26,29 @@ use dynredem1_m, only: dynredem1 USE exner_hyb_m, ONLY: exner_hyb use filtreg_m, only: filtreg + use geopot_m, only: geopot USE guide_m, ONLY: guide use inidissip_m, only: idissip use integrd_m, only: integrd USE logic, ONLY: iflag_phys, ok_guide USE paramet_m, ONLY: ip1jmp1 - USE pression_m, ONLY: pression USE pressure_var, ONLY: p3d USE temps, ONLY: itau_dyn ! Variables dynamiques: - REAL, intent(inout):: vcov((iim + 1) * jjm, llm) ! vent covariant REAL, intent(inout):: ucov(ip1jmp1, llm) ! vent covariant - REAL, intent(inout):: teta(iim + 1, jjm + 1, llm) ! potential temperature - REAL ps(iim + 1, jjm + 1) ! pression au sol, en Pa + REAL, intent(inout):: vcov((iim + 1) * jjm, llm) ! vent covariant + REAL, intent(inout):: teta(:, :, :) ! (iim + 1, jjm + 1, llm) + ! potential temperature + + REAL, intent(inout):: ps(iim + 1, jjm + 1) ! pression au sol, en Pa REAL masse(ip1jmp1, llm) ! masse d'air REAL phis(ip1jmp1) ! geopotentiel au sol - REAL q(ip1jmp1, llm, nqmx) ! mass fractions of advected fields + + 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: @@ -83,10 +92,11 @@ ! Variables test conservation energie REAL ecin(iim + 1, jjm + 1, llm), ecin0(iim + 1, jjm + 1, llm) - ! Tendance de la temp. potentiel d (theta) / d t due a la - ! tansformation d'energie cinetique en energie thermique - ! cree par la dissipation + REAL dtetaecdt(iim + 1, jjm + 1, llm) + ! tendance de la température potentielle due à la tansformation + ! d'énergie cinétique en énergie thermique créée par la dissipation + REAL vcont((iim + 1) * jjm, llm), ucont(ip1jmp1, llm) logical leapf real dt @@ -101,11 +111,10 @@ dq = 0. ! On initialise la pression et la fonction d'Exner : - CALL pression(ip1jmp1, ap, bp, ps, p3d) + forall (l = 1: llm + 1) p3d(:, :, l) = ap(l) + bp(l) * ps CALL exner_hyb(ps, p3d, pks, pk, pkf) - ! Début de l'integration temporelle : - do itau = 0, itaufin - 1 + time_integration: do itau = 0, itaufin - 1 leapf = mod(itau, iperiod) /= 0 if (leapf) then dt = 2 * dtvr @@ -137,12 +146,12 @@ dtvr, itau) ! integrations dynamique et traceurs: - CALL integrd(2, vcovm1, ucovm1, tetam1, psm1, massem1, dv, du, dteta, & - dp, vcov, ucov, teta, q, ps, masse, finvmaold, leapf, dt) + CALL integrd(vcovm1, ucovm1, tetam1, psm1, massem1, dv, du, dteta, dp, & + vcov, ucov, teta, q(:, :, :, :2), ps, masse, finvmaold, dt, leapf) if (.not. leapf) then ! Matsuno backward - CALL pression(ip1jmp1, ap, bp, ps, p3d) + forall (l = 1: llm + 1) p3d(:, :, l) = ap(l) + bp(l) * ps CALL exner_hyb(ps, p3d, pks, pk, pkf) ! Calcul des tendances dynamiques: @@ -151,15 +160,15 @@ phi, .false., du, dv, dteta, dp, w, pbaru, pbarv, time_0) ! integrations dynamique et traceurs: - CALL integrd(2, vcovm1, ucovm1, tetam1, psm1, massem1, dv, du, & - dteta, dp, vcov, ucov, teta, q, ps, masse, finvmaold, .false., & - dtvr) + CALL integrd(vcovm1, ucovm1, tetam1, psm1, massem1, dv, du, 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: - CALL pression(ip1jmp1, ap, bp, ps, p3d) + 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 @@ -167,16 +176,16 @@ time = REAL(mod(itau, day_step)) / day_step + time_0 IF (time > 1.) time = time - 1. - CALL calfis(nqmx, itau + 1 == itaufin, rdayvrai, time, ucov, vcov, & - teta, q, masse, ps, pk, phis, phi, du, dv, dteta, dq, w, dufi, & - dvfi, dtetafi, dqfi, dpfi) + CALL calfis(rdayvrai, time, ucov, vcov, teta, q, masse, ps, pk, & + phis, phi, du, dv, dteta, dq, w, dufi, dvfi, dtetafi, dqfi, & + dpfi, lafin=itau+1==itaufin) ! ajout des tendances physiques: CALL addfi(nqmx, dtphys, ucov, vcov, teta, q, ps, dufi, dvfi, & dtetafi, dqfi, dpfi) ENDIF - CALL pression(ip1jmp1, ap, bp, ps, p3d) + 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 @@ -213,13 +222,14 @@ END IF IF (MOD(itau + 1, iperiod) == 0) THEN - ! ecriture du fichier histoire moyenne: + ! Écriture du fichier histoire moyenne: CALL writedynav(histaveid, nqmx, itau + 1, vcov, ucov, teta, pk, & phi, q, masse, ps, phis) - call bilan_dyn(2, dtvr * iperiod, dtvr * day_step * periodav, ps, & - masse, pk, pbaru, pbarv, teta, phi, ucov, vcov, q) + call bilan_dyn(ps, masse, pk, pbaru, pbarv, teta, phi, ucov, vcov, & + q(:, :, :, 1), dt_app = dtvr * iperiod, & + dt_cum = dtvr * day_step * periodav) ENDIF - end do + end do time_integration CALL dynredem1("restart.nc", vcov, ucov, teta, q, masse, ps, & itau=itau_dyn+itaufin)