--- trunk/libf/dyn3d/integrd.f 2008/07/21 16:05:07 12 +++ trunk/Sources/dyn3d/integrd.f 2015/05/06 15:51:03 137 @@ -1,208 +1,155 @@ -! -! $Header: /home/cvsroot/LMDZ4/libf/dyn3d/integrd.F,v 1.1.1.1 2004/05/19 12:53:05 lmdzadmin Exp $ -! - SUBROUTINE integrd - $ ( nq,vcovm1,ucovm1,tetam1,psm1,massem1, - $ dv,du,dteta,dq,dp,vcov,ucov,teta,q,ps,masse,phis,finvmaold, - $ leapf ) - - use dimens_m - use paramet_m - use comconst - use comvert - use logic - use comgeom - use serre - use temps - use advtrac_m - use pression_m, only: pression - - IMPLICIT NONE - - -c======================================================================= -c -c Auteur: P. Le Van -c ------- -c -c objet: -c ------ -c -c Incrementation des tendances dynamiques -c -c======================================================================= -c----------------------------------------------------------------------- -c Declarations: -c ------------- - - -c Arguments: -c ---------- - - INTEGER nq - - REAL vcov(ip1jm,llm),ucov(ip1jmp1,llm),teta(ip1jmp1,llm) - REAL q(ip1jmp1,llm,nq) - REAL ps(ip1jmp1),masse(ip1jmp1,llm),phis(ip1jmp1) - - 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 dq(ip1jmp1,llm,nq), finvmaold(ip1jmp1,llm) - logical, intent(in):: leapf - -c Local: -c ------ - - REAL vscr( ip1jm ),uscr( ip1jmp1 ),hscr( ip1jmp1 ),pscr(ip1jmp1) - REAL massescr( ip1jmp1,llm ), finvmasse(ip1jmp1,llm) - REAL p(ip1jmp1,llmp1) - REAL tpn,tps,tppn(iim),tpps(iim) - REAL qpn,qps,qppn(iim),qpps(iim) - REAL deltap( ip1jmp1,llm ) - - INTEGER l,ij,iq - - REAL SSUM - -c----------------------------------------------------------------------- - - DO l = 1,llm - DO ij = 1,iip1 - ucov( ij , l) = 0. - ucov( ij +ip1jm, l) = 0. - uscr( ij ) = 0. - uscr( ij +ip1jm ) = 0. - ENDDO - ENDDO - - -c ............ integration de ps .............. - - CALL SCOPY(ip1jmp1*llm, masse, 1, massescr, 1) - - DO 2 ij = 1,ip1jmp1 - pscr (ij) = ps(ij) - ps (ij) = psm1(ij) + dt * dp(ij) - 2 CONTINUE -c - DO ij = 1,ip1jmp1 - IF( ps(ij).LT.0. ) THEN - PRINT *,' Au point ij = ',ij, ' , pression sol neg. ', ps(ij) - STOP 'integrd' - ENDIF - ENDDO -c - DO ij = 1, iim - tppn(ij) = aire( ij ) * ps( ij ) +module integrd_m + + IMPLICIT NONE + +contains + + 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 + ! Author: P. Le Van + ! Objet: incrémentation des tendances dynamiques + + USE comgeom, ONLY : aire, aire_2d, apoln, apols + USE dimens_m, ONLY : iim, jjm, llm + USE disvert_m, ONLY : ap, bp + USE filtreg_scal_m, ONLY : filtreg_scal + use massdair_m, only: massdair + use nr_util, only: assert + USE paramet_m, ONLY : iip1, iip2, ip1jm, ip1jmp1, jjp1, llmp1 + use qminimum_m, only: qminimum + + 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, 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 + + ! Local: + INTEGER nq + 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 deltap((iim + 1) * (jjm + 1), llm) + INTEGER l, ij, iq + + !----------------------------------------------------------------------- + + call assert(size(q, 1) == iim + 1, size(q, 2) == jjm + 1, & + size(q, 3) == llm, "integrd") + nq = size(q, 4) + + DO l = 1, llm + DO ij = 1, iip1 + ucov(ij, l) = 0. + ucov(ij+ip1jm, l) = 0. + uscr(ij) = 0. + uscr(ij+ip1jm) = 0. + END DO + END DO + + massescr = masse + + ! Integration de ps : + + pscr = ps + ps = psm1 + dt * dp + + 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) - ENDDO - tpn = SSUM(iim,tppn,1)/apoln - tps = SSUM(iim,tpps,1)/apols - DO ij = 1, iip1 - ps( ij ) = tpn - ps(ij+ip1jm) = tps - ENDDO -c -c ... Calcul de la nouvelle masse d'air au dernier temps integre t+1 ... -c - CALL pression ( ip1jmp1, ap, bp, ps, p ) - CALL massdair ( p , masse ) - - CALL SCOPY( ijp1llm , masse, 1, finvmasse, 1 ) - CALL filtreg( finvmasse, jjp1, llm, -2, 2, .TRUE., 1 ) -c - -c ............ integration de ucov, vcov, h .............. - - DO 10 l = 1,llm - - DO 4 ij = iip2,ip1jm - uscr( ij ) = ucov( ij,l ) - ucov( ij,l ) = ucovm1( ij,l ) + dt * du( ij,l ) - 4 CONTINUE - - DO 5 ij = 1,ip1jm - vscr( ij ) = vcov( ij,l ) - vcov( ij,l ) = vcovm1( ij,l ) + dt * dv( ij,l ) - 5 CONTINUE - - DO 6 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) - 6 CONTINUE - -c .... Calcul de la valeur moyenne, unique aux poles pour teta ...... -c -c - DO ij = 1, iim - tppn(ij) = aire( ij ) * teta( ij ,l) - tpps(ij) = aire(ij+ip1jm) * teta(ij+ip1jm,l) - ENDDO - 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 - ENDDO -c - - 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 ) - END IF - - 10 CONTINUE - - DO l = 1, llm - DO ij = 1, ip1jmp1 - deltap(ij,l) = p(ij,l) - p(ij,l+1) - ENDDO - ENDDO - - CALL qminimum( q, nq, deltap ) -c -c ..... Calcul de la valeur moyenne, unique aux poles pour q ..... -c - - DO iq = 1, nq - DO l = 1, llm - - DO ij = 1, iim - qppn(ij) = aire( ij ) * q( ij ,l,iq) - qpps(ij) = aire(ij+ip1jm) * q(ij+ip1jm,l,iq) - ENDDO - qpn = SSUM(iim,qppn,1)/apoln - qps = SSUM(iim,qpps,1)/apols - - DO ij = 1, iip1 - q( ij ,l,iq) = qpn - q(ij+ip1jm,l,iq) = qps - ENDDO - - ENDDO - ENDDO - - - CALL SCOPY( ijp1llm , finvmasse, 1, finvmaold, 1 ) -c -c -c ..... FIN de l'integration de q ....... - -15 continue - -c ................................................................. - - - IF( leapf ) THEN - CALL SCOPY ( ip1jmp1 , pscr , 1, psm1 , 1 ) - CALL SCOPY ( ip1jmp1*llm, massescr, 1, massem1, 1 ) - END IF + END DO + tpn = sum(tppn)/apoln + tps = sum(tpps)/apols + DO ij = 1, iip1 + ps(ij) = tpn + ps(ij+ip1jm) = tps + END DO + + ! Calcul de la nouvelle masse d'air au dernier temps integre t+1 + + forall (l = 1: llm + 1) p(:, l) = ap(l) + bp(l) * ps + CALL massdair(p, masse) + + finvmasse = masse + CALL filtreg_scal(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 * dudyn(ij, l) + END DO + + DO ij = 1, ip1jm + vscr(ij) = vcov(ij, l) + vcov(ij, l) = vcovm1(ij, l) + dt * dv(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 + 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 + ucovm1(:, l) =uscr + vcovm1(:, l) = vscr + tetam1(:, :, l) = hscr + END IF + END DO + + DO l = 1, llm + DO ij = 1, (iim + 1) * (jjm + 1) + deltap(ij, l) = p(ij, l) - p(ij, l+1) + END DO + END DO + + CALL qminimum(q, nq, deltap) + + ! Calcul de la valeur moyenne, unique aux poles pour q + DO iq = 1, nq + DO l = 1, llm + 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 + + finvmaold = finvmasse + + ! Fin de l'integration de q + + IF (leapf) THEN + psm1 = pscr + massem1 = massescr + END IF + + END SUBROUTINE integrd - RETURN - END +end module integrd_m