--- trunk/Sources/phylmd/phytrac.f 2015/07/20 16:01:49 157 +++ trunk/Sources/phylmd/phytrac.f 2016/05/09 19:56:28 191 @@ -7,10 +7,10 @@ contains - SUBROUTINE phytrac(itap, lmt_pas, julien, gmtime, firstcal, lafin, pdtphys, & + SUBROUTINE phytrac(lmt_pas, julien, gmtime, firstcal, lafin, pdtphys, & t_seri, paprs, pplay, pmfu, pmfd, pde_u, pen_d, coefh, fm_therm, & - entr_therm, yu1, yv1, ftsol, pctsrf, frac_impa, frac_nucl, pphis, da, & - phi, mp, upwd, dnwd, tr_seri, zmasse, ncid_startphy) + entr_therm, yu1, yv1, ftsol, pctsrf, frac_impa, frac_nucl, da, phi, & + mp, upwd, dnwd, tr_seri, zmasse, ncid_startphy) ! From phylmd/phytrac.F, version 1.15 2006/02/21 08:08:30 (SVN revision 679) @@ -28,7 +28,7 @@ use abort_gcm_m, only: abort_gcm use clesphys, only: ecrit_tra - use clesphys2, only: iflag_con + use clesphys2, only: conv_emanuel use cltrac_m, only: cltrac use cltracrn_m, only: cltracrn use ctherm, only: iflag_thermals @@ -36,9 +36,9 @@ use dimens_m, only: llm, nqmx use dimphy, only: klon use indicesol, only: nbsrf - use ini_histrac_m, only: ini_histrac use initrrnpb_m, only: initrrnpb use minmaxqfi_m, only: minmaxqfi + use netcdf, only: NF90_FILL_float use netcdf95, only: nf95_inq_varid, nf95_get_var, nf95_put_var use nflxtr_m, only: nflxtr use nr_util, only: assert @@ -49,8 +49,8 @@ use radiornpb_m, only: radiornpb use regr_pr_comb_coefoz_m, only: regr_pr_comb_coefoz use SUPHEC_M, only: rg + use time_phylmdz, only: itap - integer, intent(in):: itap ! number of calls to "physiq" integer, intent(in):: lmt_pas ! number of time steps of "physics" per day integer, intent(in):: julien !jour julien, 1 <= julien <= 360 real, intent(in):: gmtime ! heure de la journ\'ee en fraction de jour @@ -91,8 +91,6 @@ REAL frac_impa(klon, llm) ! fraction d'aerosols impactes REAL frac_nucl(klon, llm) ! fraction d'aerosols nuclees - real, intent(in):: pphis(klon) - ! Kerry Emanuel real, intent(in):: da(klon, llm), phi(klon, llm, llm), mp(klon, llm) REAL, intent(in):: upwd(klon, llm) ! saturated updraft mass flux @@ -138,7 +136,6 @@ SAVE scavtr CHARACTER itn - INTEGER, save:: nid_tra ! nature du traceur @@ -192,15 +189,14 @@ PRINT *, 'Frequency of tracer output: ecrit_tra = ', ecrit_tra inirnpb = .true. - ! Initialisation des sorties : - call ini_histrac(nid_tra, pdtphys, nqmx - 2, lessivage) - ! Initialisation de certaines variables pour le radon et le plomb ! Initialisation du traceur dans le sol (couche limite radonique) trs(:, 2:) = 0. call nf95_inq_varid(ncid_startphy, "trs", varid) call nf95_get_var(ncid_startphy, varid, trs(:, 1)) + if (any(trs(:, 1) == NF90_FILL_float)) call abort_gcm("phytrac", & + "some missing values in trs(:, 1)") ! Initialisation de la fraction d'aerosols lessivee @@ -234,14 +230,12 @@ if (convection) then ! Calcul de l'effet de la convection DO it=1, nqmx - 2 - if (iflag_con == 2) 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 + if (conv_emanuel) then call cvltr(pdtphys, da, phi, mp, paprs, tr_seri(:, :, it), upwd, & dnwd, d_tr_cv(:, :, it)) + else + CALL nflxtr(pdtphys, pmfu, pmfd, pde_u, pen_d, paprs, & + tr_seri(:, :, it), d_tr_cv(:, :, it)) endif DO k = 1, llm @@ -346,7 +340,7 @@ ! Ozone as a tracer: if (mod(itap - 1, lmt_pas) == 0) then ! Once per day, update the coefficients for ozone chemistry: - call regr_pr_comb_coefoz(julien) + call regr_pr_comb_coefoz(julien, paprs, pplay) end if call o3_chem(julien, gmtime, t_seri, zmasse, pdtphys, tr_seri(:, :, 3)) end if @@ -401,7 +395,7 @@ ENDIF ! Ecriture des sorties - call write_histrac(lessivage, itap, nid_tra) + call write_histrac(lessivage) if (lafin) then call nf95_inq_varid(ncid_restartphy, "trs", varid) @@ -410,59 +404,43 @@ contains - subroutine write_histrac(lessivage, itap, nid_tra) + subroutine write_histrac(lessivage) ! From phylmd/write_histrac.h, version 1.9 2006/02/21 08:08:30 - use dimens_m, only: iim, jjm, llm - use histsync_m, only: histsync + use gr_phy_write_m, only: gr_phy_write use histwrite_m, only: histwrite - use temps, only: itau_phy use iniadvtrac_m, only: tname - use comgeomphy, only: airephy - use dimphy, only: klon - use grid_change, only: gr_phy_write_2d - use gr_phy_write_3d_m, only: gr_phy_write_3d + use ini_histins_m, only: nid_ins + use phyetat0_m, only: itau_phy logical, intent(in):: lessivage - integer, intent(in):: itap ! number of calls to "physiq" - integer, intent(in):: nid_tra ! Variables local to the procedure: integer it integer itau_w ! pas de temps ecriture - logical, parameter:: ok_sync = .true. !----------------------------------------------------- itau_w = itau_phy + itap - CALL histwrite(nid_tra, "phis", itau_w, gr_phy_write_2d(pphis)) - CALL histwrite(nid_tra, "aire", itau_w, gr_phy_write_2d(airephy)) - CALL histwrite(nid_tra, "zmasse", itau_w, gr_phy_write_3d(zmasse)) + CALL histwrite(nid_ins, "zmasse", itau_w, gr_phy_write(zmasse)) DO it=1, nqmx - 2 - CALL histwrite(nid_tra, tname(it+2), itau_w, & - gr_phy_write_3d(tr_seri(:, :, it))) + CALL histwrite(nid_ins, tname(it+2), itau_w, & + gr_phy_write(tr_seri(:, :, it))) if (lessivage) THEN - CALL histwrite(nid_tra, "fl"//tname(it+2), itau_w, & - gr_phy_write_3d(flestottr(:, :, it))) + CALL histwrite(nid_ins, "fl"//tname(it+2), itau_w, & + gr_phy_write(flestottr(:, :, it))) endif - CALL histwrite(nid_tra, "d_tr_th_"//tname(it+2), itau_w, & - gr_phy_write_3d(d_tr_th(:, :, it))) - CALL histwrite(nid_tra, "d_tr_cv_"//tname(it+2), itau_w, & - gr_phy_write_3d(d_tr_cv(:, :, it))) - CALL histwrite(nid_tra, "d_tr_cl_"//tname(it+2), itau_w, & - gr_phy_write_3d(d_tr_cl(:, :, it))) + CALL histwrite(nid_ins, "d_tr_th_"//tname(it+2), itau_w, & + gr_phy_write(d_tr_th(:, :, it))) + CALL histwrite(nid_ins, "d_tr_cv_"//tname(it+2), itau_w, & + gr_phy_write(d_tr_cv(:, :, it))) + CALL histwrite(nid_ins, "d_tr_cl_"//tname(it+2), itau_w, & + gr_phy_write(d_tr_cl(:, :, it))) ENDDO - CALL histwrite(nid_tra, "pplay", itau_w, gr_phy_write_3d(pplay)) - CALL histwrite(nid_tra, "T", itau_w, gr_phy_write_3d(t_seri)) - - if (ok_sync) then - call histsync(nid_tra) - endif - end subroutine write_histrac END SUBROUTINE phytrac