--- trunk/Sources/phylmd/phytrac.f 2015/07/21 15:29:52 159 +++ trunk/Sources/phylmd/phytrac.f 2016/06/06 17:42:15 201 @@ -7,12 +7,14 @@ 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, da, phi, & - mp, upwd, dnwd, tr_seri, zmasse, ncid_startphy, nid_ins) + mp, upwd, dnwd, tr_seri, zmasse, ncid_startphy) - ! 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) and phylmd/write_histrac.h, version 1.9 2006/02/21 + ! 08:08:30 ! Authors: Fr\'ed\'eric Hourdin, Abderrahmane Idelkadi, Marie-Alice ! Foujols, Olivia @@ -28,16 +30,19 @@ 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 use cvltr_m, only: cvltr use dimens_m, only: llm, nqmx use dimphy, only: klon + use histwrite_phy_m, only: histwrite_phy use indicesol, only: nbsrf + use iniadvtrac_m, only: tname 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 @@ -48,8 +53,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 @@ -101,7 +106,7 @@ real, intent(in):: zmasse(:, :) ! (klon, llm) ! (column-density of mass of air in a cell, in kg m-2) - integer, intent(in):: ncid_startphy, nid_ins + integer, intent(in):: ncid_startphy ! Local: @@ -194,6 +199,8 @@ 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 @@ -227,14 +234,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 @@ -339,7 +344,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 @@ -394,59 +399,22 @@ ENDIF ! Ecriture des sorties - call write_histrac(lessivage, itap, nid_ins) + CALL histwrite_phy("zmasse", zmasse) + DO it=1, nqmx - 2 + CALL histwrite_phy(tname(it+2), tr_seri(:, :, it)) + if (lessivage) THEN + CALL histwrite_phy("fl"//tname(it+2), flestottr(:, :, it)) + endif + CALL histwrite_phy("d_tr_th_"//tname(it+2), d_tr_th(:, :, it)) + CALL histwrite_phy("d_tr_cv_"//tname(it+2), d_tr_cv(:, :, it)) + CALL histwrite_phy("d_tr_cl_"//tname(it+2), d_tr_cl(:, :, it)) + ENDDO if (lafin) then call nf95_inq_varid(ncid_restartphy, "trs", varid) call nf95_put_var(ncid_restartphy, varid, trs(:, 1)) endif - contains - - subroutine write_histrac(lessivage, itap, nid_ins) - - ! 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 histwrite_m, only: histwrite - use temps, only: itau_phy - use iniadvtrac_m, only: tname - use dimphy, only: klon - use grid_change, only: gr_phy_write_2d - use gr_phy_write_3d_m, only: gr_phy_write_3d - - logical, intent(in):: lessivage - integer, intent(in):: itap ! number of calls to "physiq" - integer, intent(in):: nid_ins - - ! Variables local to the procedure: - integer it - integer itau_w ! pas de temps ecriture - - !----------------------------------------------------- - - itau_w = itau_phy + itap - - CALL histwrite(nid_ins, "zmasse", itau_w, gr_phy_write_3d(zmasse)) - - DO it=1, nqmx - 2 - CALL histwrite(nid_ins, tname(it+2), itau_w, & - gr_phy_write_3d(tr_seri(:, :, it))) - if (lessivage) THEN - CALL histwrite(nid_ins, "fl"//tname(it+2), itau_w, & - gr_phy_write_3d(flestottr(:, :, it))) - endif - CALL histwrite(nid_ins, "d_tr_th_"//tname(it+2), itau_w, & - gr_phy_write_3d(d_tr_th(:, :, it))) - CALL histwrite(nid_ins, "d_tr_cv_"//tname(it+2), itau_w, & - gr_phy_write_3d(d_tr_cv(:, :, it))) - CALL histwrite(nid_ins, "d_tr_cl_"//tname(it+2), itau_w, & - gr_phy_write_3d(d_tr_cl(:, :, it))) - ENDDO - - end subroutine write_histrac - END SUBROUTINE phytrac end module phytrac_m