/[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 118 by guez, Thu Dec 18 17:30:24 2014 UTC revision 131 by guez, Fri Feb 27 16:44:07 2015 UTC
# Line 29  contains Line 29  contains
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: iflag_con
32        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
35        use cvltr_m, only: cvltr
36      use dimens_m, only: llm, nqmx      use dimens_m, only: llm, nqmx
37      use dimphy, only: klon      use dimphy, only: klon
38      use indicesol, only: nbsrf      use indicesol, only: nbsrf
# Line 234  contains Line 236  contains
236                    tr_seri(:, :, it), d_tr_cv(:, :, it))                    tr_seri(:, :, it), d_tr_cv(:, :, it))
237            else if (iflag_con == 3) then            else if (iflag_con == 3) then
238               ! Emanuel               ! Emanuel
239               call cvltr(pdtphys, da, phi, mp, paprs, tr_seri(1, 1, it), upwd, &               call cvltr(pdtphys, da, phi, mp, paprs, tr_seri(:, :, it), upwd, &
240                    dnwd, d_tr_cv(1, 1, it))                    dnwd, d_tr_cv(:, :, it))
241            endif            endif
242    
243            DO k = 1, llm            DO k = 1, llm
# Line 319  contains Line 321  contains
321                  source(i) = 0.0 ! pas de source, pour l'instant                  source(i) = 0.0 ! pas de source, pour l'instant
322               ENDDO               ENDDO
323    
324               CALL cltrac(pdtphys, coefh, t_seri, &               CALL cltrac(pdtphys, coefh, t_seri, tr_seri(:, :, it), source, &
325                    tr_seri(1, 1, it), source, &                    paprs, pplay, delp, d_tr_cl(1, 1, it))
                   paprs, pplay, delp, &  
                   d_tr_cl(1, 1, it))  
326               DO k = 1, llm               DO k = 1, llm
327                  DO i = 1, klon                  DO i = 1, klon
328                     tr_seri(i, k, it) = tr_seri(i, k, it) + d_tr_cl(i, k, it)                     tr_seri(i, k, it) = tr_seri(i, k, it) + d_tr_cl(i, k, it)
# Line 426  contains Line 426  contains
426        use histsync_m, only: histsync        use histsync_m, only: histsync
427        use histwrite_m, only: histwrite        use histwrite_m, only: histwrite
428        use temps, only: itau_phy        use temps, only: itau_phy
429        use iniadvtrac_m, only: tnom        use iniadvtrac_m, only: tname
430        use comgeomphy, only: airephy        use comgeomphy, only: airephy
431        use dimphy, only: klon        use dimphy, only: klon
432        use grid_change, only: gr_phy_write_2d        use grid_change, only: gr_phy_write_2d
# Line 450  contains Line 450  contains
450        CALL histwrite(nid_tra, "zmasse", itau_w, gr_phy_write_3d(zmasse))        CALL histwrite(nid_tra, "zmasse", itau_w, gr_phy_write_3d(zmasse))
451    
452        DO it=1, nqmx - 2        DO it=1, nqmx - 2
453           CALL histwrite(nid_tra, tnom(it+2), itau_w, &           CALL histwrite(nid_tra, tname(it+2), itau_w, &
454                gr_phy_write_3d(tr_seri(:, :, it)))                gr_phy_write_3d(tr_seri(:, :, it)))
455           if (lessivage) THEN           if (lessivage) THEN
456              CALL histwrite(nid_tra, "fl"//tnom(it+2), itau_w, &              CALL histwrite(nid_tra, "fl"//tname(it+2), itau_w, &
457                   gr_phy_write_3d(flestottr(:, :, it)))                   gr_phy_write_3d(flestottr(:, :, it)))
458           endif           endif
459           CALL histwrite(nid_tra, "d_tr_th_"//tnom(it+2), itau_w, &           CALL histwrite(nid_tra, "d_tr_th_"//tname(it+2), itau_w, &
460                gr_phy_write_3d(d_tr_th(:, :, it)))                gr_phy_write_3d(d_tr_th(:, :, it)))
461           CALL histwrite(nid_tra, "d_tr_cv_"//tnom(it+2), itau_w, &           CALL histwrite(nid_tra, "d_tr_cv_"//tname(it+2), itau_w, &
462                gr_phy_write_3d(d_tr_cv(:, :, it)))                gr_phy_write_3d(d_tr_cv(:, :, it)))
463           CALL histwrite(nid_tra, "d_tr_cl_"//tnom(it+2), itau_w, &           CALL histwrite(nid_tra, "d_tr_cl_"//tname(it+2), itau_w, &
464                gr_phy_write_3d(d_tr_cl(:, :, it)))                gr_phy_write_3d(d_tr_cl(:, :, it)))
465        ENDDO        ENDDO
466    
Legend:
Removed from v.118  
changed lines
  Added in v.131
  ViewVC Help
Powered by ViewVC 1.1.21