--- trunk/Sources/phylmd/physiq.f 2015/09/29 19:48:59 171 +++ trunk/Sources/phylmd/physiq.f 2016/03/15 17:07:47 180 @@ -19,8 +19,8 @@ use aeropt_m, only: aeropt use ajsec_m, only: ajsec use calltherm_m, only: calltherm - USE clesphys, ONLY: cdhmax, cdmmax, co2_ppm, ecrit_hf, ecrit_ins, & - ecrit_mth, ecrit_reg, ecrit_tra, ksta, ksta_ter, ok_kzmin + USE clesphys, ONLY: cdhmax, cdmmax, ecrit_hf, ecrit_ins, ecrit_mth, & + ecrit_reg, ecrit_tra, ksta, ksta_ter, ok_kzmin USE clesphys2, ONLY: cycle_diurne, iflag_con, nbapp_rad, new_oliq, & ok_orodr, ok_orolf USE clmain_m, ONLY: clmain @@ -48,6 +48,7 @@ USE ini_histins_m, ONLY: ini_histins use netcdf95, only: NF95_CLOSE use newmicro_m, only: newmicro + use nuage_m, only: nuage USE orbite_m, ONLY: orbite USE ozonecm_m, ONLY: ozonecm USE phyetat0_m, ONLY: phyetat0, rlat, rlon @@ -61,8 +62,8 @@ use readsulfate_preind_m, only: readsulfate_preind use yoegwd, only: sugwd USE suphec_m, ONLY: rcpd, retv, rg, rlvtt, romega, rsigma, rtt - USE temps, ONLY: itau_phy use transp_m, only: transp + use transp_lay_m, only: transp_lay use unit_nml_m, only: unit_nml USE ymds2ju_m, ONLY: ymds2ju USE yoethf_m, ONLY: r2es, rvtmp2 @@ -116,12 +117,6 @@ LOGICAL, PARAMETER:: ok_stratus = .FALSE. ! Ajouter artificiellement les stratus - ! "slab" ocean - REAL, save:: tslab(klon) ! temperature of ocean slab - REAL, save:: seaice(klon) ! glace de mer (kg/m2) - REAL fluxo(klon) ! flux turbulents ocean-glace de mer - REAL fluxg(klon) ! flux turbulents ocean-atmosphere - logical:: ok_journe = .false., ok_mensuel = .true., ok_instan = .false. ! sorties journalieres, mensuelles et instantanees dans les ! fichiers histday, histmth et histins @@ -170,7 +165,7 @@ INTEGER kmax, lmax PARAMETER(kmax = 8, lmax = 8) INTEGER kmaxm1, lmaxm1 - PARAMETER(kmaxm1 = kmax-1, lmaxm1 = lmax-1) + PARAMETER(kmaxm1 = kmax - 1, lmaxm1 = lmax - 1) ! Variables propres a la physique @@ -210,10 +205,8 @@ REAL, save:: zpic(klon) ! Maximum de l'OESM REAL, save:: zval(klon) ! Minimum de l'OESM REAL, save:: rugoro(klon) ! longueur de rugosite de l'OESM - REAL zulow(klon), zvlow(klon) - - INTEGER igwd, idx(klon), itest(klon) + INTEGER igwd, itest(klon) REAL agesno(klon, nbsrf) SAVE agesno ! age de la neige @@ -230,9 +223,7 @@ REAL, save:: sig1(klon, llm), w01(klon, llm) REAL, save:: wd(klon) - ! Variables locales pour la couche limite (al1): - - ! Variables locales: + ! Variables pour la couche limite (al1): REAL cdragh(klon) ! drag coefficient pour T and Q REAL cdragm(klon) ! drag coefficient pour vent @@ -287,12 +278,6 @@ REAL, save:: albsol(klon) ! albedo du sol total visible REAL, SAVE:: wo(klon, llm) ! column density of ozone in a cell, in kDU - ! Declaration des procedures appelees - - EXTERNAL nuage ! calculer les proprietes radiatives - - ! Variables locales - real, save:: clwcon(klon, llm), rnebcon(klon, llm) real, save:: clwcon0(klon, llm), rnebcon0(klon, llm) @@ -346,7 +331,7 @@ REAL, PARAMETER:: t_coup = 234. REAL zphi(klon, llm) - ! cf. AM Variables locales pour la CLA (hbtm2) + ! cf. AM Variables pour la CLA (hbtm2) REAL, SAVE:: pblh(klon, nbsrf) ! Hauteur de couche limite REAL, SAVE:: plcl(klon, nbsrf) ! Niveau de condensation de la CLA @@ -364,7 +349,7 @@ REAL s_therm(klon), s_trmb1(klon), s_trmb2(klon) REAL s_trmb3(klon) - ! Variables locales pour la convection de K. Emanuel : + ! Variables pour la convection de K. Emanuel : REAL upwd(klon, llm) ! saturated updraft mass flux REAL dnwd(klon, llm) ! saturated downdraft mass flux @@ -398,7 +383,8 @@ INTEGER, save:: ibas_con(klon), itop_con(klon) REAL rain_con(klon), rain_lsc(klon) - REAL snow_con(klon), snow_lsc(klon) + REAL, save:: snow_con(klon) + real snow_lsc(klon) REAL d_ts(klon, nbsrf) REAL d_u_vdf(klon, llm), d_v_vdf(klon, llm) @@ -422,7 +408,7 @@ integer:: iflag_cldcon = 1 logical ptconv(klon, llm) - ! Variables locales pour effectuer les appels en s\'erie : + ! Variables pour effectuer les appels en s\'erie : REAL t_seri(klon, llm), q_seri(klon, llm) REAL ql_seri(klon, llm) @@ -469,7 +455,7 @@ REAL sulfate(klon, llm) ! SO4 aerosol concentration (micro g/m3) REAL, save:: sulfate_pi(klon, llm) - ! SO4 aerosol concentration, in micro g/m3, pre-industrial value + ! SO4 aerosol concentration, in \mu g/m3, pre-industrial value REAL cldtaupi(klon, llm) ! cloud optical thickness for pre-industrial (pi) aerosols @@ -501,7 +487,6 @@ SAVE ffonte SAVE fqcalving SAVE rain_con - SAVE snow_con SAVE topswai SAVE topswad SAVE solswai @@ -513,7 +498,7 @@ ! (column-density of mass of air in a cell, in kg m-2) real, parameter:: dobson_u = 2.1415e-05 ! Dobson unit, in kg m-2 - integer, save:: ncid_startphy + integer, save:: ncid_startphy, itau_phy namelist /physiq_nml/ ok_journe, ok_mensuel, ok_instan, fact_cldcon, & facttemps, ok_newmicro, iflag_cldcon, ratqsbas, ratqshaut, if_ebil, & @@ -574,11 +559,11 @@ ! Initialiser les compteurs: frugs = 0. - CALL phyetat0(pctsrf, ftsol, ftsoil, tslab, seaice, fqsurf, qsol, & + CALL phyetat0(pctsrf, ftsol, ftsoil, fqsurf, qsol, & fsnow, falbe, fevap, rain_fall, snow_fall, solsw, sollw, dlw, & radsol, frugs, agesno, zmea, zstd, zsig, zgam, zthe, zpic, zval, & t_ancien, q_ancien, ancien_ok, rnebcon, ratqs, clwcon, & - run_off_lic_0, sig1, w01, ncid_startphy) + run_off_lic_0, sig1, w01, ncid_startphy, itau_phy) ! ATTENTION : il faudra a terme relire q2 dans l'etat initial q2 = 1e-8 @@ -614,11 +599,11 @@ ! Initialisation des sorties - call ini_histins(dtphys, ok_instan, nid_ins) + call ini_histins(dtphys, ok_instan, nid_ins, itau_phy) CALL ymds2ju(annee_ref, 1, day_ref, 0., date0) ! Positionner date0 pour initialisation de ORCHIDEE print *, 'physiq date0: ', date0 - CALL phyredem0(lmt_pas) + CALL phyredem0(lmt_pas, itau_phy) ENDIF test_firstcal ! We will modify variables *_seri and we will not touch variables @@ -713,7 +698,7 @@ IF (cycle_diurne) THEN CALL zenang(longi, time, dtphys * radpas, mu0, fract) ELSE - mu0 = -999.999 + mu0 = - 999.999 ENDIF ! Calcul de l'abedo moyen par maille @@ -733,14 +718,14 @@ ! Couche limite: CALL clmain(dtphys, itap, pctsrf, pctsrf_new, t_seri, q_seri, u_seri, & - v_seri, julien, mu0, co2_ppm, ftsol, cdmmax, cdhmax, ksta, ksta_ter, & + v_seri, julien, mu0, ftsol, cdmmax, cdhmax, ksta, ksta_ter, & ok_kzmin, ftsoil, qsol, paprs, play, fsnow, fqsurf, fevap, falbe, & fluxlat, rain_fall, snow_fall, fsolsw, fsollw, fder, rlat, frugs, & firstcal, agesno, rugoro, d_t_vdf, d_q_vdf, d_u_vdf, d_v_vdf, d_ts, & fluxt, fluxq, fluxu, fluxv, cdragh, cdragm, q2, dsens, devap, & ycoefh, yu1, yv1, t2m, q2m, u10m, v10m, pblh, capCL, oliqCL, cteiCL, & pblT, therm, trmb1, trmb2, trmb3, plcl, fqcalving, ffonte, & - run_off_lic_0, fluxo, fluxg, tslab) + run_off_lic_0) ! Incr\'ementation des flux @@ -875,10 +860,10 @@ conv_q = d_q_dyn + d_q_vdf / dtphys conv_t = d_t_dyn + d_t_vdf / dtphys z_avant = sum((q_seri + ql_seri) * zmasse, dim=2) - CALL conflx(dtphys, paprs, play, t_seri(:, llm:1:-1), & - q_seri(:, llm:1:-1), conv_t, conv_q, zxfluxq(:, 1), omega, & - d_t_con, d_q_con, rain_con, snow_con, mfu(:, llm:1:-1), & - mfd(:, llm:1:-1), pen_u, pde_u, pen_d, pde_d, kcbot, kctop, & + CALL conflx(dtphys, paprs, play, t_seri(:, llm:1:- 1), & + q_seri(:, llm:1:- 1), conv_t, conv_q, zxfluxq(:, 1), omega, & + d_t_con, d_q_con, rain_con, snow_con, mfu(:, llm:1:- 1), & + mfd(:, llm:1:- 1), pen_u, pde_u, pen_d, pde_d, kcbot, kctop, & kdtop, pmflxr, pmflxs) WHERE (rain_con < 0.) rain_con = 0. WHERE (snow_con < 0.) snow_con = 0. @@ -893,7 +878,7 @@ CALL concvl(dtphys, paprs, play, t_seri, q_seri, u_seri, v_seri, sig1, & w01, d_t_con, d_q_con, d_u_con, d_v_con, rain_con, snow_con, & ibas_con, itop_con, upwd, dnwd, dnwd0, Ma, cape, iflagctrl, & - qcondc, wd, pmflxr, pmflxs, da, phi, mp) + qcondc, wd, pmflxr, da, phi, mp) clwcon0 = qcondc mfu = upwd + dnwd IF (.NOT. ok_gust) wd = 0. @@ -1066,17 +1051,17 @@ ! 1. NUAGES CONVECTIFS - IF (iflag_cldcon <= -1) THEN + IF (iflag_cldcon <= - 1) THEN ! seulement pour Tiedtke snow_tiedtke = 0. - if (iflag_cldcon == -1) then + if (iflag_cldcon == - 1) then rain_tiedtke = rain_con else rain_tiedtke = 0. do k = 1, llm do i = 1, klon if (d_q_con(i, k) < 0.) then - rain_tiedtke(i) = rain_tiedtke(i)-d_q_con(i, k)/dtphys & + rain_tiedtke(i) = rain_tiedtke(i) - d_q_con(i, k)/dtphys & *zmasse(i, k) endif enddo @@ -1146,7 +1131,7 @@ IF (thermcep) THEN zx_qs = r2es * FOEEW(zx_t, rtt >= zx_t)/play(i, k) zx_qs = MIN(0.5, zx_qs) - zcor = 1./(1.-retv*zx_qs) + zcor = 1./(1. - retv*zx_qs) zx_qs = zx_qs*zcor ELSE IF (zx_t < t_coup) THEN @@ -1204,7 +1189,7 @@ DO k = 1, llm DO i = 1, klon - t_seri(i, k) = t_seri(i, k) + (heat(i, k)-cool(i, k)) * dtphys/86400. + t_seri(i, k) = t_seri(i, k) + (heat(i, k) - cool(i, k)) * dtphys/86400. ENDDO ENDDO @@ -1237,14 +1222,13 @@ ! Param\'etrisation de l'orographie \`a l'\'echelle sous-maille : IF (ok_orodr) THEN - ! selection des points pour lesquels le shema est actif: + ! S\'election des points pour lesquels le sch\'ema est actif : igwd = 0 DO i = 1, klon itest(i) = 0 - IF (((zpic(i)-zmea(i)) > 100.).AND.(zstd(i) > 10.)) THEN + IF (zpic(i) - zmea(i) > 100. .AND. zstd(i) > 10.) THEN itest(i) = 1 igwd = igwd + 1 - idx(igwd) = i ENDIF ENDDO @@ -1267,10 +1251,9 @@ igwd = 0 DO i = 1, klon itest(i) = 0 - IF ((zpic(i) - zmea(i)) > 100.) THEN + IF (zpic(i) - zmea(i) > 100.) THEN itest(i) = 1 igwd = igwd + 1 - idx(igwd) = i ENDIF ENDDO @@ -1314,7 +1297,7 @@ call phytrac(itap, lmt_pas, julien, time, firstcal, lafin, dtphys, t, & paprs, play, mfu, mfd, pde_u, pen_d, ycoefh, fm_therm, entr_therm, & yu1, yv1, ftsol, pctsrf, frac_impa, frac_nucl, da, phi, mp, upwd, & - dnwd, tr_seri, zmasse, ncid_startphy, nid_ins) + dnwd, tr_seri, zmasse, ncid_startphy, nid_ins, itau_phy) IF (offline) call phystokenc(dtphys, rlon, rlat, t, mfu, mfd, pen_u, & pde_u, pen_d, pde_d, fm_therm, entr_therm, ycoefh, yu1, yv1, ftsol, & @@ -1325,7 +1308,7 @@ ! diag. bilKP - CALL transp_lay(paprs, zxtsol, t_seri, q_seri, u_seri, v_seri, zphi, & + CALL transp_lay(paprs, t_seri, q_seri, u_seri, v_seri, zphi, & ve_lay, vq_lay, ue_lay, uq_lay) ! Accumuler les variables a stocker dans les fichiers histoire: @@ -1379,7 +1362,7 @@ DO iq = 3, nqmx DO k = 1, llm DO i = 1, klon - d_qx(i, k, iq) = (tr_seri(i, k, iq-2) - qx(i, k, iq)) / dtphys + d_qx(i, k, iq) = (tr_seri(i, k, iq - 2) - qx(i, k, iq)) / dtphys ENDDO ENDDO ENDDO @@ -1396,7 +1379,7 @@ IF (lafin) then call NF95_CLOSE(ncid_startphy) - CALL phyredem(pctsrf, ftsol, ftsoil, tslab, seaice, fqsurf, qsol, & + CALL phyredem(pctsrf, ftsol, ftsoil, fqsurf, qsol, & fsnow, falbe, fevap, rain_fall, snow_fall, solsw, sollw, dlw, & radsol, frugs, agesno, zmea, zstd, zsig, zgam, zthe, zpic, zval, & t_ancien, q_ancien, rnebcon, ratqs, clwcon, run_off_lic_0, sig1, & @@ -1499,7 +1482,7 @@ CALL gr_fi_ecrit(1, klon, iim, jjm + 1, bils, zx_tmp_2d) CALL histwrite(nid_ins, "bils", itau_w, zx_tmp_2d) - zx_tmp_fi2d(1:klon) = -1*sens(1:klon) + zx_tmp_fi2d(1:klon) = - sens(1:klon) ! CALL gr_fi_ecrit(1, klon, iim, jjm + 1, sens, zx_tmp_2d) CALL gr_fi_ecrit(1, klon, iim, jjm + 1, zx_tmp_fi2d, zx_tmp_2d) CALL histwrite(nid_ins, "sens", itau_w, zx_tmp_2d) @@ -1628,6 +1611,9 @@ CALL gr_fi_ecrit(llm, klon, iim, jjm + 1, d_q_vdf, zx_tmp_3d) CALL histwrite(nid_ins, "dqvdf", itau_w, zx_tmp_3d) + CALL gr_fi_ecrit(llm, klon, iim, jjm + 1, zx_rh, zx_tmp_3d) + CALL histwrite(nid_ins, "rhum", itau_w, zx_tmp_3d) + call histsync(nid_ins) ENDIF