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

Diff of /trunk/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 189 by guez, Tue Mar 29 15:20:23 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
# Line 413  contains Line 410  contains
410    
411        use histwrite_m, only: histwrite        use histwrite_m, only: histwrite
412        use iniadvtrac_m, only: tname        use iniadvtrac_m, only: tname
413        use gr_phy_write_3d_m, only: gr_phy_write_3d        use gr_phy_write_m, only: gr_phy_write
414    
415        logical, intent(in):: lessivage        logical, intent(in):: lessivage
416        integer, intent(in):: itap ! number of calls to "physiq"        integer, intent(in):: itap ! number of calls to "physiq"
# Line 427  contains Line 424  contains
424    
425        itau_w = itau_phy + itap        itau_w = itau_phy + itap
426    
427        CALL histwrite(nid_ins, "zmasse", itau_w, gr_phy_write_3d(zmasse))        CALL histwrite(nid_ins, "zmasse", itau_w, gr_phy_write(zmasse))
428    
429        DO it=1, nqmx - 2        DO it=1, nqmx - 2
430           CALL histwrite(nid_ins, tname(it+2), itau_w, &           CALL histwrite(nid_ins, tname(it+2), itau_w, &
431                gr_phy_write_3d(tr_seri(:, :, it)))                gr_phy_write(tr_seri(:, :, it)))
432           if (lessivage) THEN           if (lessivage) THEN
433              CALL histwrite(nid_ins, "fl"//tname(it+2), itau_w, &              CALL histwrite(nid_ins, "fl"//tname(it+2), itau_w, &
434                   gr_phy_write_3d(flestottr(:, :, it)))                   gr_phy_write(flestottr(:, :, it)))
435           endif           endif
436           CALL histwrite(nid_ins, "d_tr_th_"//tname(it+2), itau_w, &           CALL histwrite(nid_ins, "d_tr_th_"//tname(it+2), itau_w, &
437                gr_phy_write_3d(d_tr_th(:, :, it)))                gr_phy_write(d_tr_th(:, :, it)))
438           CALL histwrite(nid_ins, "d_tr_cv_"//tname(it+2), itau_w, &           CALL histwrite(nid_ins, "d_tr_cv_"//tname(it+2), itau_w, &
439                gr_phy_write_3d(d_tr_cv(:, :, it)))                gr_phy_write(d_tr_cv(:, :, it)))
440           CALL histwrite(nid_ins, "d_tr_cl_"//tname(it+2), itau_w, &           CALL histwrite(nid_ins, "d_tr_cl_"//tname(it+2), itau_w, &
441                gr_phy_write_3d(d_tr_cl(:, :, it)))                gr_phy_write(d_tr_cl(:, :, it)))
442        ENDDO        ENDDO
443    
444      end subroutine write_histrac      end subroutine write_histrac
Legend:
Removed from v.181  
changed lines
  Added in v.189
  ViewVC Help
Powered by ViewVC 1.1.21