--- trunk/libf/dyn3d/integrd.f90 2011/02/22 13:49:36 40 +++ trunk/Sources/dyn3d/integrd.f 2015/04/29 15:47:56 134 @@ -4,49 +4,48 @@ contains - SUBROUTINE integrd(vcovm1, ucovm1, tetam1, psm1, massem1, dv, du, & - dteta, dp, vcov, ucov, teta, q, ps, masse, finvmaold, dt, leapf) + SUBROUTINE integrd(vcovm1, ucovm1, tetam1, psm1, massem1, dv, dudyn, dteta, & + dp, vcov, ucov, teta, q, ps, masse, finvmaold, dt, leapf) - ! From dyn3d/integrd.F, version 1.1.1.1 2004/05/19 12:53:05 - ! Auteur: P. Le Van + ! From dyn3d/integrd.F, version 1.1.1.1, 2004/05/19 12:53:05 + ! Author: P. Le Van ! Objet: incrémentation des tendances dynamiques - USE comvert, ONLY : ap, bp - USE comgeom, ONLY : aire, apoln, apols + USE comgeom, ONLY : aire, aire_2d, apoln, apols USE dimens_m, ONLY : iim, jjm, llm + USE disvert_m, ONLY : ap, bp USE filtreg_m, ONLY : filtreg + use massdair_m, only: massdair use nr_util, only: assert - USE paramet_m, ONLY : iip1, iip2, ijp1llm, ip1jm, ip1jmp1, jjp1, llmp1 + USE paramet_m, ONLY : iip1, iip2, ip1jm, ip1jmp1, jjp1, llmp1 + use qminimum_m, only: qminimum - ! Arguments: - - REAL vcov(ip1jm, llm), ucov(ip1jmp1, llm), teta(ip1jmp1, llm) + REAL vcovm1(ip1jm, llm), ucovm1((iim + 1) * (jjm + 1), llm) + REAL, intent(inout):: tetam1(iim + 1, jjm + 1, llm) + REAL, intent(inout):: psm1((iim + 1) * (jjm + 1)) + real massem1(iim + 1, jjm + 1, llm) + REAL, intent(in):: dv(ip1jm, llm), dudyn((iim + 1) * (jjm + 1), llm) + REAL dteta(iim + 1, jjm + 1, llm), dp((iim + 1) * (jjm + 1)) + REAL, intent(inout):: vcov(ip1jm, llm), ucov((iim + 1) * (jjm + 1), llm) + real, intent(inout):: teta(iim + 1, jjm + 1, llm) REAL q(:, :, :, :) ! (iim + 1, jjm + 1, llm, nq) - REAL ps(ip1jmp1), masse(ip1jmp1, llm) - - REAL vcovm1(ip1jm, llm), ucovm1(ip1jmp1, llm) - REAL tetam1(ip1jmp1, llm), psm1(ip1jmp1), massem1(ip1jmp1, llm) - - REAL dv(ip1jm, llm), du(ip1jmp1, llm) - REAL dteta(ip1jmp1, llm), dp(ip1jmp1) - REAL finvmaold(ip1jmp1, llm) + REAL, intent(inout):: ps((iim + 1) * (jjm + 1)) + REAL, intent(inout):: masse(iim + 1, jjm + 1, llm) + REAL finvmaold(iim + 1, jjm + 1, llm) + real, intent(in):: dt ! time step, in s LOGICAL, INTENT (IN) :: leapf - real, intent(in):: dt ! Local: - INTEGER nq - REAL vscr(ip1jm), uscr(ip1jmp1), hscr(ip1jmp1), pscr(ip1jmp1) - REAL massescr(ip1jmp1, llm), finvmasse(ip1jmp1, llm) - REAL p(ip1jmp1, llmp1) + REAL vscr(ip1jm), uscr((iim + 1) * (jjm + 1)), hscr(iim + 1, jjm + 1) + real pscr((iim + 1) * (jjm + 1)) + REAL massescr(iim + 1, jjm + 1, llm) + real finvmasse(iim + 1, jjm + 1, llm) + REAL p((iim + 1) * (jjm + 1), llmp1) REAL tpn, tps, tppn(iim), tpps(iim) - REAL qpn, qps, qppn(iim), qpps(iim) - REAL deltap(ip1jmp1, llm) - + REAL deltap((iim + 1) * (jjm + 1), llm) INTEGER l, ij, iq - REAL ssum - !----------------------------------------------------------------------- call assert(size(q, 1) == iim + 1, size(q, 2) == jjm + 1, & @@ -62,28 +61,27 @@ END DO END DO - ! integration de ps + massescr = masse - CALL scopy(ip1jmp1*llm, masse, 1, massescr, 1) + ! Integration de ps : - DO ij = 1, ip1jmp1 - pscr(ij) = ps(ij) - ps(ij) = psm1(ij) + dt*dp(ij) - END DO + pscr = ps + ps = psm1 + dt * dp - DO ij = 1, ip1jmp1 - IF (ps(ij)<0.) THEN - PRINT *, ' Au point ij = ', ij, ' , pression sol neg. ', ps(ij) - STOP 'integrd' + DO ij = 1, (iim + 1) * (jjm + 1) + IF (ps(ij) < 0.) THEN + PRINT *, 'integrd: au point ij = ', ij, & + ', negative surface pressure ', ps(ij) + STOP 1 END IF END DO DO ij = 1, iim - tppn(ij) = aire(ij)*ps(ij) - tpps(ij) = aire(ij+ip1jm)*ps(ij+ip1jm) + tppn(ij) = aire(ij) * ps(ij) + tpps(ij) = aire(ij+ip1jm) * ps(ij+ip1jm) END DO - tpn = ssum(iim, tppn, 1)/apoln - tps = ssum(iim, tpps, 1)/apols + tpn = sum(tppn)/apoln + tps = sum(tpps)/apols DO ij = 1, iip1 ps(ij) = tpn ps(ij+ip1jm) = tps @@ -94,51 +92,40 @@ forall (l = 1: llm + 1) p(:, l) = ap(l) + bp(l) * ps CALL massdair(p, masse) - CALL scopy(ijp1llm, masse, 1, finvmasse, 1) - CALL filtreg(finvmasse, jjp1, llm, -2, 2, .TRUE., 1) + finvmasse = masse + CALL filtreg(finvmasse, direct = .false., intensive = .false.) ! integration de ucov, vcov, h DO l = 1, llm DO ij = iip2, ip1jm uscr(ij) = ucov(ij, l) - ucov(ij, l) = ucovm1(ij, l) + dt*du(ij, l) + ucov(ij, l) = ucovm1(ij, l) + dt * dudyn(ij, l) END DO DO ij = 1, ip1jm vscr(ij) = vcov(ij, l) - vcov(ij, l) = vcovm1(ij, l) + dt*dv(ij, l) + vcov(ij, l) = vcovm1(ij, l) + dt * dv(ij, l) END DO - DO ij = 1, ip1jmp1 - hscr(ij) = teta(ij, l) - teta(ij, l) = tetam1(ij, l)*massem1(ij, l)/masse(ij, l) + & - dt*dteta(ij, l)/masse(ij, l) - END DO + hscr = teta(:, :, l) + teta(:, :, l) = tetam1(:, :, l) * massem1(:, :, l) / masse(:, :, l) & + + dt * dteta(:, :, l) / masse(:, :, l) ! Calcul de la valeur moyenne, unique aux poles pour teta - - DO ij = 1, iim - tppn(ij) = aire(ij)*teta(ij, l) - tpps(ij) = aire(ij+ip1jm)*teta(ij+ip1jm, l) - END DO - tpn = ssum(iim, tppn, 1)/apoln - tps = ssum(iim, tpps, 1)/apols - - DO ij = 1, iip1 - teta(ij, l) = tpn - teta(ij+ip1jm, l) = tps - END DO + 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 IF (leapf) THEN - CALL scopy(ip1jmp1, uscr(1), 1, ucovm1(1, l), 1) - CALL scopy(ip1jm, vscr(1), 1, vcovm1(1, l), 1) - CALL scopy(ip1jmp1, hscr(1), 1, tetam1(1, l), 1) + ucovm1(:, l) =uscr + vcovm1(:, l) = vscr + tetam1(:, :, l) = hscr END IF END DO DO l = 1, llm - DO ij = 1, ip1jmp1 + DO ij = 1, (iim + 1) * (jjm + 1) deltap(ij, l) = p(ij, l) - p(ij, l+1) END DO END DO @@ -146,30 +133,21 @@ CALL qminimum(q, nq, deltap) ! Calcul de la valeur moyenne, unique aux poles pour q - DO iq = 1, nq DO l = 1, llm - DO ij = 1, iim - qppn(ij) = aire(ij)*q(ij, 1, l, iq) - qpps(ij) = aire(ij+ip1jm)*q(ij, jjm + 1, l, iq) - END DO - qpn = ssum(iim, qppn, 1)/apoln - qps = ssum(iim, qpps, 1)/apols - - DO ij = 1, iip1 - q(ij, 1, l, iq) = qpn - q(ij, jjm + 1, l, iq) = qps - END DO + q(:, 1, l, iq) = sum(aire_2d(:iim, 1) * q(:iim, 1, l, iq)) / apoln + q(:, jjm + 1, l, iq) = sum(aire_2d(:iim, jjm + 1) & + * q(:iim, jjm + 1, l, iq)) / apols END DO END DO - CALL scopy(ijp1llm, finvmasse, 1, finvmaold, 1) + finvmaold = finvmasse ! Fin de l'integration de q IF (leapf) THEN - CALL scopy(ip1jmp1, pscr, 1, psm1, 1) - CALL scopy(ip1jmp1*llm, massescr, 1, massem1, 1) + psm1 = pscr + massem1 = massescr END IF END SUBROUTINE integrd