/[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 171 by guez, Tue Sep 29 19:48:59 2015 UTC revision 182 by guez, Wed Mar 16 11:11:27 2016 UTC
# Line 10  contains Line 10  contains
10    SUBROUTINE phytrac(itap, lmt_pas, julien, gmtime, firstcal, lafin, pdtphys, &    SUBROUTINE phytrac(itap, lmt_pas, julien, gmtime, firstcal, lafin, pdtphys, &
11         t_seri, paprs, pplay, pmfu, pmfd, pde_u, pen_d, coefh, fm_therm, &         t_seri, paprs, pplay, pmfu, pmfd, pde_u, pen_d, coefh, fm_therm, &
12         entr_therm, yu1, yv1, ftsol, pctsrf, frac_impa, frac_nucl, da, phi, &         entr_therm, yu1, yv1, ftsol, pctsrf, frac_impa, frac_nucl, da, phi, &
13         mp, upwd, dnwd, tr_seri, zmasse, ncid_startphy, nid_ins)         mp, upwd, dnwd, tr_seri, zmasse, ncid_startphy, nid_ins, itau_phy)
14    
15      ! From phylmd/phytrac.F, version 1.15 2006/02/21 08:08:30 (SVN revision 679)      ! From phylmd/phytrac.F, version 1.15 2006/02/21 08:08:30 (SVN revision 679)
16    
# 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 102  contains Line 102  contains
102      real, intent(in):: zmasse(:, :) ! (klon, llm)      real, intent(in):: zmasse(:, :) ! (klon, llm)
103      ! (column-density of mass of air in a cell, in kg m-2)      ! (column-density of mass of air in a cell, in kg m-2)
104    
105      integer, intent(in):: ncid_startphy, nid_ins      integer, intent(in):: ncid_startphy, nid_ins, itau_phy
106    
107      ! Local:      ! Local:
108    
# 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 if (iflag_con == 3) then  
              ! 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
# Line 410  contains Line 408  contains
408    
409        ! From phylmd/write_histrac.h, version 1.9 2006/02/21 08:08:30        ! From phylmd/write_histrac.h, version 1.9 2006/02/21 08:08:30
410    
       use dimens_m, only: iim, jjm, llm  
       use histsync_m, only: histsync  
411        use histwrite_m, only: histwrite        use histwrite_m, only: histwrite
       use temps, only: itau_phy  
412        use iniadvtrac_m, only: tname        use iniadvtrac_m, only: tname
       use dimphy, only: klon  
       use grid_change, only: gr_phy_write_2d  
413        use gr_phy_write_3d_m, only: gr_phy_write_3d        use gr_phy_write_3d_m, only: gr_phy_write_3d
414    
415        logical, intent(in):: lessivage        logical, intent(in):: lessivage
Legend:
Removed from v.171  
changed lines
  Added in v.182
  ViewVC Help
Powered by ViewVC 1.1.21