/[lmdze]/trunk/libf/dyn3d/dissip.f90
ViewVC logotype

Diff of /trunk/libf/dyn3d/dissip.f90

Parent Directory Parent Directory | Revision Log Revision Log | View Patch Patch

revision 47 by guez, Fri Jul 1 15:00:48 2011 UTC revision 54 by guez, Tue Dec 6 15:07:04 2011 UTC
# Line 14  contains Line 14  contains
14      USE dimens_m, ONLY : iim, jjm, llm      USE dimens_m, ONLY : iim, jjm, llm
15      USE paramet_m, ONLY : iip1, iip2, ip1jmp1, llmp1      USE paramet_m, ONLY : iip1, iip2, ip1jmp1, llmp1
16      USE comdissnew, ONLY : lstardis, nitergdiv, nitergrot, niterh      USE comdissnew, ONLY : lstardis, nitergdiv, nitergrot, niterh
17      USE inidissip_m, ONLY : dtdiss, tetah, tetaudiv, tetaurot      USE inidissip_m, ONLY : dtdiss, tetah, tetaudiv, tetaurot, cdivu, crot, &
18             cdivh
19        use gradiv2_m, only: gradiv2
20    
21      ! Arguments:      ! Arguments:
22      REAL vcov((iim + 1) * jjm, llm), ucov(ip1jmp1, llm), teta(ip1jmp1, llm)      REAL vcov((iim + 1) * jjm, llm), ucov(ip1jmp1, llm), teta(ip1jmp1, llm)
# Line 44  contains Line 46  contains
46      ! Calcul de la partie grad (div) :      ! Calcul de la partie grad (div) :
47    
48      IF (lstardis) THEN      IF (lstardis) THEN
49         CALL gradiv2(llm, ucov, vcov, nitergdiv, gdx, gdy)         CALL gradiv2(llm, ucov, vcov, nitergdiv, gdx, gdy, cdivu)
50      ELSE      ELSE
51         CALL gradiv(llm, ucov, vcov, nitergdiv, gdx, gdy)         CALL gradiv(llm, ucov, vcov, nitergdiv, gdx, gdy, cdivu)
52      END IF      END IF
53    
54      DO l = 1, llm      DO l = 1, llm
# Line 66  contains Line 68  contains
68      ! calcul de la partie n X grad (rot) :      ! calcul de la partie n X grad (rot) :
69    
70      IF (lstardis) THEN      IF (lstardis) THEN
71         CALL nxgraro2(llm, ucov, vcov, nitergrot, grx, gry)         CALL nxgraro2(llm, ucov, vcov, nitergrot, grx, gry, crot)
72      ELSE      ELSE
73         CALL nxgrarot(llm, ucov, vcov, nitergrot, grx, gry)         CALL nxgrarot(llm, ucov, vcov, nitergrot, grx, gry, crot)
74      END IF      END IF
75    
76    
# Line 94  contains Line 96  contains
96            END DO            END DO
97         END DO         END DO
98    
99         CALL divgrad2(llm, teta, deltapres, niterh, gdx)         CALL divgrad2(llm, teta, deltapres, niterh, gdx, cdivh)
100      ELSE      ELSE
101         CALL divgrad(llm, teta, niterh, gdx)         CALL divgrad(llm, teta, niterh, gdx, cdivh)
102      END IF      END IF
103    
104      forall (l = 1: llm) dh(:, l) = dh(:, l) - te3dt(l) * gdx(:, l)      forall (l = 1: llm) dh(:, l) = dh(:, l) - te3dt(l) * gdx(:, l)
Legend:
Removed from v.47  
changed lines
  Added in v.54
  ViewVC Help
Powered by ViewVC 1.1.21