/[lmdze]/trunk/Sources/phylmd/phytrac.f
ViewVC logotype

Diff of /trunk/Sources/phylmd/phytrac.f

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

revision 181 by guez, Tue Mar 15 17:51:30 2016 UTC revision 182 by guez, Wed Mar 16 11:11:27 2016 UTC
# Line 28  contains Line 28  contains
28    
29      use abort_gcm_m, only: abort_gcm      use abort_gcm_m, only: abort_gcm
30      use clesphys, only: ecrit_tra      use clesphys, only: ecrit_tra
31      use clesphys2, only: iflag_con      use clesphys2, only: conv_emanuel
32      use cltrac_m, only: cltrac      use cltrac_m, only: cltrac
33      use cltracrn_m, only: cltracrn      use cltracrn_m, only: cltracrn
34      use ctherm, only: iflag_thermals      use ctherm, only: iflag_thermals
# Line 230  contains Line 230  contains
230      if (convection) then      if (convection) then
231         ! Calcul de l'effet de la convection         ! Calcul de l'effet de la convection
232         DO it=1, nqmx - 2         DO it=1, nqmx - 2
233            if (iflag_con == 2) then            if (conv_emanuel) then
              ! Tiedke  
              CALL nflxtr(pdtphys, pmfu, pmfd, pde_u, pen_d, paprs, &  
                   tr_seri(:, :, it), d_tr_cv(:, :, it))  
           else  
              ! iflag_con >= 3  
              ! Emanuel  
234               call cvltr(pdtphys, da, phi, mp, paprs, tr_seri(:, :, it), upwd, &               call cvltr(pdtphys, da, phi, mp, paprs, tr_seri(:, :, it), upwd, &
235                    dnwd, d_tr_cv(:, :, it))                    dnwd, d_tr_cv(:, :, it))
236              else
237                 CALL nflxtr(pdtphys, pmfu, pmfd, pde_u, pen_d, paprs, &
238                      tr_seri(:, :, it), d_tr_cv(:, :, it))
239            endif            endif
240    
241            DO k = 1, llm            DO k = 1, llm

Legend:
Removed from v.181  
changed lines
  Added in v.182

  ViewVC Help
Powered by ViewVC 1.1.21