/[lmdze]/trunk/dyn3d/caldyn.f
ViewVC logotype

Diff of /trunk/dyn3d/caldyn.f

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

revision 207 by guez, Thu Sep 1 10:30:53 2016 UTC revision 252 by guez, Mon Jan 22 15:02:56 2018 UTC
# Line 14  contains Line 14  contains
14      use advect_m, only: advect      use advect_m, only: advect
15      use bernoui_m, only: bernoui      use bernoui_m, only: bernoui
16      USE comconst, ONLY: daysec, dtvr      USE comconst, ONLY: daysec, dtvr
17      USE comgeom, ONLY: airesurg, constang_2d      USE comgeom, ONLY: airesurg_2d, constang_2d
18      USE conf_gcm_m, ONLY: day_step      USE conf_gcm_m, ONLY: day_step
19      use convmas_m, only: convmas      use convmas_m, only: convmas
20      use covcont_m, only: covcont      use covcont_m, only: covcont
# Line 47  contains Line 47  contains
47      REAL dudyn(:, :, :) ! (iim + 1, jjm + 1, llm)      REAL dudyn(:, :, :) ! (iim + 1, jjm + 1, llm)
48      real dv((iim + 1) * jjm, llm)      real dv((iim + 1) * jjm, llm)
49      REAL, INTENT(out):: dteta(:, :, :) ! (iim + 1, jjm + 1, llm)      REAL, INTENT(out):: dteta(:, :, :) ! (iim + 1, jjm + 1, llm)
50      real, INTENT(out):: dp(ip1jmp1)      real, INTENT(out):: dp(:, :) ! (iim + 1, jjm + 1)
51      REAL, INTENT(out):: w(:, :, :) ! (iim + 1, jjm + 1, llm)      REAL, INTENT(out):: w(:, :, :) ! (iim + 1, jjm + 1, llm)
52      REAL, intent(out):: pbaru(ip1jmp1, llm), pbarv((iim + 1) * jjm, llm)      REAL, intent(out):: pbaru(:, :, :) ! (iim + 1, jjm + 1, llm)
53        REAL, intent(out):: pbarv(:, :, :) ! (iim + 1, jjm, llm)
54      LOGICAL, INTENT(IN):: conser      LOGICAL, INTENT(IN):: conser
55    
56      ! Local:      ! Local:
# Line 57  contains Line 58  contains
58      REAL ang_3d(iim + 1, jjm + 1, llm), p(ip1jmp1, llmp1)      REAL ang_3d(iim + 1, jjm + 1, llm), p(ip1jmp1, llmp1)
59      REAL massebx(ip1jmp1, llm), masseby((iim + 1) * jjm, llm)      REAL massebx(ip1jmp1, llm), masseby((iim + 1) * jjm, llm)
60      REAL vorpot(iim + 1, jjm, llm)      REAL vorpot(iim + 1, jjm, llm)
61      real ecin(iim + 1, jjm + 1, llm), convm(ip1jmp1, llm)      real ecin(iim + 1, jjm + 1, llm), convm(iim + 1, jjm + 1, llm)
62      REAL bern(iim + 1, jjm + 1, llm)      REAL bern(iim + 1, jjm + 1, llm)
63      REAL massebxy(iim + 1, jjm, llm)      REAL massebxy(iim + 1, jjm, llm)
64      INTEGER ij, l      INTEGER ij, l
# Line 73  contains Line 74  contains
74      CALL flumass(massebx, masseby, vcont, ucont, pbaru, pbarv)      CALL flumass(massebx, masseby, vcont, ucont, pbaru, pbarv)
75      CALL dteta1(teta, pbaru, pbarv, dteta)      CALL dteta1(teta, pbaru, pbarv, dteta)
76      CALL convmas(pbaru, pbarv, convm)      CALL convmas(pbaru, pbarv, convm)
77      dp = convm(:, 1) / airesurg      dp = convm(:, :, 1) / airesurg_2d
78      CALL vitvert(convm, w)      w = vitvert(convm)
79      CALL tourpot(vcov, ucov, massebxy, vorpot)      CALL tourpot(vcov, ucov, massebxy, vorpot)
80      CALL dudv1(vorpot, pbaru, pbarv, dudyn(:, 2: jjm, :), dv)      CALL dudv1(vorpot, pbaru, pbarv, dudyn(:, 2: jjm, :), dv)
81      CALL enercin(vcov, ucov, vcont, ucont, ecin)      CALL enercin(vcov, ucov, vcont, ucont, ecin)
Legend:
Removed from v.207  
changed lines
  Added in v.252
  ViewVC Help
Powered by ViewVC 1.1.21