--- trunk/libf/phylmd/physiq.f90 2012/11/14 16:59:30 68 +++ trunk/libf/phylmd/physiq.f90 2013/07/23 13:00:07 72 @@ -7,7 +7,9 @@ SUBROUTINE physiq(lafin, rdayvrai, time, dtphys, paprs, play, pphi, pphis, & u, v, t, qx, omega, d_u, d_v, d_t, d_qx, d_ps, dudyn, PVteta) - ! From phylmd/physiq.F, version 1.22 2006/02/20 09:38:28 (SVN revision 678) + ! From phylmd/physiq.F, version 1.22 2006/02/20 09:38:28 + ! (subversion revision 678) + ! Author: Z.X. Li (LMD/CNRS) 1993 ! This is the main procedure for the "physics" part of the program. @@ -23,6 +25,7 @@ USE clesphys2, ONLY: cycle_diurne, iflag_con, nbapp_rad, new_oliq, & ok_orodr, ok_orolf, soil_model USE clmain_m, ONLY: clmain + use clouds_gno_m, only: clouds_gno USE comgeomphy, ONLY: airephy, cuphy, cvphy USE concvl_m, ONLY: concvl USE conf_gcm_m, ONLY: offline, raz_date @@ -56,6 +59,7 @@ USE phytrac_m, ONLY: phytrac USE qcheck_m, ONLY: qcheck use radlwsw_m, only: radlwsw + use readsulfate_m, only: readsulfate use sugwd_m, only: sugwd USE suphec_m, ONLY: ra, rcpd, retv, rg, rlvtt, romega, rsigma, rtt USE temps, ONLY: annee_ref, day_ref, itau_phy @@ -123,9 +127,6 @@ character(len = 6):: ocean = 'force ' ! (type de modèle océan à utiliser: "force" ou "slab" mais pas "couple") - logical ok_ocean - SAVE ok_ocean - ! "slab" ocean REAL, save:: tslab(klon) ! temperature of ocean slab REAL, save:: seaice(klon) ! glace de mer (kg/m2) @@ -169,15 +170,12 @@ !MI Amip2 PV a theta constante - INTEGER klevp1 - PARAMETER(klevp1 = llm + 1) - - REAL swdn0(klon, klevp1), swdn(klon, klevp1) - REAL swup0(klon, klevp1), swup(klon, klevp1) + REAL swdn0(klon, llm + 1), swdn(klon, llm + 1) + REAL swup0(klon, llm + 1), swup(klon, llm + 1) SAVE swdn0, swdn, swup0, swup - REAL lwdn0(klon, klevp1), lwdn(klon, klevp1) - REAL lwup0(klon, klevp1), lwup(klon, klevp1) + REAL lwdn0(klon, llm + 1), lwdn(klon, llm + 1) + REAL lwup0(klon, llm + 1), lwup(klon, llm + 1) SAVE lwdn0, lwdn, lwup0, lwup !IM Amip2 @@ -208,7 +206,7 @@ PARAMETER(kmaxm1 = kmax-1, lmaxm1 = lmax-1) REAL zx_tau(kmaxm1), zx_pc(lmaxm1) - DATA zx_tau/0.0, 0.3, 1.3, 3.6, 9.4, 23., 60./ + DATA zx_tau/0., 0.3, 1.3, 3.6, 9.4, 23., 60./ DATA zx_pc/50., 180., 310., 440., 560., 680., 800./ ! cldtopres pression au sommet des nuages @@ -270,8 +268,7 @@ REAL, save:: ftsoil(klon, nsoilmx, nbsrf) ! soil temperature of surface fraction - REAL fevap(klon, nbsrf) - SAVE fevap ! evaporation + REAL, save:: fevap(klon, nbsrf) ! evaporation REAL fluxlat(klon, nbsrf) SAVE fluxlat @@ -318,11 +315,8 @@ SAVE Ma REAL qcondc(klon, llm) ! in-cld water content from convect SAVE qcondc - REAL ema_work1(klon, llm), ema_work2(klon, llm) - SAVE ema_work1, ema_work2 - - REAL wd(klon) ! sb - SAVE wd ! sb + REAL, save:: sig1(klon, llm), w01(klon, llm) + REAL, save:: wd(klon) ! Variables locales pour la couche limite (al1): @@ -331,7 +325,7 @@ REAL cdragh(klon) ! drag coefficient pour T and Q REAL cdragm(klon) ! drag coefficient pour vent - !AA Pour phytrac + ! Pour phytrac : REAL ycoefh(klon, llm) ! coef d'echange pour phytrac REAL yu1(klon) ! vents dans la premiere couche U REAL yv1(klon) ! vents dans la premiere couche V @@ -355,7 +349,7 @@ REAL rain_tiedtke(klon), snow_tiedtke(klon) - REAL evap(klon), devap(klon) ! evaporation et sa derivee + REAL evap(klon), devap(klon) ! evaporation and its derivative REAL sens(klon), dsens(klon) ! chaleur sensible et sa derivee REAL dlw(klon) ! derivee infra rouge SAVE dlw @@ -376,11 +370,9 @@ INTEGER julien INTEGER, SAVE:: lmt_pas ! number of time steps of "physics" per day - REAL pctsrf(klon, nbsrf) - !IM - REAL pctsrf_new(klon, nbsrf) !pourcentage surfaces issus d'ORCHIDEE + REAL, save:: pctsrf(klon, nbsrf) ! percentage of surface + REAL pctsrf_new(klon, nbsrf) ! pourcentage surfaces issus d'ORCHIDEE - SAVE pctsrf ! sous-fraction du sol REAL albsol(klon) SAVE albsol ! albedo du sol total REAL albsollw(klon) @@ -398,10 +390,8 @@ ! Variables locales - real clwcon(klon, llm), rnebcon(klon, llm) - real clwcon0(klon, llm), rnebcon0(klon, llm) - - save rnebcon, clwcon + real, save:: clwcon(klon, llm), rnebcon(klon, llm) + real, save:: clwcon0(klon, llm), rnebcon0(klon, llm) REAL rhcl(klon, llm) ! humiditi relative ciel clair REAL dialiq(klon, llm) ! eau liquide nuageuse @@ -427,13 +417,14 @@ REAL heat0(klon, llm) ! chauffage solaire ciel clair REAL, save:: cool(klon, llm) ! refroidissement infrarouge REAL cool0(klon, llm) ! refroidissement infrarouge ciel clair - REAL, save:: topsw(klon), toplw(klon), solsw(klon), sollw(klon) - real sollwdown(klon) ! downward LW flux at surface + REAL, save:: topsw(klon), toplw(klon), solsw(klon) + REAL, save:: sollw(klon) ! rayonnement infrarouge montant à la surface + real, save:: sollwdown(klon) ! downward LW flux at surface REAL, save:: topsw0(klon), toplw0(klon), solsw0(klon), sollw0(klon) REAL albpla(klon) REAL fsollw(klon, nbsrf) ! bilan flux IR pour chaque sous surface REAL fsolsw(klon, nbsrf) ! flux solaire absorb. pour chaque sous surface - SAVE albpla, sollwdown + SAVE albpla SAVE heat0, cool0 INTEGER itaprad @@ -450,17 +441,12 @@ REAL dist, rmu0(klon), fract(klon) REAL zdtime ! pas de temps du rayonnement (s) real zlongi - REAL z_avant(klon), z_apres(klon), z_factor(klon) - LOGICAL zx_ajustq - REAL za, zb REAL zx_t, zx_qs, zdelta, zcor real zqsat(klon, llm) INTEGER i, k, iq, nsrf - REAL t_coup - PARAMETER (t_coup = 234.0) - + REAL, PARAMETER:: t_coup = 234. REAL zphi(klon, llm) !IM cf. AM Variables locales pour la CLA (hbtm2) @@ -497,7 +483,6 @@ REAL rflag(klon) ! flag fonctionnement de convect INTEGER iflagctrl(klon) ! flag fonctionnement de convect ! -- convect43: - INTEGER ntra ! nb traceurs pour convect4.3 REAL dtvpdt1(klon, llm), dtvpdq1(klon, llm) REAL dplcldt(klon), dplcldr(klon) @@ -515,7 +500,7 @@ REAL d_u_ajs(klon, llm), d_v_ajs(klon, llm) REAL rneb(klon, llm) - REAL pmfu(klon, llm), pmfd(klon, llm) + REAL mfu(klon, llm), mfd(klon, llm) REAL pen_u(klon, llm), pen_d(klon, llm) REAL pde_u(klon, llm), pde_d(klon, llm) INTEGER kcbot(klon), kctop(klon), kdtop(klon) @@ -579,8 +564,6 @@ REAL zsto - character(len = 20) modname - character(len = 80) abort_message logical ok_sync real date0 @@ -598,17 +581,19 @@ REAL ZRCPD REAL t2m(klon, nbsrf), q2m(klon, nbsrf) ! temperature and humidity at 2 m - REAL u10m(klon, nbsrf), v10m(klon, nbsrf) !vents a 10m - REAL zt2m(klon), zq2m(klon) !temp., hum. 2m moyenne s/ 1 maille - REAL zu10m(klon), zv10m(klon) !vents a 10m moyennes s/1 maille - !jq Aerosol effects (Johannes Quaas, 27/11/2003) - REAL sulfate(klon, llm) ! SO4 aerosol concentration [ug/m3] + REAL u10m(klon, nbsrf), v10m(klon, nbsrf) ! vents a 10 m + REAL zt2m(klon), zq2m(klon) ! temp., hum. 2 m moyenne s/ 1 maille + REAL zu10m(klon), zv10m(klon) ! vents a 10 m moyennes s/1 maille + + ! Aerosol effects: + + REAL sulfate(klon, llm) ! SO4 aerosol concentration (micro g/m3) REAL, save:: sulfate_pi(klon, llm) - ! (SO4 aerosol concentration, in ug/m3, pre-industrial value) + ! SO4 aerosol concentration, in micro g/m3, pre-industrial value REAL cldtaupi(klon, llm) - ! (Cloud optical thickness for pre-industrial (pi) aerosols) + ! cloud optical thickness for pre-industrial (pi) aerosols REAL re(klon, llm) ! Cloud droplet effective radius REAL fl(klon, llm) ! denominator of re @@ -618,11 +603,7 @@ REAL, save:: cg_ae(klon, llm, 2) REAL topswad(klon), solswad(klon) ! aerosol direct effect - ! ok_ade --> ADE = topswad - topsw - REAL topswai(klon), solswai(klon) ! aerosol indirect effect - ! ok_aie .and. ok_ade --> AIE = topswai - topswad - ! ok_aie .and. .not. ok_ade --> AIE = topswai - topsw REAL aerindex(klon) ! POLDER aerosol index @@ -630,8 +611,9 @@ LOGICAL:: ok_aie = .false. ! apply aerosol indirect effect REAL:: bl95_b0 = 2., bl95_b1 = 0.2 - ! Parameters in the formula to link CDNC to aerosol mass conc - ! (Boucher and Lohmann, 1995), used in nuage.F + ! Parameters in equation (D) of Boucher and Lohmann (1995, Tellus + ! B). They link cloud droplet number concentration to aerosol mass + ! concentration. SAVE u10m SAVE v10m @@ -647,8 +629,6 @@ SAVE solswad SAVE d_u_con SAVE d_v_con - SAVE rnebcon0 - SAVE clwcon0 real zmasse(klon, llm) ! (column-density of mass of air in a cell, in kg m-2) @@ -662,17 +642,10 @@ !---------------------------------------------------------------- - modname = 'physiq' - IF (if_ebil >= 1) THEN - DO i = 1, klon - zero_v(i) = 0. - END DO - END IF + IF (if_ebil >= 1) zero_v = 0. ok_sync = .TRUE. - IF (nqmx < 2) THEN - abort_message = 'eaux vapeur et liquide sont indispensables' - CALL abort_gcm(modname, abort_message, 1) - ENDIF + IF (nqmx < 2) CALL abort_gcm('physiq', & + 'eaux vapeur et liquide sont indispensables', 1) test_firstcal: IF (firstcal) THEN ! initialiser @@ -687,19 +660,17 @@ cg_ae = 0. rain_con(:) = 0. snow_con(:) = 0. - bl95_b0 = 0. - bl95_b1 = 0. topswai(:) = 0. topswad(:) = 0. solswai(:) = 0. solswad(:) = 0. - d_u_con = 0.0 - d_v_con = 0.0 - rnebcon0 = 0.0 - clwcon0 = 0.0 - rnebcon = 0.0 - clwcon = 0.0 + d_u_con = 0. + d_v_con = 0. + rnebcon0 = 0. + clwcon0 = 0. + rnebcon = 0. + clwcon = 0. pblh =0. ! Hauteur de couche limite plcl =0. ! Niveau de condensation de la CLA @@ -720,7 +691,6 @@ read(unit=*, nml=physiq_nml) write(unit_nml, nml=physiq_nml) - ! Appel à la lecture du run.def physique call conf_phys ! Initialiser les compteurs: @@ -730,12 +700,12 @@ itaprad = 0 CALL phyetat0("startphy.nc", pctsrf, ftsol, ftsoil, ocean, tslab, & seaice, fqsurf, qsol, fsnow, falbe, falblw, fevap, rain_fall, & - snow_fall, solsw, sollwdown, dlw, radsol, frugs, agesno, zmea, & + 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) + ancien_ok, rnebcon, ratqs, clwcon, run_off_lic_0, sig1, w01) ! ATTENTION : il faudra a terme relire q2 dans l'etat initial - q2 = 1.e-8 + q2 = 1e-8 radpas = NINT(86400. / dtphys / nbapp_rad) @@ -743,30 +713,19 @@ IF (raz_date) itau_phy = 0 PRINT *, 'cycle_diurne = ', cycle_diurne + CALL printflag(radpas, ocean /= 'force', ok_oasis, ok_journe, & + ok_instan, ok_region) - IF(ocean.NE.'force ') THEN - ok_ocean = .TRUE. - ENDIF - - CALL printflag(radpas, ok_ocean, ok_oasis, ok_journe, ok_instan, & - ok_region) - - IF (dtphys*REAL(radpas) > 21600..AND.cycle_diurne) THEN - print *, 'Nbre d appels au rayonnement insuffisant' + IF (dtphys * REAL(radpas) > 21600. .AND. cycle_diurne) THEN print *, "Au minimum 4 appels par jour si cycle diurne" - abort_message = 'Nbre d appels au rayonnement insuffisant' - call abort_gcm(modname, abort_message, 1) + call abort_gcm('physiq', & + "Nombre d'appels au rayonnement insuffisant", 1) ENDIF - print *, "Clef pour la convection, iflag_con = ", iflag_con - ! Initialisation pour la convection de K.E. (sb): + ! Initialisation pour le schéma de convection d'Emanuel : IF (iflag_con >= 3) THEN - print *, "Convection de Kerry Emanuel 4.3" - - DO i = 1, klon - ibas_con(i) = 1 - itop_con(i) = 1 - ENDDO + ibas_con = 1 + itop_con = 1 ENDIF IF (ok_orodr) THEN @@ -796,19 +755,19 @@ call ini_histday(dtphys, ok_journe, nid_day, nqmx) call ini_histins(dtphys, ok_instan, nid_ins) CALL ymds2ju(annee_ref, 1, int(day_ref), 0., date0) - !XXXPB Positionner date0 pour initialisation de ORCHIDEE - WRITE(*, *) 'physiq date0: ', date0 + ! Positionner date0 pour initialisation de ORCHIDEE + print *, 'physiq date0: ', date0 ENDIF test_firstcal ! Mettre a zero des variables de sortie (pour securite) DO i = 1, klon - d_ps(i) = 0.0 + d_ps(i) = 0. ENDDO DO iq = 1, nqmx DO k = 1, llm DO i = 1, klon - d_qx(i, k, iq) = 0.0 + d_qx(i, k, iq) = 0. ENDDO ENDDO ENDDO @@ -869,8 +828,8 @@ ELSE DO k = 1, llm DO i = 1, klon - d_t_dyn(i, k) = 0.0 - d_q_dyn(i, k) = 0.0 + d_t_dyn(i, k) = 0. + d_q_dyn(i, k) = 0. ENDDO ENDDO ancien_ok = .TRUE. @@ -893,7 +852,7 @@ forall (k = 1: llm) zmasse(:, k) = (paprs(:, k)-paprs(:, k + 1)) / rg - ! Mettre en action les conditions aux limites (albedo, sst, etc.). + ! Mettre en action les conditions aux limites (albedo, sst etc.). ! Prescrire l'ozone et calculer l'albedo sur l'ocean. wo = ozonecm(REAL(julien), paprs) @@ -923,7 +882,7 @@ ! Appeler la diffusion verticale (programme de couche limite) DO i = 1, klon - zxrugs(i) = 0.0 + zxrugs(i) = 0. ENDDO DO nsrf = 1, nbsrf DO i = 1, klon @@ -956,14 +915,14 @@ ENDDO ENDDO - ! Repartition sous maille des flux LW et SW - ! Repartition du longwave par sous-surface linearisee + ! Répartition sous maille des flux longwave et shortwave + ! Répartition du longwave par sous-surface linéarisée DO nsrf = 1, nbsrf DO i = 1, klon fsollw(i, nsrf) = sollw(i) & - + 4.0*RSIGMA*ztsol(i)**3 * (ztsol(i)-ftsol(i, nsrf)) - fsolsw(i, nsrf) = solsw(i)*(1.-falbe(i, nsrf))/(1.-albsol(i)) + + 4. * RSIGMA * ztsol(i)**3 * (ztsol(i) - ftsol(i, nsrf)) + fsolsw(i, nsrf) = solsw(i) * (1. - falbe(i, nsrf)) / (1. - albsol(i)) ENDDO ENDDO @@ -971,12 +930,12 @@ ! Couche limite: - CALL clmain(dtphys, itap, date0, pctsrf, pctsrf_new, t_seri, q_seri, & - u_seri, v_seri, julien, rmu0, co2_ppm, ok_veget, ocean, npas, nexca, & + CALL clmain(dtphys, itap, pctsrf, pctsrf_new, t_seri, q_seri, & + u_seri, v_seri, julien, rmu0, co2_ppm, ok_veget, ocean, & ftsol, soil_model, cdmmax, cdhmax, ksta, ksta_ter, ok_kzmin, ftsoil, & qsol, paprs, play, fsnow, fqsurf, fevap, falbe, falblw, fluxlat, & - rain_fall, snow_fall, fsolsw, fsollw, sollwdown, fder, rlon, rlat, & - cuphy, cvphy, frugs, firstcal, lafin, agesno, rugoro, d_t_vdf, & + rain_fall, snow_fall, fsolsw, fsollw, fder, rlon, 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, & @@ -991,20 +950,16 @@ DO nsrf = 1, nbsrf DO k = 1, llm DO i = 1, klon - zxfluxt(i, k) = zxfluxt(i, k) + & - fluxt(i, k, nsrf) * pctsrf(i, nsrf) - zxfluxq(i, k) = zxfluxq(i, k) + & - fluxq(i, k, nsrf) * pctsrf(i, nsrf) - zxfluxu(i, k) = zxfluxu(i, k) + & - fluxu(i, k, nsrf) * pctsrf(i, nsrf) - zxfluxv(i, k) = zxfluxv(i, k) + & - fluxv(i, k, nsrf) * pctsrf(i, nsrf) + zxfluxt(i, k) = zxfluxt(i, k) + fluxt(i, k, nsrf) * pctsrf(i, nsrf) + zxfluxq(i, k) = zxfluxq(i, k) + fluxq(i, k, nsrf) * pctsrf(i, nsrf) + zxfluxu(i, k) = zxfluxu(i, k) + fluxu(i, k, nsrf) * pctsrf(i, nsrf) + zxfluxv(i, k) = zxfluxv(i, k) + fluxv(i, k, nsrf) * pctsrf(i, nsrf) END DO END DO END DO DO i = 1, klon sens(i) = - zxfluxt(i, 1) ! flux de chaleur sensible au sol - evap(i) = - zxfluxq(i, 1) ! flux d'evaporation au sol + evap(i) = - zxfluxq(i, 1) ! flux d'évaporation au sol fder(i) = dlw(i) + dsens(i) + devap(i) ENDDO @@ -1030,33 +985,30 @@ ! Update surface temperature: DO i = 1, klon - zxtsol(i) = 0.0 - zxfluxlat(i) = 0.0 + zxtsol(i) = 0. + zxfluxlat(i) = 0. - zt2m(i) = 0.0 - zq2m(i) = 0.0 - zu10m(i) = 0.0 - zv10m(i) = 0.0 - zxffonte(i) = 0.0 - zxfqcalving(i) = 0.0 - - s_pblh(i) = 0.0 - s_lcl(i) = 0.0 - s_capCL(i) = 0.0 - s_oliqCL(i) = 0.0 - s_cteiCL(i) = 0.0 - s_pblT(i) = 0.0 - s_therm(i) = 0.0 - s_trmb1(i) = 0.0 - s_trmb2(i) = 0.0 - s_trmb3(i) = 0.0 - - IF (abs(pctsrf(i, is_ter) + pctsrf(i, is_lic) + & - pctsrf(i, is_oce) + pctsrf(i, is_sic) - 1.) > EPSFRA) & - THEN - WRITE(*, *) 'physiq : pb sous surface au point ', i, & - pctsrf(i, 1 : nbsrf) - ENDIF + zt2m(i) = 0. + zq2m(i) = 0. + zu10m(i) = 0. + zv10m(i) = 0. + zxffonte(i) = 0. + zxfqcalving(i) = 0. + + s_pblh(i) = 0. + s_lcl(i) = 0. + s_capCL(i) = 0. + s_oliqCL(i) = 0. + s_cteiCL(i) = 0. + s_pblT(i) = 0. + s_therm(i) = 0. + s_trmb1(i) = 0. + s_trmb2(i) = 0. + s_trmb3(i) = 0. + + IF (abs(pctsrf(i, is_ter) + pctsrf(i, is_lic) + pctsrf(i, is_oce) & + + pctsrf(i, is_sic) - 1.) > EPSFRA) print *, & + 'physiq : problème sous surface au point ', i, pctsrf(i, 1 : nbsrf) ENDDO DO nsrf = 1, nbsrf DO i = 1, klon @@ -1113,71 +1065,51 @@ ! Calculer la derive du flux infrarouge DO i = 1, klon - dlw(i) = - 4.0*RSIGMA*zxtsol(i)**3 + dlw(i) = - 4. * RSIGMA * zxtsol(i)**3 ENDDO ! Appeler la convection (au choix) DO k = 1, llm DO i = 1, klon - conv_q(i, k) = d_q_dyn(i, k) & - + d_q_vdf(i, k)/dtphys - conv_t(i, k) = d_t_dyn(i, k) & - + d_t_vdf(i, k)/dtphys + conv_q(i, k) = d_q_dyn(i, k) + d_q_vdf(i, k)/dtphys + conv_t(i, k) = d_t_dyn(i, k) + d_t_vdf(i, k)/dtphys ENDDO ENDDO + IF (check) THEN za = qcheck(klon, llm, paprs, q_seri, ql_seri, airephy) print *, "avantcon = ", za ENDIF - zx_ajustq = iflag_con == 2 - IF (zx_ajustq) THEN - DO i = 1, klon - z_avant(i) = 0.0 - ENDDO - DO k = 1, llm - DO i = 1, klon - z_avant(i) = z_avant(i) + (q_seri(i, k) + ql_seri(i, k)) & - *zmasse(i, k) - ENDDO - ENDDO - ENDIF - select case (iflag_con) - case (2) - CALL conflx(dtphys, paprs, play, t_seri, q_seri, conv_t, conv_q, & - zxfluxq(1, 1), omega, d_t_con, d_q_con, rain_con, snow_con, pmfu, & - pmfd, pen_u, pde_u, pen_d, pde_d, kcbot, kctop, kdtop, pmflxr, & - pmflxs) + if (iflag_con == 2) then + 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, & + kdtop, pmflxr, pmflxs) WHERE (rain_con < 0.) rain_con = 0. WHERE (snow_con < 0.) snow_con = 0. - DO i = 1, klon - ibas_con(i) = llm + 1 - kcbot(i) - itop_con(i) = llm + 1 - kctop(i) - ENDDO - case (3:) - ! number of tracers for the convection scheme of Kerry Emanuel: + ibas_con = llm + 1 - kcbot + itop_con = llm + 1 - kctop + else + ! iflag_con >= 3 + + CALL concvl(dtphys, paprs, play, t_seri, q_seri, u_seri, & + v_seri, tr_seri, sig1, w01, d_t_con, d_q_con, & + d_u_con, d_v_con, d_tr, rain_con, snow_con, ibas_con, & + itop_con, upwd, dnwd, dnwd0, Ma, cape, tvp, iflagctrl, & + pbase, bbase, dtvpdt1, dtvpdq1, dplcldt, dplcldr, qcondc, & + wd, pmflxr, pmflxs, da, phi, mp, ntra=1) + ! (number of tracers for the convection scheme of Kerry Emanuel: ! la partie traceurs est faite dans phytrac ! on met ntra = 1 pour limiter les appels mais on peut - ! supprimer les calculs / ftra. - ntra = 1 - ! Schéma de convection modularisé et vectorisé : - ! (driver commun aux versions 3 et 4) - - CALL concvl(iflag_con, dtphys, paprs, play, t_seri, q_seri, u_seri, & - v_seri, tr_seri, ntra, ema_work1, ema_work2, d_t_con, d_q_con, & - d_u_con, d_v_con, d_tr, rain_con, snow_con, ibas_con, itop_con, & - upwd, dnwd, dnwd0, Ma, cape, tvp, iflagctrl, pbase, bbase, & - dtvpdt1, dtvpdq1, dplcldt, dplcldr, qcondc, wd, pmflxr, pmflxs, & - da, phi, mp) - clwcon0 = qcondc - pmfu = upwd + dnwd + ! supprimer les calculs / ftra.) - IF (.NOT. ok_gust) THEN - do i = 1, klon - wd(i) = 0.0 - enddo - ENDIF + clwcon0 = qcondc + mfu = upwd + dnwd + IF (.NOT. ok_gust) wd = 0. ! Calcul des propriétés des nuages convectifs @@ -1186,7 +1118,7 @@ zx_t = t_seri(i, k) IF (thermcep) THEN zdelta = MAX(0., SIGN(1., rtt-zx_t)) - zx_qs = r2es * FOEEW(zx_t, zdelta)/play(i, k) + zx_qs = r2es * FOEEW(zx_t, zdelta) / play(i, k) zx_qs = MIN(0.5, zx_qs) zcor = 1./(1.-retv*zx_qs) zx_qs = zx_qs*zcor @@ -1202,13 +1134,16 @@ ENDDO ! calcul des proprietes des nuages convectifs - clwcon0 = fact_cldcon*clwcon0 + clwcon0 = fact_cldcon * clwcon0 call clouds_gno(klon, llm, q_seri, zqsat, clwcon0, ptconv, ratqsc, & rnebcon0) - case default - print *, "iflag_con non-prevu", iflag_con - stop 1 - END select + + mfd = 0. + pen_u = 0. + pen_d = 0. + pde_d = 0. + pde_u = 0. + END if DO k = 1, llm DO i = 1, klon @@ -1232,8 +1167,8 @@ IF (check) THEN za = qcheck(klon, llm, paprs, q_seri, ql_seri, airephy) print *, "aprescon = ", za - zx_t = 0.0 - za = 0.0 + zx_t = 0. + za = 0. DO i = 1, klon za = za + airephy(i)/REAL(klon) zx_t = zx_t + (rain_con(i)+ & @@ -1242,20 +1177,10 @@ zx_t = zx_t/za*dtphys print *, "Precip = ", zx_t ENDIF - IF (zx_ajustq) THEN - DO i = 1, klon - z_apres(i) = 0.0 - ENDDO - DO k = 1, llm - DO i = 1, klon - z_apres(i) = z_apres(i) + (q_seri(i, k) + ql_seri(i, k)) & - *zmasse(i, k) - ENDDO - ENDDO - DO i = 1, klon - z_factor(i) = (z_avant(i)-(rain_con(i) + snow_con(i))*dtphys) & - /z_apres(i) - ENDDO + + IF (iflag_con == 2) THEN + z_apres = sum((q_seri + ql_seri) * zmasse, dim=2) + z_factor = (z_avant - (rain_con + snow_con) * dtphys) / z_apres DO k = 1, llm DO i = 1, klon IF (z_factor(i) > 1. + 1E-8 .OR. z_factor(i) < 1. - 1E-8) THEN @@ -1264,7 +1189,6 @@ ENDDO ENDDO ENDIF - zx_ajustq = .FALSE. ! Convection sèche (thermiques ou ajustement) @@ -1295,14 +1219,14 @@ ! Caclul des ratqs - ! ratqs convectifs a l'ancienne en fonction de q(z = 0)-q / q - ! on ecrase le tableau ratqsc calcule par clouds_gno + ! ratqs convectifs à l'ancienne en fonction de (q(z = 0) - q) / q + ! on écrase le tableau ratqsc calculé par clouds_gno if (iflag_cldcon == 1) then do k = 1, llm do i = 1, klon if(ptconv(i, k)) then - ratqsc(i, k) = ratqsbas & - +fact_cldcon*(q_seri(i, 1)-q_seri(i, k))/q_seri(i, k) + ratqsc(i, k) = ratqsbas + fact_cldcon & + * (q_seri(i, 1) - q_seri(i, k)) / q_seri(i, k) else ratqsc(i, k) = 0. endif @@ -1313,19 +1237,18 @@ ! ratqs stables do k = 1, llm do i = 1, klon - ratqss(i, k) = ratqsbas + (ratqshaut-ratqsbas)* & - min((paprs(i, 1)-play(i, k))/(paprs(i, 1)-30000.), 1.) + ratqss(i, k) = ratqsbas + (ratqshaut - ratqsbas) & + * min((paprs(i, 1) - play(i, k)) / (paprs(i, 1) - 3e4), 1.) enddo enddo ! ratqs final - if (iflag_cldcon == 1 .or.iflag_cldcon == 2) then + if (iflag_cldcon == 1 .or. iflag_cldcon == 2) then ! les ratqs sont une conbinaison de ratqss et ratqsc ! ratqs final ! 1e4 (en gros 3 heures), en dur pour le moment, est le temps de ! relaxation des ratqs - facteur = exp(-dtphys*facttemps) - ratqs = max(ratqs*facteur, ratqss) + ratqs = max(ratqs * exp(- dtphys * facttemps), ratqss) ratqs = max(ratqs, ratqsc) else ! on ne prend que le ratqs stable pour fisrtilp @@ -1353,8 +1276,8 @@ IF (check) THEN za = qcheck(klon, llm, paprs, q_seri, ql_seri, airephy) print *, "apresilp = ", za - zx_t = 0.0 - za = 0.0 + zx_t = 0. + za = 0. DO i = 1, klon za = za + airephy(i)/REAL(klon) zx_t = zx_t + (rain_lsc(i) & @@ -1396,9 +1319,8 @@ endif ! Nuages diagnostiques pour Tiedtke - CALL diagcld1(paprs, play, & - rain_tiedtke, snow_tiedtke, ibas_con, itop_con, & - diafra, dialiq) + CALL diagcld1(paprs, play, rain_tiedtke, snow_tiedtke, ibas_con, & + itop_con, diafra, dialiq) DO k = 1, llm DO i = 1, klon IF (diafra(i, k) > cldfra(i, k)) THEN @@ -1408,15 +1330,15 @@ ENDDO ENDDO ELSE IF (iflag_cldcon == 3) THEN - ! On prend pour les nuages convectifs le max du calcul de la - ! convection et du calcul du pas de temps précédent diminué d'un facteur - ! facttemps - facteur = dtphys *facttemps + ! On prend pour les nuages convectifs le maximum du calcul de + ! la convection et du calcul du pas de temps précédent diminué + ! d'un facteur facttemps. + facteur = dtphys * facttemps do k = 1, llm do i = 1, klon - rnebcon(i, k) = rnebcon(i, k)*facteur - if (rnebcon0(i, k)*clwcon0(i, k) > rnebcon(i, k)*clwcon(i, k)) & - then + rnebcon(i, k) = rnebcon(i, k) * facteur + if (rnebcon0(i, k) * clwcon0(i, k) & + > rnebcon(i, k) * clwcon(i, k)) then rnebcon(i, k) = rnebcon0(i, k) clwcon(i, k) = clwcon0(i, k) endif @@ -1490,10 +1412,9 @@ ! Paramètres optiques des nuages et quelques paramètres pour diagnostics : if (ok_newmicro) then - CALL newmicro(paprs, play, ok_newmicro, t_seri, cldliq, cldfra, & - cldtau, cldemi, cldh, cldl, cldm, cldt, cldq, flwp, fiwp, flwc, & - fiwc, ok_aie, sulfate, sulfate_pi, bl95_b0, bl95_b1, cldtaupi, & - re, fl) + CALL newmicro(paprs, play, t_seri, cldliq, cldfra, cldtau, cldemi, & + cldh, cldl, cldm, cldt, cldq, flwp, fiwp, flwc, fiwc, ok_aie, & + sulfate, sulfate_pi, bl95_b0, bl95_b1, cldtaupi, re, fl) else CALL nuage(paprs, play, t_seri, cldliq, cldfra, cldtau, cldemi, cldh, & cldl, cldm, cldt, cldq, ok_aie, sulfate, sulfate_pi, bl95_b0, & @@ -1543,8 +1464,8 @@ ! Calculer l'hydrologie de la surface DO i = 1, klon - zxqsurf(i) = 0.0 - zxsnow(i) = 0.0 + zxqsurf(i) = 0. + zxsnow(i) = 0. ENDDO DO nsrf = 1, nbsrf DO i = 1, klon @@ -1566,7 +1487,7 @@ igwd = 0 DO i = 1, klon itest(i) = 0 - IF (((zpic(i)-zmea(i)) > 100.).AND.(zstd(i) > 10.0)) THEN + IF (((zpic(i)-zmea(i)) > 100.).AND.(zstd(i) > 10.)) THEN itest(i) = 1 igwd = igwd + 1 idx(igwd) = i @@ -1637,13 +1558,13 @@ ! Calcul des tendances traceurs call phytrac(rnpb, itap, lmt_pas, julien, time, firstcal, lafin, nqmx-2, & - dtphys, u, t, paprs, play, pmfu, pmfd, pen_u, pde_u, pen_d, pde_d, & + dtphys, u, t, paprs, play, mfu, mfd, pen_u, pde_u, pen_d, pde_d, & ycoefh, fm_therm, entr_therm, yu1, yv1, ftsol, pctsrf, frac_impa, & frac_nucl, pphis, albsol, rhcl, cldfra, rneb, diafra, cldliq, & pmflxr, pmflxs, prfl, psfl, da, phi, mp, upwd, dnwd, tr_seri, zmasse) IF (offline) THEN - call phystokenc(dtphys, rlon, rlat, t, pmfu, pmfd, pen_u, pde_u, & + call phystokenc(dtphys, rlon, rlat, t, mfu, mfd, pen_u, pde_u, & pen_d, pde_d, fm_therm, entr_therm, ycoefh, yu1, yv1, ftsol, & pctsrf, frac_impa, frac_nucl, pphis, airephy, dtphys, itap) ENDIF @@ -1689,7 +1610,7 @@ ! SORTIES - !cc prw = eau precipitable + ! prw = eau precipitable DO i = 1, klon prw(i) = 0. DO k = 1, llm @@ -1737,9 +1658,9 @@ itau_phy = itau_phy + itap CALL phyredem("restartphy.nc", rlat, rlon, pctsrf, ftsol, ftsoil, & tslab, seaice, fqsurf, qsol, fsnow, falbe, falblw, fevap, & - rain_fall, snow_fall, solsw, sollwdown, dlw, radsol, frugs, & + 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) + q_ancien, rnebcon, ratqs, clwcon, run_off_lic_0, sig1, w01) ENDIF firstcal = .FALSE.